TAPESTRY-2421: Allow Tapestry4/Tapestry5 to be deployed in the same WAR
git-svn-id: https://svn.apache.org/repos/asf/tapestry/tapestry5/branches/hlship-20080520@658390 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build.xml b/build.xml
index 27e7b07..01be811 100644
--- a/build.xml
+++ b/build.xml
@@ -207,4 +207,4 @@
<antcall target="assemble"/>
</target>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 3c60efd..78822de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,19 +91,19 @@
<name>Tapestry User List</name>
<subscribe>users-subscribe@tapestry.apache.org</subscribe>
<unsubscribe>users-unsubscribe@tapestry.apache.org</unsubscribe>
- <archive>http://markmail.org/search/list:org.apache.tapestry.users</archive>
+ <archive>http://markmail.org/search/list:org.apache.tapestry5.users</archive>
</mailingList>
<mailingList>
<name>Tapestry Developer List</name>
<subscribe>dev-subscribe@tapestry.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@tapestry.apache.org</unsubscribe>
- <archive>http://markmail.org/search/list:org.apache.tapestry.dev</archive>
+ <archive>http://markmail.org/search/list:org.apache.tapestry5.dev</archive>
</mailingList>
<mailingList>
<name>Tapestry Commits List</name>
<subscribe>commits-subscribe@tapestry.apache.org</subscribe>
<unsubscribe>commits-unsubscribe@tapestry.apache.org</unsubscribe>
- <archive>http://markmail.org/search/list:org.apache.tapestry.commits</archive>
+ <archive>http://markmail.org/search/list:org.apache.tapestry5.commits</archive>
</mailingList>
</mailingLists>
diff --git a/quickstart/src/main/resources/META-INF/archetype.xml b/quickstart/src/main/resources/META-INF/archetype.xml
index 99a1b19..0f02d7a 100644
--- a/quickstart/src/main/resources/META-INF/archetype.xml
+++ b/quickstart/src/main/resources/META-INF/archetype.xml
@@ -30,4 +30,4 @@
<source>src/main/java/pages/Index.java</source>
<source>src/main/java/services/AppModule.java</source>
</sources>
-</archetype>
\ No newline at end of file
+</archetype>
diff --git a/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java b/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java
index 0d4cb3b..7f3d8f9 100644
--- a/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java
+++ b/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java
@@ -11,4 +11,4 @@
{
return new Date();
}
-}
\ No newline at end of file
+}
diff --git a/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java b/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java
index 90761de..7eb5357 100644
--- a/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java
+++ b/quickstart/src/main/resources/archetype-resources/src/main/java/services/AppModule.java
@@ -2,15 +2,15 @@
import java.io.IOException;
-import org.apache.tapestry.*;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.ioc.ServiceBinder;
-import org.apache.tapestry.ioc.annotations.InjectService;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.RequestFilter;
-import org.apache.tapestry.services.RequestHandler;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
+import org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.annotations.InjectService;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.RequestFilter;
+import org.apache.tapestry5.services.RequestHandler;
+import org.apache.tapestry5.services.Response;
import org.slf4j.Logger;
/**
diff --git a/quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties b/quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties
index 5e85d7d..8fc4708 100644
--- a/quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties
+++ b/quickstart/src/main/resources/archetype-resources/src/main/resources/log4j.properties
@@ -13,11 +13,11 @@
log4j.category.${packageName}.services.AppModule.TimingFilter=info
# Outputs a list of pages, components and mixins at startup.
-log4j.category.org.apache.tapestry.services.TapestryModule.ComponentClassResolver=info
+log4j.category.org.apache.tapestry5.services.TapestryModule.ComponentClassResolver=info
# Outputs startup statistics; time to setup and initialize the registry, and a list of
# available services.
-log4j.category.org.apache.tapestry.TapestryFilter=info
+log4j.category.org.apache.tapestry5.TapestryFilter=info
# Turning on debug mode for a page or component will show all of the code changes that occur when the
@@ -25,4 +25,4 @@
# the contruction of the page, including the runtime code modifications that occur. Verbose
# mode is rarely used, as it outputs voluminous details about the rendering of the page.
-# log4j.category.${packageName}.pages.Index=debug
\ No newline at end of file
+# log4j.category.${packageName}.pages.Index=debug
diff --git a/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index 3fa06f3..0e1a3fb 100644
--- a/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -28,11 +28,11 @@
</context-param>
<filter>
<filter-name>app</filter-name>
- <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+ <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>app</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
</web-app>
-
\ No newline at end of file
+
diff --git a/src/site/apt/dev/bible.apt b/src/site/apt/dev/bible.apt
index bc5b9ab..044edbc 100644
--- a/src/site/apt/dev/bible.apt
+++ b/src/site/apt/dev/bible.apt
@@ -104,10 +104,10 @@
to change it. As soon as code is public, we become handcuffed to backwards compatibility.
<<Interfaces are public, implementations are private>>. You can see this is the bulk of the code, where
- org.apache.tapestry.services is almost all interfaces and the implementations are
- in org.apache.tapestry.internal.services.
+ org.apache.tapestry5.services is almost all interfaces and the implementations are
+ in org.apache.tapestry5.internal.services.
- Many more services have both the interface and the implementation in org.apache.tapestry.internal.services.
+ Many more services have both the interface and the implementation in org.apache.tapestry5.internal.services.
We absolutely <<do not>> want to make Page or ComponentPageElement public. You will often see
public service facades that take a page name as a method parameter,
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 7e9e492..c67e79e 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -255,7 +255,7 @@
With the clean slate of Tapestry 5, we are being much more ruthless about internal vs. external.
- First of all, anything inside the org.apache.tapestry.internal package
+ First of all, anything inside the org.apache.tapestry5.internal package
is <<internal>>. It is part of the implementation of Tapestry. It is the man behind the curtain.
You should not ever need to directly use this code. It is a <<bad idea>> to do so, because
internal code may <<change from one release to the next>> without concern for backwards
diff --git a/src/site/xdoc/release-notes.xml b/src/site/xdoc/release-notes.xml
index d6b56b7..17a5b63 100644
--- a/src/site/xdoc/release-notes.xml
+++ b/src/site/xdoc/release-notes.xml
@@ -1100,7 +1100,7 @@
</li>
<li>
[<a href="https://issues.apache.org/jira/browse/TAPESTRY-1443">TAPESTRY-1443</a>] -
- org.apache.tapestry.annotation.Service annotation is
+ org.apache.tapestry5.annotations.Service annotation is
ignored
</li>
<li>
diff --git a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/DataType.java b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/DataType.java
index 9f84f18..bc42404 100644
--- a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/DataType.java
+++ b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/DataType.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
import java.lang.annotation.*;
/**
- * Used to explicitly set the data type used to select an editor (or display) block. Normally, the data type
- * is determined from the type of the property (for example, property type java.lang.String would map to data
- * type "text").
+ * Used to explicitly set the data type used to select an editor (or display) block. Normally, the data type is
+ * determined from the type of the property (for example, property type java.lang.String would map to data type
+ * "text").
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/NonVisual.java b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/NonVisual.java
index d2ac8e3..ed09902 100644
--- a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/NonVisual.java
+++ b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/NonVisual.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -21,13 +21,13 @@
import java.lang.annotation.Target;
/**
- * Marker annotation for properties which are non-visual, and so should not appear (by default)
- * inside a {@link BeanModel}. The annotation may be placed on either the getter or the setter
- * method.
+ * Marker annotation for properties which are non-visual, and so should not appear (by default) inside a {@link
+ * BeanModel}. The annotation may be placed on either the getter or the setter method.
*/
@Target(METHOD)
@Retention(RUNTIME)
@Documented
-public @interface NonVisual {
+public @interface NonVisual
+{
}
diff --git a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/OrderAfter.java b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/OrderAfter.java
index 92d2a46..48138a9 100644
--- a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/OrderAfter.java
+++ b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/OrderAfter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -21,13 +21,14 @@
import java.lang.annotation.Target;
/**
- * Placed on either a property getter or a property setter method to control the order in which the
- * properties are presented to the user.
+ * Placed on either a property getter or a property setter method to control the order in which the properties are
+ * presented to the user.
*/
@Target(METHOD)
@Retention(RUNTIME)
@Documented
-public @interface OrderAfter {
+public @interface OrderAfter
+{
/**
* The name of the other property. This property will be ordered before the other property.
*/
diff --git a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/OrderBefore.java b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/OrderBefore.java
index 21ccf45..6a17538 100644
--- a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/OrderBefore.java
+++ b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/OrderBefore.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -21,13 +21,14 @@
import java.lang.annotation.Target;
/**
- * Placed on either a property getter or a property setter method to control the order in which the
- * properties are presented to the user.
+ * Placed on either a property getter or a property setter method to control the order in which the properties are
+ * presented to the user.
*/
@Target(METHOD)
@Retention(RUNTIME)
@Documented
-public @interface OrderBefore {
+public @interface OrderBefore
+{
/**
* The name of the other property. This property will be ordered before the other property.
*/
diff --git a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/RelativePosition.java b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/RelativePosition.java
index 98ca2d0..71664f3 100644
--- a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/RelativePosition.java
+++ b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/RelativePosition.java
@@ -12,12 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
/**
* Controls the position of newly added {@link PropertyModel}s inside a {@link BeanModel}.
*/
-public enum RelativePosition {
+public enum RelativePosition
+{
/**
* The new {@link PropertyModel} goes before the existing model.
*/
diff --git a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/Validate.java b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/Validate.java
index b7fa31a..862f9ef 100644
--- a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/Validate.java
+++ b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/Validate.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -21,15 +21,15 @@
import java.lang.annotation.Target;
/**
- * Used to attach validation constraints directly to a property (either the getter or the setter
- * method). The annotation value is a comma separated list of <em>validation constraints</em>,
- * each one identifying a validator type (such as "required", "minlength") and optionally, a
- * constraint value. Most validators need a constraint value, which is separated from the type by an
- * equals size (i.e., "maxlength=30").
+ * Used to attach validation constraints directly to a property (either the getter or the setter method). The annotation
+ * value is a comma separated list of <em>validation constraints</em>, each one identifying a validator type (such as
+ * "required", "minlength") and optionally, a constraint value. Most validators need a constraint value, which is
+ * separated from the type by an equals size (i.e., "maxlength=30").
*/
@Target(METHOD)
@Retention(RUNTIME)
@Documented
-public @interface Validate {
+public @interface Validate
+{
String value();
}
diff --git a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/Width.java b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/Width.java
index f4d22cf..6b94396 100644
--- a/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/Width.java
+++ b/tapestry-annotations/src/main/java/org/apache/tapestry5/beaneditor/Width.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -21,9 +21,9 @@
import java.lang.annotation.Target;
/**
- * Defines the desired width of the field used to edit the property. Note that width (generally equivalent to the
- * size attribute of an HTML <input> element) is only used for presentation; validation must be used to
- * actually enforce a maximum input length.
+ * Defines the desired width of the field used to edit the property. Note that width (generally equivalent to the size
+ * attribute of an HTML <input> element) is only used for presentation; validation must be used to actually
+ * enforce a maximum input length.
*/
@Target(METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Inject.java b/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Inject.java
index f45c1df..fc7b6e9 100644
--- a/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Inject.java
+++ b/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Inject.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -31,8 +31,8 @@
* <p/>
* In terms of the IoC container; normally, resources take precedence over annotations when injecting. The Inject
* annotation overrides this default, forcing the resolution of the parameters value via the master {@link
- * org.apache.tapestry.ioc.ObjectProvider}, even when the parameter's type matches a type that is normally a resource.
- * This is most often used in conjunction with {@link org.apache.tapestry.ioc.annotation.Value} annotation when
+ * org.apache.tapestry5.ioc.ObjectProvider}, even when the parameter's type matches a type that is normally a resource.
+ * This is most often used in conjunction with {@link org.apache.tapestry5.ioc.annotations.Value} annotation when
* injecting a string, as normally, the String would be matched as the service id.
* <p/>
* In terms of the IoC container, the Inject annotation is only used on parameters to service builder methods (and
@@ -43,7 +43,7 @@
* Finally, on a constructor, this is used to indicate <em>which</em> constructor should be used when more than one is
* available.
*
- * @see org.apache.tapestry.ioc.ObjectProvider
+ * @see org.apache.tapestry5.ioc.ObjectProvider
*/
@Target(
{ PARAMETER, FIELD, ElementType.CONSTRUCTOR })
diff --git a/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectService.java b/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectService.java
index fd548bb..a57fbb9 100644
--- a/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectService.java
+++ b/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/InjectService.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.PARAMETER;
@@ -26,7 +26,7 @@
/**
* Annotation used with parameters of service builder methods to identify the service to be injected
* into the service builder method via the parameter. In many cases the
- * {@link org.apache.tapestry.ioc.annotation.Inject} annotation is more flexible or appropriate.
+ * {@link org.apache.tapestry5.ioc.annotations.Inject} annotation is more flexible or appropriate.
*
*
*/
diff --git a/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/IntermediateType.java b/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/IntermediateType.java
index 7dafd85..020843b 100644
--- a/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/IntermediateType.java
+++ b/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/IntermediateType.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.*;
@@ -20,10 +20,10 @@
/**
* Used to guide Tapestry when coercing from a raw type to a field or parameter type, by forcing Tapestry to coerce to
* the intermediate type. This was introduced to allow coercion from string to a time period (in milliseconds) via
- * {@link org.apache.tapestry.ioc.util.TimeInterval}.
+ * {@link org.apache.tapestry5.ioc.util.TimeInterval}.
*
- * @see org.apache.tapestry.ioc.annotation.Value
- * @see org.apache.tapestry.ioc.annotation.Symbol
+ * @see org.apache.tapestry5.ioc.annotations.Value
+ * @see org.apache.tapestry5.ioc.annotations.Symbol
*/
@Target({ ElementType.PARAMETER, ElementType.FIELD })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Primary.java b/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Primary.java
index 4f5cc7f..1dc344d 100644
--- a/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Primary.java
+++ b/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Primary.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -23,8 +23,8 @@
/**
* Marker annotation used to denote a service that is the primary instance of some common interface. This is often used
- * when a service is a {@linkplain org.apache.tapestry.ioc.services.ChainBuilder chain of command} or {@linkplain
- * org.apache.tapestry.ioc.services.StrategyBuilder strategy-based} and, therefore, many services will implement the
+ * when a service is a {@linkplain org.apache.tapestry5.ioc.services.ChainBuilder chain of command} or {@linkplain
+ * org.apache.tapestry5.ioc.services.StrategyBuilder strategy-based} and, therefore, many services will implement the
* same interface.
*/
@Target(
diff --git a/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Symbol.java b/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Symbol.java
index 81500cf..5426ddf 100644
--- a/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Symbol.java
+++ b/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Symbol.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -23,8 +23,8 @@
/**
* Used to inject a symbol value, via a symbol name. This is used much like {@link
- * org.apache.tapestry.ioc.annotation.Value} annotation, except that symbols are not expanded ... the entire value is a
- * symbol name. This allows the annotation to reference a public constant variable.
+ * org.apache.tapestry5.ioc.annotations.Value} annotation, except that symbols are not expanded ... the entire value is
+ * a symbol name. This allows the annotation to reference a public constant variable.
*/
@Target(
{ PARAMETER, FIELD })
diff --git a/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Value.java b/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Value.java
index 3b5fbab..dcc268c 100644
--- a/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Value.java
+++ b/tapestry-annotations/src/main/java/org/apache/tapestry5/ioc/annotations/Value.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -22,13 +22,13 @@
import java.lang.annotation.Target;
/**
- * Used in conjunction with {@link org.apache.tapestry.ioc.annotation.Inject} to inject a literal value, rather than a
+ * Used in conjunction with {@link org.apache.tapestry5.ioc.annotations.Inject} to inject a literal value, rather than a
* service. Symbols in the value are expanded and the resulting string is coerced to the desired type. For IoC, this
* annotation is only applied to parameters (on service builder methods, and on service constructors); for components,
* it may also be applied to field.
*
- * @see org.apache.tapestry.ioc.services.SymbolSource
- * @see org.apache.tapestry.ioc.services.TypeCoercer
+ * @see org.apache.tapestry5.ioc.services.SymbolSource
+ * @see org.apache.tapestry5.ioc.services.TypeCoercer
*/
@Target(
{ PARAMETER, FIELD })
diff --git a/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ClassDescription.java b/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ClassDescription.java
index b37fe72..37f4664 100644
--- a/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ClassDescription.java
+++ b/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ClassDescription.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.mojo;
+package org.apache.tapestry5.mojo;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
import java.util.Map;
diff --git a/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java b/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java
index 4125a77..8ceb475 100644
--- a/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java
+++ b/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ComponentReport.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.mojo;
+package org.apache.tapestry5.mojo;
import nu.xom.*;
import org.apache.commons.lang.StringUtils;
@@ -23,10 +23,10 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.codehaus.doxia.sink.Sink;
import org.codehaus.doxia.site.renderer.SiteRenderer;
import org.codehaus.plexus.util.cli.CommandLineException;
@@ -51,8 +51,8 @@
*/
private static final String REFERENCE_DIR = "ref";
- private final static String[] PARAMETER_HEADERS = {"Name", "Type", "Flags", "Default", "Default Prefix",
- "Description"};
+ private final static String[] PARAMETER_HEADERS = { "Name", "Type", "Flags", "Default", "Default Prefix",
+ "Description" };
/**
@@ -526,7 +526,7 @@
String parametersPath = workDirectory + File.separator + "component-parameters.xml";
- String[] arguments = {"-private", "-o", parametersPath,
+ String[] arguments = { "-private", "-o", parametersPath,
"-subpackages", rootPackage,
@@ -536,7 +536,7 @@
"-sourcepath", sourcePath(),
- "-classpath", classPath()};
+ "-classpath", classPath() };
command.addArguments(arguments);
diff --git a/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java b/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java
index 77d48ba..73ac377 100644
--- a/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java
+++ b/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.mojo;
+package org.apache.tapestry5.mojo;
public class ParameterDescription
{
diff --git a/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java b/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java
index aa57dc2..14aff25 100644
--- a/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java
+++ b/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.mojo;
+package org.apache.tapestry5.mojo;
import com.sun.javadoc.*;
import com.sun.javadoc.AnnotationDesc.ElementValuePair;
@@ -124,7 +124,8 @@
{
for (AnnotationDesc annotation : fd.annotations())
{
- if (annotation.annotationType().qualifiedTypeName().equals("org.apache.tapestry.annotation.Parameter"))
+ if (annotation.annotationType().qualifiedTypeName().equals(
+ "org.apache.tapestry5.annotations.Parameter"))
{
Map<String, String> result = new HashMap<String, String>();
diff --git a/tapestry-core/pom.xml b/tapestry-core/pom.xml
index 4d93c6e..08f82b4 100644
--- a/tapestry-core/pom.xml
+++ b/tapestry-core/pom.xml
@@ -98,7 +98,7 @@
<artifactId>tapestry-component-report</artifactId>
<version>${project.version}</version>
<configuration>
- <rootPackage>org.apache.tapestry.corelib</rootPackage>
+ <rootPackage>org.apache.tapestry5.corelib</rootPackage>
<apidocs>../apidocs</apidocs>
</configuration>
</plugin>
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/AbstractOptionModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/AbstractOptionModel.java
index 9ee5850..c8c467a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/AbstractOptionModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/AbstractOptionModel.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
import java.util.Map;
/**
* Base class for implementing {@link OptionModel}. Subclasses must implement {@link
- * org.apache.tapestry.OptionModel#getLabel()} and {@link org.apache.tapestry.OptionModel#getValue()} }.
+ * org.apache.tapestry5.OptionModel#getLabel()} and {@link org.apache.tapestry5.OptionModel#getValue()} }.
*/
public abstract class AbstractOptionModel implements OptionModel
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/Asset.java b/tapestry-core/src/main/java/org/apache/tapestry5/Asset.java
index a333dd3..08032b1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/Asset.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/Asset.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry5.ioc.Resource;
/**
* An Asset is any kind of resource that can be exposed to the client web browser. Although quite often an Asset is a
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/BaseValidationDecorator.java b/tapestry-core/src/main/java/org/apache/tapestry5/BaseValidationDecorator.java
index c04e60c..9912b9b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/BaseValidationDecorator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/BaseValidationDecorator.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.dom.Element;
+import org.apache.tapestry5.dom.Element;
/**
* Base implementation of {@link ValidationDecorator} that does nothing. Subclasses may override specific methods,
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/Binding.java b/tapestry-core/src/main/java/org/apache/tapestry5/Binding.java
index 467f657..31e3818 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/Binding.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/Binding.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.AnnotationProvider;
/**
* A binding is a connection between a component and its container (another component), that allows the embedded
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/BindingConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/BindingConstants.java
index cfd30af..609399d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/BindingConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/BindingConstants.java
@@ -1,8 +1,8 @@
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Constants for the built-in binding prefixes. These are often used with the {@link
- * org.apache.tapestry.annotation.Parameter#defaultPrefix()} annotation attribute.
+ * org.apache.tapestry5.annotations.Parameter#defaultPrefix()} annotation attribute.
*/
public class BindingConstants
{
@@ -12,7 +12,7 @@
public static final String LITERAL = "literal";
/**
* Binding expression prefix used to bind to a property of the component. When {@link
- * org.apache.tapestry.annotation.Parameter#defaultPrefix()} is not specified, the default is PROP.
+ * org.apache.tapestry5.annotations.Parameter#defaultPrefix()} is not specified, the default is PROP.
*/
public static final String PROP = "prop";
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/Block.java b/tapestry-core/src/main/java/org/apache/tapestry5/Block.java
index 86da774..b12f256 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/Block.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/Block.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* A block is a collection of static text and elements, and components, derived from a component template. In the
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/BlockNotFoundException.java b/tapestry-core/src/main/java/org/apache/tapestry5/BlockNotFoundException.java
index 5d1092f..4fabd7c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/BlockNotFoundException.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/BlockNotFoundException.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.Locatable;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Locatable;
+import org.apache.tapestry5.ioc.Location;
/**
* Exception thrown when a {@link Block} is requested but not found.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/CSSClassConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/CSSClassConstants.java
index ed18e9d..722f797 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/CSSClassConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/CSSClassConstants.java
@@ -1,4 +1,4 @@
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Constants used when rendering a CSS class attribute.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ClientElement.java b/tapestry-core/src/main/java/org/apache/tapestry5/ClientElement.java
index c734bab..78e9628 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ClientElement.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ClientElement.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentAction.java b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentAction.java
index b81605a..d9f51e0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentAction.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentAction.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
import java.io.Serializable;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentEventCallback.java b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentEventCallback.java
index ce15c7e..af885d9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentEventCallback.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentEventCallback.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
- * Callback interface for a {@linkplain org.apache.tapestry.runtime.Event render phase event) or {@link
- * org.apache.tapestry.runtime.ComponentEvent}, notified when a non-null value is returned from some event handler
+ * Callback interface for a {@linkplain org.apache.tapestry5.runtime.Event render phase event) or {@link
+ * org.apache.tapestry5.runtime.ComponentEvent}, notified when a non-null value is returned from some event handler
* method.
*/
public interface ComponentEventCallback<T>
@@ -28,7 +28,7 @@
* <p/>
* Boolean values are <em>not</em> passed to the handler. Booleans are used to indicate that the event has been
* handled (true) or that a further search for handlers should continue (true). If a component event method returns
- * true, then {@link org.apache.tapestry.runtime.Event#isAborted()} will return true.
+ * true, then {@link org.apache.tapestry5.runtime.Event#isAborted()} will return true.
*
* @param result the result value return from the event handler method
* @return true if the event is aborted, false if the event may continue
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java
index 399ce4b..d5a5b09 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResources.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.PageLifecycleListener;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.PageLifecycleListener;
import java.lang.annotation.Annotation;
@@ -188,7 +188,7 @@
/**
* Discards all persistent field changes for the page containing the component. Changes are eliminated from
- * persistent storage (such as the {@link org.apache.tapestry.services.Session}) which will take effect in the
+ * persistent storage (such as the {@link org.apache.tapestry5.services.Session}) which will take effect in the
* <em>next</em> request (the attached page instance is not affected).
*/
void discardPersistentFieldChanges();
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResourcesCommon.java b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResourcesCommon.java
index 83a26a8..ed8af48 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResourcesCommon.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ComponentResourcesCommon.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.Locatable;
+import org.apache.tapestry5.ioc.Locatable;
import org.slf4j.Logger;
import java.util.Locale;
/**
- * Operations shared by the public {@link org.apache.tapestry.ComponentResources} interface and {@link
- * org.apache.tapestry.internal.structure.ComponentPageElement} interface (on the internal side).
+ * Operations shared by the public {@link org.apache.tapestry5.ComponentResources} interface and {@link
+ * org.apache.tapestry5.internal.structure.ComponentPageElement} interface (on the internal side).
*/
public interface ComponentResourcesCommon extends Locatable
{
@@ -45,14 +45,14 @@
* <p/>
* This value is often used to obtain an equivalent component instance in a later request.
*
- * @see org.apache.tapestry.services.ComponentSource#getComponent(String)
+ * @see org.apache.tapestry5.services.ComponentSource#getComponent(String)
*/
String getCompleteId();
/**
* A convienience for invoking {@link #triggerContextEvent(String, EventContext , ComponentEventCallback)}. Wraps
- * the context values into an {@link org.apache.tapestry.EventContext}.
+ * the context values into an {@link org.apache.tapestry5.EventContext}.
*
* @param eventType event type (as determined from the request, or otherwise by design)
* @param context Values that may be provided to the event handler method as method parameters, or null if no
@@ -61,10 +61,10 @@
* support return values from event handler methods (the value true is allowed even if the handler
* is null).
* @return true if any event handler was invoked (even if no event handler method returns a non-null value)
- * @throws org.apache.tapestry.runtime.ComponentEventException
+ * @throws org.apache.tapestry5.runtime.ComponentEventException
* if an event handler method throws a checked or unchecked exception
- * @see org.apache.tapestry.internal.transform.OnEventWorker
- * @see org.apache.tapestry.annotation.OnEvent
+ * @see org.apache.tapestry5.internal.transform.OnEventWorker
+ * @see org.apache.tapestry5.annotations.OnEvent
*/
boolean triggerEvent(String eventType, Object[] contextValues, ComponentEventCallback callback);
@@ -83,10 +83,10 @@
* support return values from event handler methods (the value true is allowed even if the handler
* is null).
* @return true if any event handler was invoked (even if no event handler method returns a non-null value)
- * @throws org.apache.tapestry.runtime.ComponentEventException
+ * @throws org.apache.tapestry5.runtime.ComponentEventException
* if an event handler method throws a checked or unchecked exception
- * @see org.apache.tapestry.internal.transform.OnEventWorker
- * @see org.apache.tapestry.annotation.OnEvent
+ * @see org.apache.tapestry5.internal.transform.OnEventWorker
+ * @see org.apache.tapestry5.annotations.OnEvent
*/
boolean triggerContextEvent(String eventType, EventContext context, ComponentEventCallback callback);
@@ -99,7 +99,7 @@
/**
* Returns the log instance associated with the component (which is based on the component or mixin's class name).
*
- * @see org.apache.tapestry.model.ComponentModel#getLogger()
+ * @see org.apache.tapestry5.model.ComponentModel#getLogger()
*/
Logger getLogger();
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ContentType.java b/tapestry-core/src/main/java/org/apache/tapestry5/ContentType.java
index e0eb3c1..9cd63ac 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ContentType.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ContentType.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import java.util.List;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java
index 4fa21d6..ed86b7b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/EventConstants.java
@@ -1,4 +1,4 @@
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Constant values for common event names fired by Tapestry components.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/EventContext.java b/tapestry-core/src/main/java/org/apache/tapestry5/EventContext.java
index f65549f..5759e03 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/EventContext.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/EventContext.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* A collection of parameters that may eventually be passed to an event handler method. Includes the ability to coerce
* or encode parameters as needed.
*
- * @see org.apache.tapestry.ioc.services.TypeCoercer
- * @see org.apache.tapestry.ValueEncoder
+ * @see org.apache.tapestry5.ioc.services.TypeCoercer
+ * @see org.apache.tapestry5.ValueEncoder
*/
public interface EventContext
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/Field.java b/tapestry-core/src/main/java/org/apache/tapestry5/Field.java
index 78c1ec8..7ee38b7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/Field.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/Field.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Defines a field within a form. Fields have a <a href="http://www.w3.org/TR/html4/interact/forms.html#control-name">control
@@ -20,7 +20,7 @@
* <p/>
* Timing is important, as components may render multiple times, due to looping and other factors. Generally, a
* component's {@link #getControlName()} will only be accurate after it has rendered. In some cases, when generating
- * JavaScript for example, it is necessary to {@linkplain org.apache.tapestry.services.Heartbeat#defer(Runnable) wait
+ * JavaScript for example, it is necessary to {@linkplain org.apache.tapestry5.services.Heartbeat#defer(Runnable) wait
* until the end of the current Heartbeat} to ensure that all components have had thier chance to render.
*/
public interface Field extends ClientElement
@@ -29,7 +29,7 @@
* Returns the value used as the name attribute of the rendered element. This value will be unique within an
* enclosing form, even if the same component renders multiple times.
*
- * @see org.apache.tapestry.services.FormSupport#allocateControlName(String)
+ * @see org.apache.tapestry5.services.FormSupport#allocateControlName(String)
*/
String getControlName();
@@ -38,7 +38,7 @@
* the client, and inside client or server-side validation error messages.
*
* @return the label
- * @see org.apache.tapestry.corelib.components.Label
+ * @see org.apache.tapestry5.corelib.components.Label
*/
String getLabel();
@@ -52,7 +52,7 @@
boolean isDisabled();
/**
- * Returns true if this field required (as per {@link org.apache.tapestry.FieldValidator#isRequired()}).
+ * Returns true if this field required (as per {@link org.apache.tapestry5.FieldValidator#isRequired()}).
*
* @return true if a non-blank value is required for the field
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/FieldValidationSupport.java b/tapestry-core/src/main/java/org/apache/tapestry5/FieldValidationSupport.java
index bb636b5..3101119 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/FieldValidationSupport.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/FieldValidationSupport.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
- * Services to help with field {@linkplain org.apache.tapestry.Validator validation} and {@linkplain
- * org.apache.tapestry.Translator translation}. This service encapsulates the logic that mixes normal
+ * Services to help with field {@linkplain org.apache.tapestry5.Validator validation} and {@linkplain
+ * org.apache.tapestry5.Translator translation}. This service encapsulates the logic that mixes normal
* configured/declared validation/translation with events triggered on the component.
*/
public interface FieldValidationSupport
{
/**
- * A wrapper around {@link org.apache.tapestry.Translator#toClient(Object)} that first fires a "toclient" event on
+ * A wrapper around {@link org.apache.tapestry5.Translator#toClient(Object)} that first fires a "toclient" event on
* the component to see if it can perform the conversion. If the value is null, then no event is fired and the
* translator is <em>not</em> invoked, the return value is simply null.
*
@@ -31,13 +31,13 @@
* @param translator used if the component does not provide a non-null value
* @param nullFieldStrategy used to convert a null server side value to an appropriate client side value
* @return the translated value or null if the value is null
- * @see org.apache.tapestry.Translator#toClient(Object)
+ * @see org.apache.tapestry5.Translator#toClient(Object)
*/
String toClient(Object value, ComponentResources componentResources, Translator translator,
NullFieldStrategy nullFieldStrategy);
/**
- * A wrapper around {@link org.apache.tapestry.Translator#parseClient(String, org.apache.tapestry.ioc.Messages)}.
+ * A wrapper around {@link org.apache.tapestry5.Translator#parseClient(String, org.apache.tapestry5.ioc.Messages)}.
* First a "parseclient" event is fired; the translator is only invoked if that returns null (typically because
* there is not handler for the event).
*
@@ -46,9 +46,9 @@
* @param translator translator that will do the work if the component event returns null
* @param nullFieldStrategy used to convert null/blank values from client into non-null server side values
* @return the input parsed to an object
- * @throws org.apache.tapestry.ValidationException
+ * @throws org.apache.tapestry5.ValidationException
* if the value can't be parsed
- * @see org.apache.tapestry.Translator#parseClient(String, org.apache.tapestry.ioc.Messages)
+ * @see org.apache.tapestry5.Translator#parseClient(String, org.apache.tapestry5.ioc.Messages)
*/
Object parseClient(String clientValue, ComponentResources componentResources, Translator translator,
NullFieldStrategy nullFieldStrategy)
@@ -62,8 +62,8 @@
* @param componentResources used to trigger events
* @param validator performs normal validations
* @throws ValidationException if the value is not valid
- * @see org.apache.tapestry.Validator#validate(Field, Object, org.apache.tapestry.ioc.MessageFormatter, Object)
+ * @see org.apache.tapestry5.Validator#validate(Field, Object, org.apache.tapestry5.ioc.MessageFormatter, Object)
*/
void validate(Object value, ComponentResources componentResources, FieldValidator validator)
throws ValidationException;
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/FieldValidator.java b/tapestry-core/src/main/java/org/apache/tapestry5/FieldValidator.java
index fe117d4..0f49b95 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/FieldValidator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/FieldValidator.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Responsible for validation of a single field.
*
* @param <T>
* @see Validator
- * @see org.apache.tapestry.services.FieldValidatorDefaultSource
+ * @see org.apache.tapestry5.services.FieldValidatorDefaultSource
*/
public interface FieldValidator<T>
{
@@ -34,19 +34,19 @@
void validate(T value) throws ValidationException;
/**
- * Invokes {@link Validator#render(Field, Object, org.apache.tapestry.ioc.MessageFormatter, MarkupWriter,
- * org.apache.tapestry.services.FormSupport)}. This is called at a point "inside" the tag, so that additional
- * attributes may be added. In many cases, the underlying {@link org.apache.tapestry.Validator} may write
+ * Invokes {@link Validator#render(Field, Object, org.apache.tapestry5.ioc.MessageFormatter, MarkupWriter,
+ * org.apache.tapestry5.services.FormSupport)}. This is called at a point "inside" the tag, so that additional
+ * attributes may be added. In many cases, the underlying {@link org.apache.tapestry5.Validator} may write
* client-side JavaScript to enforce the constraint as well.
*
* @param writer markup writer to direct output to.
- * @see org.apache.tapestry.MarkupWriter#attributes(Object[])
+ * @see org.apache.tapestry5.MarkupWriter#attributes(Object[])
*/
void render(MarkupWriter writer);
/**
- * Returns true if any underlying {@link org.apache.tapestry.Validator} returns true from {@link
- * org.apache.tapestry.Validator#isRequired()}.
+ * Returns true if any underlying {@link org.apache.tapestry5.Validator} returns true from {@link
+ * org.apache.tapestry5.Validator#isRequired()}.
*
* @return true if the field is required (a non-blank value is expected)
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/FormValidationControl.java b/tapestry-core/src/main/java/org/apache/tapestry5/FormValidationControl.java
index c204e29..593743f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/FormValidationControl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/FormValidationControl.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Allows control over validation concerns of a Form component.
@@ -46,4 +46,4 @@
*/
public abstract void clearErrors();
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/Link.java b/tapestry-core/src/main/java/org/apache/tapestry5/Link.java
index 59375ea..51f7c68 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/Link.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/Link.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
import org.apache.commons.codec.net.URLCodec;
@@ -21,7 +21,7 @@
/**
* A link is the Tapestry representation of a URL or URI that triggers dynamic behavior. This link is in three parts: a
* path portion, an optional anchor, and a set of query parameters. A request for a link will ultimately be recognized
- * by a {@link org.apache.tapestry.services.Dispatcher}.
+ * by a {@link org.apache.tapestry5.services.Dispatcher}.
* <p/>
* Query parameter values are kept separate from the path portion to support encoding those values into hidden form
* fields (where appropriate).
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/MarkupUtils.java b/tapestry-core/src/main/java/org/apache/tapestry5/MarkupUtils.java
index e23727e..126180d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/MarkupUtils.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/MarkupUtils.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.Collections;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriter.java b/tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriter.java
index aff7458..f54a979 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriter.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.dom.MarkupModel;
-import org.apache.tapestry.dom.Raw;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.dom.MarkupModel;
+import org.apache.tapestry5.dom.Raw;
import java.io.PrintWriter;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriterAdapter.java b/tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriterAdapter.java
index 40343d1..95e972c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriterAdapter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriterAdapter.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.dom.Element;
+import org.apache.tapestry5.dom.Element;
/**
- * Default, empty implementation of {@link org.apache.tapestry.MarkupWriterListener}.
+ * Default, empty implementation of {@link org.apache.tapestry5.MarkupWriterListener}.
*/
public class MarkupWriterAdapter implements MarkupWriterListener
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriterListener.java b/tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriterListener.java
index d56108b..7984ec2 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriterListener.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/MarkupWriterListener.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.dom.Element;
+import org.apache.tapestry5.dom.Element;
/**
@@ -26,8 +26,8 @@
* Invoked just after an element and its initial set of attributes has been written.
*
* @param element element just created and populated with attributes
- * @see org.apache.tapestry.MarkupWriter#element(String, Object[])
- * @see org.apache.tapestry.MarkupWriter#elementNS(String, String)
+ * @see org.apache.tapestry5.MarkupWriter#element(String, Object[])
+ * @see org.apache.tapestry5.MarkupWriter#elementNS(String, String)
*/
void elementDidStart(Element element);
@@ -35,7 +35,7 @@
* Invoked just after an element has ended.
*
* @param element just ended
- * @see org.apache.tapestry.MarkupWriter#end()
+ * @see org.apache.tapestry5.MarkupWriter#end()
*/
void elementDidEnd(Element element);
}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/MetaDataConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/MetaDataConstants.java
index 83c448d..96b4e5c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/MetaDataConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/MetaDataConstants.java
@@ -1,9 +1,9 @@
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Meta-data keys that are applied to components and pages.
*
- * @see org.apache.tapestry.services.MetaDataLocator
+ * @see org.apache.tapestry5.services.MetaDataLocator
*/
public class MetaDataConstants
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/NullFieldStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/NullFieldStrategy.java
index 001c745..4dc2958 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/NullFieldStrategy.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/NullFieldStrategy.java
@@ -12,27 +12,27 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
- * Defines a strategy, used by {@link Field} components such as {@link org.apache.tapestry.corelib.components.TextField},
+ * Defines a strategy, used by {@link Field} components such as {@link org.apache.tapestry5.corelib.components.TextField},
* to handle the case where either the server-side value to be sent (as a string) to the client, or the client-side
* string passed back up to the server, is null or blank.
*
- * @see org.apache.tapestry.services.NullFieldStrategySource
+ * @see org.apache.tapestry5.services.NullFieldStrategySource
*/
public interface NullFieldStrategy
{
/**
* Provides a replacement value for null, when converting the server-side object to a client-side string. The
- * replacement value, if non-null, will be passed to {@link org.apache.tapestry.Translator#toClient(Object)}.
+ * replacement value, if non-null, will be passed to {@link org.apache.tapestry5.Translator#toClient(Object)}.
*/
Object replaceToClient();
/**
* Provides a replacement value for a null or blank string passed from the client to the server as part of a form
- * submission. This replacement value will be passed to {@link org.apache.tapestry.Translator#parseClient(String,
- * org.apache.tapestry.ioc.Messages)} as if it were the value supplied by the user.
+ * submission. This replacement value will be passed to {@link org.apache.tapestry5.Translator#parseClient(String,
+ * org.apache.tapestry5.ioc.Messages)} as if it were the value supplied by the user.
*
* @return replacement value (this must not be null)
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/OptionGroupModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/OptionGroupModel.java
index 745156f..bff79b7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/OptionGroupModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/OptionGroupModel.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
import java.util.List;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/OptionModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/OptionModel.java
index a88c036..5c885e3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/OptionModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/OptionModel.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/PersistenceConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/PersistenceConstants.java
index eedf884..b5a1f7a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/PersistenceConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/PersistenceConstants.java
@@ -1,9 +1,9 @@
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Constants for persistent field strategies.
*
- * @see org.apache.tapestry.annotation.Persist#value()
+ * @see org.apache.tapestry5.annotations.Persist#value()
*/
public class PersistenceConstants
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/PrimaryKeyEncoder.java b/tapestry-core/src/main/java/org/apache/tapestry5/PrimaryKeyEncoder.java
index 6b82977..2724272 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/PrimaryKeyEncoder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/PrimaryKeyEncoder.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.corelib.components.Loop;
+import org.apache.tapestry5.corelib.components.Loop;
import java.io.Serializable;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/PropertyConduit.java b/tapestry-core/src/main/java/org/apache/tapestry5/PropertyConduit.java
index 029d34f..3dbb0c0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/PropertyConduit.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/PropertyConduit.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.AnnotationProvider;
/**
* Used to read or update the value associated with a property. A PropertyConduit provides access to the annotations on
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/RadioContainer.java b/tapestry-core/src/main/java/org/apache/tapestry5/RadioContainer.java
index 774f504..3cea131 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/RadioContainer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/RadioContainer.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.corelib.components.Radio;
+import org.apache.tapestry5.corelib.components.Radio;
/**
* A container of {@link Radio} components, used to identify the element name used when rendering the individual radio
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/RenderSupport.java b/tapestry-core/src/main/java/org/apache/tapestry5/RenderSupport.java
index d11afbb..368a972 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/RenderSupport.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/RenderSupport.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.services.AssetSource;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.services.AssetSource;
import org.apache.tapestry5.json.JSONArray;
import org.apache.tapestry5.json.JSONObject;
@@ -32,7 +32,7 @@
*
* @param id the component id from which a unique id will be generated
* @return a unique id for this rendering of the page
- * @see org.apache.tapestry.ioc.internal.util.IdAllocator
+ * @see org.apache.tapestry5.ioc.internal.util.IdAllocator
*/
String allocateClientId(String id);
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/Renderable.java b/tapestry-core/src/main/java/org/apache/tapestry5/Renderable.java
index 742a203..2344823 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/Renderable.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/Renderable.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
- * Base interface for objects that can render markup output using a {@link org.apache.tapestry.MarkupWriter}.
+ * Base interface for objects that can render markup output using a {@link org.apache.tapestry5.MarkupWriter}.
*/
public interface Renderable
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/SelectModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/SelectModel.java
index 8579422..ec96edf 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/SelectModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/SelectModel.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
import java.util.List;
/**
* Defines the possible options and option groups for a <select> [X]HTML element.
* <p/>
- * Primarily used by the {@link org.apache.tapestry.corelib.components.Select} component, but potentially used by
+ * Primarily used by the {@link org.apache.tapestry5.corelib.components.Select} component, but potentially used by
* anything similar, that needs to present a list of options to the user. Generally paired with a {@link
- * org.apache.tapestry.ValueEncoder} to create client-side representations of server-side values.
+ * org.apache.tapestry5.ValueEncoder} to create client-side representations of server-side values.
*
- * @see org.apache.tapestry.corelib.components.Palette
+ * @see org.apache.tapestry5.corelib.components.Palette
*/
public interface SelectModel
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/SelectModelVisitor.java b/tapestry-core/src/main/java/org/apache/tapestry5/SelectModelVisitor.java
index f2182e3..efcb60d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/SelectModelVisitor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/SelectModelVisitor.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Callback interface that allows for visiting the option groups and option models of a select model in correct render
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/StreamResponse.java b/tapestry-core/src/main/java/org/apache/tapestry5/StreamResponse.java
index 6f1ccaa..fe5551e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/StreamResponse.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/StreamResponse.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.services.Response;
import java.io.BufferedInputStream;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
index 82dd139..4f64822 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
@@ -1,9 +1,9 @@
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Defines the names of symbols used to configure Tapestry.
*
- * @see org.apache.tapestry.ioc.services.SymbolSource
+ * @see org.apache.tapestry5.ioc.services.SymbolSource
*/
public class SymbolConstants
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/TapestryFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/TapestryFilter.java
index c6cfdee..92b3072 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/TapestryFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/TapestryFilter.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.internal.ServletContextSymbolProvider;
-import org.apache.tapestry.internal.TapestryAppInitializer;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.services.ServiceActivity;
-import org.apache.tapestry.ioc.services.ServiceActivityScoreboard;
-import org.apache.tapestry.ioc.services.Status;
-import org.apache.tapestry.ioc.services.SymbolProvider;
-import org.apache.tapestry.services.HttpServletRequestHandler;
-import org.apache.tapestry.services.ServletApplicationInitializer;
+import org.apache.tapestry5.internal.ServletContextSymbolProvider;
+import org.apache.tapestry5.internal.TapestryAppInitializer;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.services.ServiceActivity;
+import org.apache.tapestry5.ioc.services.ServiceActivityScoreboard;
+import org.apache.tapestry5.ioc.services.Status;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
+import org.apache.tapestry5.services.HttpServletRequestHandler;
+import org.apache.tapestry5.services.ServletApplicationInitializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/Translator.java b/tapestry-core/src/main/java/org/apache/tapestry5/Translator.java
index c106e3c..aeb9732 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/Translator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/Translator.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.services.ValidationMessagesSource;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.services.ValidationMessagesSource;
/**
* Translates between client-side and server-side values. Client-side values are always strings.
*
* @param <T>
- * @see org.apache.tapestry.services.TranslatorDefaultSource
+ * @see org.apache.tapestry5.services.TranslatorDefaultSource
* @see FieldValidationSupport
*/
public interface Translator<T>
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ValidationDecorator.java b/tapestry-core/src/main/java/org/apache/tapestry5/ValidationDecorator.java
index bbaba40..e68824d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ValidationDecorator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ValidationDecorator.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.dom.Element;
+import org.apache.tapestry5.dom.Element;
/**
* An object responsible for performing decorations around fields and field labels. The decorator is notified at
@@ -22,13 +22,13 @@
* <p/>
* In most western languages (written left to right) the label will render before the field, so the properties of the
* Field may not be set yet (or may reflect a previous looping's rendering). It may be necessary to {@linkplain
- * org.apache.tapestry.services.Heartbeat#defer(Runnable)} defer any rendering} until after the Label and the Field have
+ * org.apache.tapestry5.services.Heartbeat#defer(Runnable)} defer any rendering} until after the Label and the Field have
* both had their change to initialize and render.
*/
public interface ValidationDecorator
{
/**
- * Invoked by a {@link org.apache.tapestry.corelib.components.Label} before rendering itself.
+ * Invoked by a {@link org.apache.tapestry5.corelib.components.Label} before rendering itself.
*
* @param field for this label
*/
@@ -45,7 +45,7 @@
/**
- * Invoked by {@link org.apache.tapestry.corelib.components.Label} after rendering itself.
+ * Invoked by {@link org.apache.tapestry5.corelib.components.Label} after rendering itself.
*
* @param field
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ValidationException.java b/tapestry-core/src/main/java/org/apache/tapestry5/ValidationException.java
index 72784c4..2cea335 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ValidationException.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ValidationException.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* An exception associated with parsing client input, or validating the input against a constraint.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ValidationTracker.java b/tapestry-core/src/main/java/org/apache/tapestry5/ValidationTracker.java
index d125162..6cdf0da 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ValidationTracker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ValidationTracker.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.corelib.components.Loop;
+import org.apache.tapestry5.corelib.components.Loop;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ValidationTrackerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/ValidationTrackerImpl.java
index 692d5be..4f44573 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ValidationTrackerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ValidationTrackerImpl.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import java.io.Serializable;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/Validator.java b/tapestry-core/src/main/java/org/apache/tapestry5/Validator.java
index 1a62cc3..db9dde6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/Validator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/Validator.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.services.ValidationMessagesSource;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.services.FormSupport;
+import org.apache.tapestry5.services.ValidationMessagesSource;
/**
* Used by a {@link Field} to enforce a <strong>constraint</strong> related to a form submission. Validators themselves
@@ -25,7 +25,7 @@
* Validators are usually encapsulated inside a {@link FieldValidator}.
*
* @see FieldValidationSupport
- * @see org.apache.tapestry.services.FieldValidatorDefaultSource
+ * @see org.apache.tapestry5.services.FieldValidatorDefaultSource
*/
public interface Validator<C, T>
{
@@ -53,7 +53,7 @@
String getMessageKey();
/**
- * Invoked after the client-submitted value has been {@link org.apache.tapestry.Translator translated} to check that
+ * Invoked after the client-submitted value has been {@link org.apache.tapestry5.Translator translated} to check that
* the value conforms to expectations (often, in terms of minimum or maximum value). If and only if the value is
* approved by all Validators is the value applied by the field.
*
@@ -68,7 +68,7 @@
/**
* Returns true if the validator should be invoked for null or blank (empty string) values. This is generally false,
* but is true for validators that enforce that a non-blank value is required. This is the basis of the {@link
- * org.apache.tapestry.Field#isRequired()} property.
+ * org.apache.tapestry5.Field#isRequired()} property.
*/
boolean isRequired();
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java b/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java
index 0b9867b..702dc6c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/ValueEncoder.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
/**
* Used to convert server side values to client-side strings. This is used when generating a {@link
- * org.apache.tapestry.EventContext} as part of a URL, or when components (such as {@link
- * org.apache.tapestry.corelib.components.Select}) generated other client-side strings.
+ * org.apache.tapestry5.EventContext} as part of a URL, or when components (such as {@link
+ * org.apache.tapestry5.corelib.components.Select}) generated other client-side strings.
* <p/>
* Often a custom implementation is needed for entity type objects, where the {@link #toClient(Object)} method extracts
* a primary key, and the {@link #toValue(String)} re-acquires the corresponding entity object.
*
* @see SelectModel
- * @see org.apache.tapestry.services.ValueEncoderSource
+ * @see org.apache.tapestry5.services.ValueEncoderSource
* @see PrimaryKeyEncoder
*/
public interface ValueEncoder<V>
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/VersionUtils.java b/tapestry-core/src/main/java/org/apache/tapestry5/VersionUtils.java
index 095abb0..a299d06 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/VersionUtils.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/VersionUtils.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
import java.io.BufferedInputStream;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRender.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRender.java
index 428736e..46679c9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRender.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRender.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -22,10 +22,10 @@
/**
* Marker annotation for methods associated with the AfterRender phase. This corresponds closely to {@link
- * org.apache.tapestry.annotation.BeginRender}, but occurs after the template and body of the component have been
+ * org.apache.tapestry5.annotations.BeginRender}, but occurs after the template and body of the component have been
* rendered. Often, this is used to render a close tag. Return void or true (the default) to advance to the {@link
- * org.apache.tapestry.annotation.CleanupRender} phase. Return false to return to the {@link
- * org.apache.tapestry.annotation.BeginRender} phase.
+ * org.apache.tapestry5.annotations.CleanupRender} phase. Return false to return to the {@link
+ * org.apache.tapestry5.annotations.BeginRender} phase.
*/
@Target(ElementType.METHOD)
@Retention(RUNTIME)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRenderBody.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRenderBody.java
index 5bea3b7..6ba2da6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRenderBody.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRenderBody.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRenderTemplate.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRenderTemplate.java
index 5897972..06ce20d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRenderTemplate.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/AfterRenderTemplate.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/ApplicationState.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/ApplicationState.java
index a0fb219..378cc5a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/ApplicationState.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/ApplicationState.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
-import org.apache.tapestry.services.ApplicationStateManager;
+import org.apache.tapestry5.services.ApplicationStateManager;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeforeRenderBody.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeforeRenderBody.java
index 1b8a613..220af3e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeforeRenderBody.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeforeRenderBody.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -22,13 +22,13 @@
/**
* Marks methods to be invoked when the component rendering state machine hits the point in the component's template
- * where the body element occurs. Such methods may optionally take a {@link org.apache.tapestry.MarkupWriter} parameter,
- * and may return void or boolean.
+ * where the body element occurs. Such methods may optionally take a {@link org.apache.tapestry5.MarkupWriter}
+ * parameter, and may return void or boolean.
* <p/>
* Returning true (or void) will queue up the component's body for rendering.
* <p/>
* Returning false will skip the component's body, but continue rendering the template. The {@link
- * org.apache.tapestry.annotation.AfterRenderBody} phase will still execute after the template finishes rendering.
+ * org.apache.tapestry5.annotations.AfterRenderBody} phase will still execute after the template finishes rendering.
* <p/>
* This phase is skipped for components which do not have a body.
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeforeRenderTemplate.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeforeRenderTemplate.java
index 4215232..925c7a6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeforeRenderTemplate.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeforeRenderTemplate.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeginRender.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeginRender.java
index a5c076f..245e802 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeginRender.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/BeginRender.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -24,15 +24,15 @@
* Marker annotation for methods that should be executed at the start of rendering the component. This usually includes
* rendering of the component's start tag.
* <p/>
- * Such methods may optionally take a {@link org.apache.tapestry.MarkupWriter} parameter, and may return void or
+ * Such methods may optionally take a {@link org.apache.tapestry5.MarkupWriter} parameter, and may return void or
* boolean. Returning true or void will allow the component to advance into the render template / render body phase. If
- * a body is present, the {@link org.apache.tapestry.annotation.BeforeRenderBody} phase will execute. If a component has
- * a template, the {@link BeforeRenderTemplate} phase will execute (and the render body will only occur if the template
- * directs so).
+ * a body is present, the {@link org.apache.tapestry5.annotations.BeforeRenderBody} phase will execute. If a component
+ * has a template, the {@link BeforeRenderTemplate} phase will execute (and the render body will only occur if the
+ * template directs so).
* <p/>
- * Either way, the {@link org.apache.tapestry.annotation.AfterRender} phase will execute after the template and/or body
- * have rendered. A component with a body but without a template will still see the {@link
- * org.apache.tapestry.annotation.BeforeRenderBody} phase execute.
+ * Either way, the {@link org.apache.tapestry5.annotations.AfterRender} phase will execute after the template and/or
+ * body have rendered. A component with a body but without a template will still see the {@link
+ * org.apache.tapestry5.annotations.BeforeRenderBody} phase execute.
* <p/>
* Returning false will skip rendering of the template and/or body, and jump directly to the {@link AfterRender} phase.
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Cached.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Cached.java
index 2f29544..c708a09 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Cached.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Cached.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.*;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/CleanupRender.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/CleanupRender.java
index 6843895..79e9a16 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/CleanupRender.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/CleanupRender.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -22,9 +22,9 @@
/**
* Marker annotation for component methods associated with the terminal phase for the component rendering state machine.
- * Methods may optionally take a {@link org.apache.tapestry.MarkupWriter} annotation. Generally, methods marked with
+ * Methods may optionally take a {@link org.apache.tapestry5.MarkupWriter} annotation. Generally, methods marked with
* this annotation are used to perform post-render cleanup. In addition, a method may return false to return to the
- * {@link org.apache.tapestry.annotation.SetupRender} phase. Returning void or true (the default), is the normal
+ * {@link org.apache.tapestry5.annotations.SetupRender} phase. Returning void or true (the default), is the normal
* course.
*/
@Target(ElementType.METHOD)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Component.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Component.java
index dce1e0e..83913b6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Component.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Component.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/ContentType.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/ContentType.java
index a255de6..bc015db 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/ContentType.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/ContentType.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.*;
/**
* An annotation on a page component used to identify the content type the page returns. An alternative to the {@link
- * org.apache.tapestry.annotation.Meta} annotation with the {@link org.apache.tapestry.MetaDataConstants#RESPONSE_CONTENT_TYPE}
+ * org.apache.tapestry5.annotations.Meta} annotation with the {@link org.apache.tapestry5.MetaDataConstants#RESPONSE_CONTENT_TYPE}
* key.
*
- * @see org.apache.tapestry.annotation.ResponseEncoding
+ * @see org.apache.tapestry5.annotations.ResponseEncoding
*/
@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Environmental.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Environmental.java
index 13b1464..3af32b3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Environmental.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Environmental.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
-import org.apache.tapestry.services.Environment;
+import org.apache.tapestry5.services.Environment;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Id.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Id.java
index c2695e6..ecb8ae1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Id.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Id.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.ioc.annotations.Inject;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/IncludeJavaScriptLibrary.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/IncludeJavaScriptLibrary.java
index 8e5c087..530b9fb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/IncludeJavaScriptLibrary.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/IncludeJavaScriptLibrary.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.*;
@@ -21,8 +21,8 @@
* Allows for the inclusion of one or more JavaScript libraries. The libraries are assets, usually (but not always)
* stored on the classpath with the component.
*
- * @see org.apache.tapestry.annotation.IncludeStylesheet
- * @see org.apache.tapestry.annotation.Path
+ * @see org.apache.tapestry5.annotations.IncludeStylesheet
+ * @see org.apache.tapestry5.annotations.Path
*/
@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/IncludeStylesheet.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/IncludeStylesheet.java
index 38583f4..7c50c6b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/IncludeStylesheet.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/IncludeStylesheet.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.*;
@@ -25,11 +25,11 @@
* This saves the work of injecting the asset into a field and injecting the PageRenderSupport environmental service,
* and invoking the method.
* <p/>
- * Does not support setting a media type; if that is required. use {@link org.apache.tapestry.RenderSupport#addStylesheetLink(org.apache.tapestry.Asset,
+ * Does not support setting a media type; if that is required. use {@link org.apache.tapestry5.RenderSupport#addStylesheetLink(org.apache.tapestry5.Asset,
* String)} directly.
*
- * @see org.apache.tapestry.annotation.Path
- * @see org.apache.tapestry.annotation.IncludeJavaScriptLibrary
+ * @see org.apache.tapestry5.annotations.Path
+ * @see org.apache.tapestry5.annotations.IncludeJavaScriptLibrary
*/
@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectComponent.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectComponent.java
index cc39595..4f439ae 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectComponent.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectComponent.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectContainer.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectContainer.java
index f26466b..4cad34f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectContainer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectContainer.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectPage.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectPage.java
index 4c7ab04..0ec8089 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectPage.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/InjectPage.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -34,4 +34,4 @@
* lookup by class name (from the field type).
*/
String value() default "";
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Log.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Log.java
index 373c8ed..31b5232 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Log.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Log.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.*;
@@ -21,7 +21,7 @@
* Marker annotation for component methods to enable debug-level logging. Annotated methods will log method entry (with
* parameters), method exit (with return value, for non-void methods) and any thrown exceptions.
*
- * @see org.apache.tapestry.internal.transform.LogWorker
+ * @see org.apache.tapestry5.internal.transform.LogWorker
*/
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Meta.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Meta.java
index 5beb8d6..3919615 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Meta.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Meta.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
-import org.apache.tapestry.model.ComponentModel;
+import org.apache.tapestry5.model.ComponentModel;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.TYPE;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Mixin.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Mixin.java
index ba77eba..350c584 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Mixin.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Mixin.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/MixinAfter.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/MixinAfter.java
index 56f730b..39d75d4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/MixinAfter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/MixinAfter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.TYPE;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/MixinClasses.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/MixinClasses.java
index f060e82..250666d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/MixinClasses.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/MixinClasses.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Mixins.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Mixins.java
index 5c5beb8..7c70f64 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Mixins.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Mixins.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/OnEvent.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/OnEvent.java
index cd41368..cca40d4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/OnEvent.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/OnEvent.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
-import org.apache.tapestry.EventConstants;
+import org.apache.tapestry5.EventConstants;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -29,7 +29,7 @@
* <p/>
* Client events include a <em>context</em> of one or more values. These context values are included in the action URI.
* The values are optionally supplied to the handler method as parameters. Automatic {@linkplain
- * org.apache.tapestry.ValueEncoder conversion} from string to the type of the actual parameter occur.
+ * org.apache.tapestry5.ValueEncoder conversion} from string to the type of the actual parameter occur.
* <p/>
* Handlers may return a value. Returning a non-null value will abort the handling of the event, and will usually
* control the response sent to the client web browser. The details are somewhat specific to the type of event and the
@@ -53,7 +53,7 @@
* The event type to match. The handler will only be invoked if the client event type matches the value. The default
* value is "action". Matching is case-insensitive.
*
- * @see org.apache.tapestry.EventConstants
+ * @see org.apache.tapestry5.EventConstants
*/
String value() default EventConstants.ACTION;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageAttached.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageAttached.java
index 37e26e9..52ecd7a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageAttached.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageAttached.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageDetached.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageDetached.java
index ae14053..7d27f0f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageDetached.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageDetached.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageLoaded.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageLoaded.java
index a762365..6e85b84 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageLoaded.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/PageLoaded.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Parameter.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Parameter.java
index 978064c..434fe58 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Parameter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Parameter.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.services.BindingFactory;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.services.BindingFactory;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -48,7 +48,7 @@
/**
* If true (the default), then the value for the parameter is cached while the component is, itself, rendering.
* Values from invariant bindings (such as literal strings) are always cached, regardless of this setting. Set this
- * attribute to false to force the parameter to be {@link org.apache.tapestry.Binding#get() re-read} every time the
+ * attribute to false to force the parameter to be {@link org.apache.tapestry5.Binding#get() re-read} every time the
* field is accessed, even while the component is rendering.
*/
boolean cache() default true;
@@ -65,7 +65,7 @@
* specific {@link BindingFactory} implementations, and used with parameters whose name reflects the binding
* prefix.
*
- * @see org.apache.tapestry.BindingConstants
+ * @see org.apache.tapestry5.BindingConstants
*/
String defaultPrefix() default BindingConstants.PROP;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Path.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Path.java
index edfbcc5..be92d4d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Path.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Path.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.ioc.annotations.Inject;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Persist.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Persist.java
index 2c712c4..5360a8b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Persist.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Persist.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
-import org.apache.tapestry.services.MetaDataLocator;
-import org.apache.tapestry.services.Session;
+import org.apache.tapestry5.services.MetaDataLocator;
+import org.apache.tapestry5.services.Session;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Property.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Property.java
index d29ce1d..23bdf96 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Property.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Property.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/ResponseEncoding.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/ResponseEncoding.java
index 4233024..ded905a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/ResponseEncoding.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/ResponseEncoding.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.*;
/**
* An annotation on a page component used to identify the respones encoding (the character set of the text sent in the
- * response). An alternative to the {@link org.apache.tapestry.annotation.Meta} annotation with the {@link
- * org.apache.tapestry.MetaDataConstants#RESPONSE_ENCODING} key.
+ * response). An alternative to the {@link org.apache.tapestry5.annotations.Meta} annotation with the {@link
+ * org.apache.tapestry5.MetaDataConstants#RESPONSE_ENCODING} key.
*
- * @see org.apache.tapestry.annotation.ContentType
+ * @see org.apache.tapestry5.annotations.ContentType
*/
@Target({ ElementType.TYPE })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Retain.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Retain.java
index bbf9ad8..5be9fcf 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Retain.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Retain.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Secure.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Secure.java
index e7fedd3..7eeb8e6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Secure.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Secure.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.TYPE;
@@ -23,7 +23,7 @@
/**
* A marker annotation that indicates that the page in question may only be accessed via HTTPS.
*
- * @see org.apache.tapestry.MetaDataConstants#SECURE_PAGE
+ * @see org.apache.tapestry5.MetaDataConstants#SECURE_PAGE
*/
@Target(TYPE)
@Retention(RUNTIME)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Service.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Service.java
index 66e7485..62d67bb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Service.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/Service.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.ioc.annotations.Inject;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SetupRender.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SetupRender.java
index 30bf5c6..20fe8a7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SetupRender.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SetupRender.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -22,9 +22,9 @@
/**
* Marker annotation for methods that should be executed during the SetupRender phase. Such methods may optionally take
- * a {@link org.apache.tapestry.MarkupWriter} parameter, and may return void or boolean. Returning true or void will
- * advance to the {@link org.apache.tapestry.annotation.BeginRender} phase. Return false to skip the BeginRender phase
- * and procede directly to the {@link org.apache.tapestry.annotation.CleanupRender} phase.
+ * a {@link org.apache.tapestry5.MarkupWriter} parameter, and may return void or boolean. Returning true or void will
+ * advance to the {@link org.apache.tapestry5.annotations.BeginRender} phase. Return false to skip the BeginRender phase
+ * and procede directly to the {@link org.apache.tapestry5.annotations.CleanupRender} phase.
*/
@Target(ElementType.METHOD)
@Retention(RUNTIME)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SupportsInformalParameters.java b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SupportsInformalParameters.java
index 04a473a..d0264ef 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SupportsInformalParameters.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/annotations/SupportsInformalParameters.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.annotation;
+package org.apache.tapestry5.annotations;
-import org.apache.tapestry.model.ComponentModel;
+import org.apache.tapestry5.model.ComponentModel;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.TYPE;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java
index d3dc12c..27f38db 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/BeanModel.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
-import org.apache.tapestry.PropertyConduit;
+import org.apache.tapestry5.PropertyConduit;
import java.util.List;
@@ -24,11 +24,11 @@
* <p/>
* BeanModels are not thread-safe, they are also not serializable.
* <p/>
- * Here, and in {@link org.apache.tapestry.beaneditor.PropertyModel}, the term "propertyName" is used for simplicitly.
- * However, a full {@linkplain org.apache.tapestry.services.PropertyConduitSource#create(Class, String) property
+ * Here, and in {@link org.apache.tapestry5.beaneditor.PropertyModel}, the term "propertyName" is used for simplicitly.
+ * However, a full {@linkplain org.apache.tapestry5.services.PropertyConduitSource#create(Class, String) property
* expression} may be utilized when {@linkplain #add(String) adding new properties to an existing BeanModel}.
*
- * @see org.apache.tapestry.services.BeanModelSource
+ * @see org.apache.tapestry5.services.BeanModelSource
*/
public interface BeanModel<T>
{
@@ -39,8 +39,8 @@
/**
- * Creates a new bean instance. This is based on {@link org.apache.tapestry.ioc.ObjectLocator#autobuild(Class)}, so
- * a public constructor will be used, and dependencies injected.
+ * Creates a new bean instance. This is based on {@link org.apache.tapestry5.ioc.ObjectLocator#autobuild(Class)},
+ * so a public constructor will be used, and dependencies injected.
*
* @return new instance of the bean
*/
@@ -63,7 +63,7 @@
/**
* Returns the identified model. Property ids are a stripped version of the property name. Case is ignored.
*
- * @param propertyId matched caselessly against {@link org.apache.tapestry.beaneditor.PropertyModel#getId()}
+ * @param propertyId matched caselessly against {@link org.apache.tapestry5.beaneditor.PropertyModel#getId()}
* @throws RuntimeException if the bean editor model does not have a property model with the indicated id
*/
PropertyModel getById(String propertyId);
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/PropertyModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/PropertyModel.java
index bc2c50d..6095fb9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/PropertyModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/beaneditor/PropertyModel.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.beaneditor;
+package org.apache.tapestry5.beaneditor;
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.ioc.AnnotationProvider;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.ioc.AnnotationProvider;
/**
- * Part of a {@link org.apache.tapestry.beaneditor.BeanModel} that defines the attributes of a single property of a
+ * Part of a {@link org.apache.tapestry5.beaneditor.BeanModel} that defines the attributes of a single property of a
* bean.
* <p/>
* <p/>
- * A PropertyModel is also an {@link AnnotationProvider}, as long as the {@link org.apache.tapestry.PropertyConduit} is
- * non-null. When there is no property conduit, then {@link org.apache.tapestry.ioc.AnnotationProvider#getAnnotation(Class)}
+ * A PropertyModel is also an {@link AnnotationProvider}, as long as the {@link org.apache.tapestry5.PropertyConduit} is
+ * non-null. When there is no property conduit, then {@link org.apache.tapestry5.ioc.AnnotationProvider#getAnnotation(Class)}
* will return null.
*/
public interface PropertyModel extends AnnotationProvider
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractComponentEventLink.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractComponentEventLink.java
index 74a8438..5982e39 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractComponentEventLink.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractComponentEventLink.java
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.base;
+package org.apache.tapestry5.corelib.base;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.internal.services.ClientBehaviorSupport;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.internal.services.ClientBehaviorSupport;
import java.util.List;
/**
* Base class for link-generating components that are based on a component event request. Such events have an event
- * context and may also update a {@link org.apache.tapestry.corelib.components.Zone}.
+ * context and may also update a {@link org.apache.tapestry5.corelib.components.Zone}.
*/
public abstract class AbstractComponentEventLink extends AbstractLink
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java
index 2159f20..e24b97a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractField.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.base;
+package org.apache.tapestry5.corelib.base;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.*;
-import org.apache.tapestry.corelib.mixins.DiscardBody;
-import org.apache.tapestry.corelib.mixins.RenderDisabled;
-import org.apache.tapestry.corelib.mixins.RenderInformals;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.ComponentDefaultProvider;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.corelib.mixins.DiscardBody;
+import org.apache.tapestry5.corelib.mixins.RenderDisabled;
+import org.apache.tapestry5.corelib.mixins.RenderInformals;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.ComponentDefaultProvider;
+import org.apache.tapestry5.services.FormSupport;
import java.io.Serializable;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractLink.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractLink.java
index 20a9798..1d27c51 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractLink.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractLink.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.base;
+package org.apache.tapestry5.corelib.base;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.SetupRender;
-import org.apache.tapestry.annotation.SupportsInformalParameters;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.internal.services.ComponentInvocationMap;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.SetupRender;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.internal.services.ComponentInvocationMap;
+import org.apache.tapestry5.ioc.annotations.Inject;
/**
* Provides base utilities for classes that generate clickable links.
@@ -75,7 +75,7 @@
/**
* Writes an <a> element with the provided link as the href attribute. A call to {@link
- * org.apache.tapestry.MarkupWriter#end()} is <em>not</em> provided. Automatically appends an anchor if
+ * org.apache.tapestry5.MarkupWriter#end()} is <em>not</em> provided. Automatically appends an anchor if
* the component's anchor parameter is non-null. Informal parameters are rendered as well.
*
* @param writer to write markup to
@@ -96,7 +96,7 @@
}
/**
- * Returns the most recently rendered {@link org.apache.tapestry.Link} for this component. Subclasses calculate
+ * Returns the most recently rendered {@link org.apache.tapestry5.Link} for this component. Subclasses calculate
* their link value as they render, and the value is valid until the end of the request, or the next time the same
* component renders itself (if inside a loop).
*
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutput.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutput.java
index 0668339..eb4fc12 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutput.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutput.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.base;
+package org.apache.tapestry5.corelib.base;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.BeanBlockSource;
-import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.services.PropertyOutputContext;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.BeanBlockSource;
+import org.apache.tapestry5.services.Environment;
+import org.apache.tapestry5.services.PropertyOutputContext;
/**
* Base class for components that output a property value using a {@link PropertyModel}. There's a relationship between
@@ -54,7 +54,7 @@
/**
* Identifies the object being rendered. The component will extract a property from the object and render its value
- * (or delegate to a {@link org.apache.tapestry.Block} that will do so).
+ * (or delegate to a {@link org.apache.tapestry5.Block} that will do so).
*/
@Parameter(required = true)
private Object object;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractTextField.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractTextField.java
index f6c11a2..8535bcc 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractTextField.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/AbstractTextField.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.base;
+package org.apache.tapestry5.corelib.base;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.*;
-import org.apache.tapestry.beaneditor.Width;
-import org.apache.tapestry.corelib.mixins.RenderDisabled;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.ComponentDefaultProvider;
-import org.apache.tapestry.services.FieldValidatorDefaultSource;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.beaneditor.Width;
+import org.apache.tapestry5.corelib.mixins.RenderDisabled;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.ComponentDefaultProvider;
+import org.apache.tapestry5.services.FieldValidatorDefaultSource;
+import org.apache.tapestry5.services.Request;
import java.lang.annotation.Annotation;
import java.util.Locale;
@@ -41,7 +41,7 @@
* <p/>
* Likewise, on a form submit, the "parseclient" event handler method will be passed the string provided by the client,
* and may provide a non-null value as the parsed value. Returning null allows the normal translator to operate. The
- * event handler may also throw {@link org.apache.tapestry.ValidationException}.
+ * event handler may also throw {@link org.apache.tapestry5.ValidationException}.
*/
public abstract class AbstractTextField extends AbstractField
{
@@ -73,7 +73,7 @@
* Provider of annotations used for some defaults. Annotation are usually provided in terms of the value parameter
* (i.e., from the getter and/or setter bound to the value parameter).
*
- * @see org.apache.tapestry.beaneditor.Width
+ * @see org.apache.tapestry5.beaneditor.Width
*/
@Parameter
private AnnotationProvider annotationProvider;
@@ -112,8 +112,8 @@
private ComponentDefaultProvider defaultProvider;
/**
- * Computes a default value for the "translate" parameter using {@link org.apache.tapestry.services.ComponentDefaultProvider#defaultTranslator(String,
- * org.apache.tapestry.ComponentResources)}.
+ * Computes a default value for the "translate" parameter using {@link org.apache.tapestry5.services.ComponentDefaultProvider#defaultTranslator(String,
+ * org.apache.tapestry5.ComponentResources)}.
*/
final Translator defaultTranslate()
{
@@ -132,7 +132,7 @@
}
/**
- * Computes a default value for the "validate" parameter using {@link org.apache.tapestry.services.FieldValidatorDefaultSource}.
+ * Computes a default value for the "validate" parameter using {@link org.apache.tapestry5.services.FieldValidatorDefaultSource}.
*/
final FieldValidator defaultValidate()
{
@@ -223,7 +223,7 @@
}
/**
- * Looks for a {@link org.apache.tapestry.beaneditor.Width} annotation and, if present, returns its value as a
+ * Looks for a {@link org.apache.tapestry5.beaneditor.Width} annotation and, if present, returns its value as a
* string.
*
* @return the indicated width, or null if the annotation is not present
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/BaseMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/BaseMessages.java
index d8263bf..43654c6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/BaseMessages.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/base/BaseMessages.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.base;
+package org.apache.tapestry5.corelib.base;
-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;
public final class BaseMessages
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ActionLink.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ActionLink.java
index adfae2b..e209090 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ActionLink.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ActionLink.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.EventConstants;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.corelib.base.AbstractComponentEventLink;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.corelib.base.AbstractComponentEventLink;
+import org.apache.tapestry5.ioc.annotations.Inject;
/**
* Component that triggers an action on the server with a subsequent full page refresh.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Any.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Any.java
index 871ea89..ba0f3ee 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Any.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Any.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.SupportsInformalParameters;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.ioc.annotations.Inject;
/**
* Renders an arbitrary element including informal parameters.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanDisplay.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanDisplay.java
index 8244d10..7f04ed8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanDisplay.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanDisplay.java
@@ -12,27 +12,27 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.annotation.SupportsInformalParameters;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.internal.beaneditor.BeanModelUtils;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.BeanModelSource;
-import org.apache.tapestry.services.ComponentDefaultProvider;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.internal.beaneditor.BeanModelUtils;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.BeanModelSource;
+import org.apache.tapestry5.services.ComponentDefaultProvider;
/**
* Used to display the properties of a bean, using an underlying {@link BeanModel}. The output is a series of
* <div> elements for the property names and property values. Only properties that have a known data type are
* displayed.
*
- * @see org.apache.tapestry.beaneditor.DataType
+ * @see org.apache.tapestry5.beaneditor.DataType
* @see BeanModel
*/
@SupportsInformalParameters
@@ -63,7 +63,7 @@
private BeanModel model;
/**
- * A comma-separated list of property names to be retained from the {@link org.apache.tapestry.beaneditor.BeanModel}.
+ * A comma-separated list of property names to be retained from the {@link org.apache.tapestry5.beaneditor.BeanModel}.
* Only these properties will be retained, and the properties will also be reordered. The names are
* case-insensitive.
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditForm.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditForm.java
index 696e989..85c3c66 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditForm.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditForm.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.annotation.SupportsInformalParameters;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.internal.beaneditor.BeanModelUtils;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.BeanModelSource;
-import org.apache.tapestry.services.ComponentDefaultProvider;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.internal.beaneditor.BeanModelUtils;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.BeanModelSource;
+import org.apache.tapestry5.services.ComponentDefaultProvider;
/**
* A component that creates an entire form editing the properties of a particular bean. Inspired by <a
@@ -63,7 +63,7 @@
private Object object;
/**
- * A comma-separated list of property names to be retained from the {@link org.apache.tapestry.beaneditor.BeanModel}.
+ * A comma-separated list of property names to be retained from the {@link org.apache.tapestry5.beaneditor.BeanModel}.
* Only these properties will be retained, and the properties will also be reordered. The names are
* case-insensitive.
*/
@@ -72,7 +72,7 @@
private String include;
/**
- * A comma-separated list of property names to be removed from the {@link org.apache.tapestry.beaneditor.BeanModel}.
+ * A comma-separated list of property names to be removed from the {@link org.apache.tapestry5.beaneditor.BeanModel}.
* The names are case-insensitive.
*/
@SuppressWarnings("unused")
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditor.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditor.java
index c44fe7c..067265a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditor.java
@@ -12,24 +12,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.ComponentAction;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.annotation.SupportsInformalParameters;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.corelib.internal.InternalMessages;
-import org.apache.tapestry.internal.beaneditor.BeanModelUtils;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.services.BeanModelSource;
-import org.apache.tapestry.services.ComponentDefaultProvider;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.ComponentAction;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.corelib.internal.InternalMessages;
+import org.apache.tapestry5.internal.beaneditor.BeanModelUtils;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.services.BeanModelSource;
+import org.apache.tapestry5.services.ComponentDefaultProvider;
+import org.apache.tapestry5.services.FormSupport;
/**
* A component that generates a user interface for editing the properties of a bean. This is the central component of
@@ -57,7 +57,7 @@
private Object object;
/**
- * A comma-separated list of property names to be retained from the {@link org.apache.tapestry.beaneditor.BeanModel}.
+ * A comma-separated list of property names to be retained from the {@link org.apache.tapestry5.beaneditor.BeanModel}.
* Only these properties will be retained, and the properties will also be reordered. The names are
* case-insensitive.
*/
@@ -66,7 +66,7 @@
private String include;
/**
- * A comma-separated list of property names to be removed from the {@link org.apache.tapestry.beaneditor.BeanModel}.
+ * A comma-separated list of property names to be removed from the {@link org.apache.tapestry5.beaneditor.BeanModel}.
* The names are case-insensitive.
*/
@Parameter(defaultPrefix = BindingConstants.LITERAL)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checkbox.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checkbox.java
index 68f280b..200aff2 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checkbox.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Checkbox.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationTracker;
-import org.apache.tapestry.annotation.*;
-import org.apache.tapestry.corelib.base.AbstractField;
-import org.apache.tapestry.corelib.mixins.RenderDisabled;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationTracker;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.corelib.base.AbstractField;
+import org.apache.tapestry5.corelib.mixins.RenderDisabled;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.Request;
/**
* A Checkbox component is simply a <input type="checkbox">.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
index c50546b..8289378 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/DateField.java
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.IncludeJavaScriptLibrary;
-import org.apache.tapestry.annotation.IncludeStylesheet;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.corelib.base.AbstractField;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.FieldValidatorDefaultSource;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary;
+import org.apache.tapestry5.annotations.IncludeStylesheet;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.corelib.base.AbstractField;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.json.JSONObject;
+import org.apache.tapestry5.services.FieldValidatorDefaultSource;
+import org.apache.tapestry5.services.Request;
import java.text.DateFormat;
import java.text.ParseException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Delegate.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Delegate.java
index 1f5b84b..97c2009 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Delegate.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Delegate.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.Parameter;
/**
* A component that does not do any rendering of its own, but will delegate to some other object that can do rendering.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Errors.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Errors.java
index 0be77c1..f740c17 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Errors.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Errors.java
@@ -12,22 +12,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.CSSClassConstants;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationTracker;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.corelib.internal.InternalMessages;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.CSSClassConstants;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationTracker;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.corelib.internal.InternalMessages;
+import org.apache.tapestry5.services.FormSupport;
import java.util.List;
/**
- * Standard validation error presenter. Must be enclosed by a {@link org.apache.tapestry.corelib.components.Form}
+ * Standard validation error presenter. Must be enclosed by a {@link org.apache.tapestry5.corelib.components.Form}
* component. If errors are present, renders a div element around a banner message and around an unnumbered list of
- * error messages. Renders nothing if the {@link org.apache.tapestry.ValidationTracker} shows no errors.
+ * error messages. Renders nothing if the {@link org.apache.tapestry5.ValidationTracker} shows no errors.
*/
public class Errors
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/EventLink.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/EventLink.java
index dee048a..31c65e1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/EventLink.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/EventLink.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.corelib.base.AbstractComponentEventLink;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.corelib.base.AbstractComponentEventLink;
+import org.apache.tapestry5.ioc.annotations.Inject;
/**
- * A close relative of {@link org.apache.tapestry.corelib.components.ActionLink} except in two ways.
+ * A close relative of {@link org.apache.tapestry5.corelib.components.ActionLink} except in two ways.
* <p/>
* First, the event that it triggers is explicitly controlled, rather than always "action".
* <p/>
@@ -35,7 +35,7 @@
{
/**
* The name of the event to be triggered in the parent component. Defaults to the id of the component. An {@link
- * org.apache.tapestry.corelib.components.ActionLink} triggers an "action" event on itself, and EventLink component
+ * org.apache.tapestry5.corelib.components.ActionLink} triggers an "action" event on itself, and EventLink component
* triggers any arbitrary event on <em>its container</em>.
*/
@Parameter(defaultPrefix = BindingConstants.LITERAL)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ExceptionDisplay.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ExceptionDisplay.java
index 0f14f81..a34f884 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ExceptionDisplay.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/ExceptionDisplay.java
@@ -12,24 +12,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.ioc.services.ExceptionAnalysis;
-import org.apache.tapestry.ioc.services.ExceptionAnalyzer;
-import org.apache.tapestry.ioc.services.ExceptionInfo;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.ioc.services.ExceptionAnalysis;
+import org.apache.tapestry5.ioc.services.ExceptionAnalyzer;
+import org.apache.tapestry5.ioc.services.ExceptionInfo;
import java.util.List;
/**
- * Integral part of the default {@link org.apache.tapestry.corelib.pages.ExceptionReport} page used to break apart and
+ * Integral part of the default {@link org.apache.tapestry5.corelib.pages.ExceptionReport} page used to break apart and
* display the properties of the exception.
*
- * @see org.apache.tapestry.ioc.services.ExceptionAnalyzer
+ * @see org.apache.tapestry5.ioc.services.ExceptionAnalyzer
*/
public class ExceptionDisplay
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java
index 96b64ac..900459a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Form.java
@@ -12,28 +12,28 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Mixin;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.corelib.internal.FormSupportImpl;
-import org.apache.tapestry.corelib.mixins.RenderInformals;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.internal.services.ClientBehaviorSupport;
-import org.apache.tapestry.internal.services.ComponentInvocationMap;
-import org.apache.tapestry.internal.services.ComponentResultProcessorWrapper;
-import org.apache.tapestry.internal.services.HeartbeatImpl;
-import org.apache.tapestry.internal.util.Base64ObjectInputStream;
-import org.apache.tapestry.internal.util.Base64ObjectOutputStream;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Mixin;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.corelib.internal.FormSupportImpl;
+import org.apache.tapestry5.corelib.mixins.RenderInformals;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.internal.services.ClientBehaviorSupport;
+import org.apache.tapestry5.internal.services.ComponentInvocationMap;
+import org.apache.tapestry5.internal.services.ComponentResultProcessorWrapper;
+import org.apache.tapestry5.internal.services.HeartbeatImpl;
+import org.apache.tapestry5.internal.util.Base64ObjectInputStream;
+import org.apache.tapestry5.internal.util.Base64ObjectOutputStream;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.*;
import java.io.EOFException;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java
index c9d6a6b..ba3acfd 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.java
@@ -12,24 +12,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.SupportsInformalParameters;
-import org.apache.tapestry.corelib.internal.FormSupportAdapter;
-import org.apache.tapestry.corelib.internal.WrappedComponentAction;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.internal.services.ClientBehaviorSupport;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ComponentSource;
-import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.corelib.internal.FormSupportAdapter;
+import org.apache.tapestry5.corelib.internal.WrappedComponentAction;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.internal.services.ClientBehaviorSupport;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.ComponentSource;
+import org.apache.tapestry5.services.Environment;
+import org.apache.tapestry5.services.FormSupport;
+import org.apache.tapestry5.services.Request;
import java.util.List;
@@ -39,7 +39,7 @@
* processing for such fields when the form is submitted; the fragment uses a hidden field to track its client-side
* visibility and will bypass field component submission logic for the components it encloses.
*
- * @see org.apache.tapestry.corelib.mixins.TriggerFragment
+ * @see org.apache.tapestry5.corelib.mixins.TriggerFragment
*/
@SupportsInformalParameters
public class FormFragment implements ClientElement
@@ -128,7 +128,7 @@
}
/**
- * Renders a <div> tag and provides an override of the {@link org.apache.tapestry.services.FormSupport}
+ * Renders a <div> tag and provides an override of the {@link org.apache.tapestry5.services.FormSupport}
* environmental.
*/
void beginRender(MarkupWriter writer)
@@ -196,7 +196,7 @@
}
/**
- * Closes the <div> tag and pops off the {@link org.apache.tapestry.services.FormSupport} environmental
+ * Closes the <div> tag and pops off the {@link org.apache.tapestry5.services.FormSupport} environmental
* override.
*
* @param writer
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java
index 38780a4..97b5584 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormInjector.java
@@ -12,23 +12,23 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.SupportsInformalParameters;
-import org.apache.tapestry.corelib.data.InsertPosition;
-import org.apache.tapestry.corelib.internal.FormSupportImpl;
-import org.apache.tapestry.internal.services.ClientBehaviorSupport;
-import org.apache.tapestry.internal.services.ComponentResultProcessorWrapper;
-import org.apache.tapestry.internal.services.PageRenderQueue;
-import org.apache.tapestry.internal.util.Base64ObjectOutputStream;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.IdAllocator;
-import org.apache.tapestry.runtime.RenderCommand;
-import org.apache.tapestry.runtime.RenderQueue;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.corelib.data.InsertPosition;
+import org.apache.tapestry5.corelib.internal.FormSupportImpl;
+import org.apache.tapestry5.internal.services.ClientBehaviorSupport;
+import org.apache.tapestry5.internal.services.ComponentResultProcessorWrapper;
+import org.apache.tapestry5.internal.services.PageRenderQueue;
+import org.apache.tapestry5.internal.util.Base64ObjectOutputStream;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.IdAllocator;
+import org.apache.tapestry5.runtime.RenderCommand;
+import org.apache.tapestry5.runtime.RenderQueue;
+import org.apache.tapestry5.services.*;
import java.io.IOException;
import java.util.List;
@@ -219,4 +219,4 @@
return setup;
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java
index bd774c7..747870e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Grid.java
@@ -12,24 +12,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.*;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.corelib.data.GridPagerPosition;
-import org.apache.tapestry.grid.*;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.internal.beaneditor.BeanModelUtils;
-import org.apache.tapestry.internal.bindings.AbstractBinding;
-import org.apache.tapestry.internal.services.ClientBehaviorSupport;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.services.BeanModelSource;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.corelib.data.GridPagerPosition;
+import org.apache.tapestry5.grid.*;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.internal.beaneditor.BeanModelUtils;
+import org.apache.tapestry5.internal.bindings.AbstractBinding;
+import org.apache.tapestry5.internal.services.ClientBehaviorSupport;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.services.BeanModelSource;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.services.FormSupport;
+import org.apache.tapestry5.services.Request;
import java.io.IOException;
import java.util.Collections;
@@ -39,15 +39,15 @@
* A grid presents tabular data. It is a composite component, created in terms of several sub-components. The
* sub-components are statically wired to the Grid, as it provides access to the data and other models that they need.
* <p/>
- * A Grid may operate inside a {@link org.apache.tapestry.corelib.components.Form}. By overriding the cell renderers of
+ * A Grid may operate inside a {@link org.apache.tapestry5.corelib.components.Form}. By overriding the cell renderers of
* properties, the default output-only behavior can be changed to produce a complex form with individual control for
* editing properties of each row. This is currently workable but less than ideal -- if the order of rows provided by
* the {@link GridDataSource} changes between render and form submission, then there's the possibility that data will be
* applied to the wrong server-side objects.
*
- * @see org.apache.tapestry.beaneditor.BeanModel
- * @see org.apache.tapestry.services.BeanModelSource
- * @see org.apache.tapestry.grid.GridDataSource
+ * @see org.apache.tapestry5.beaneditor.BeanModel
+ * @see org.apache.tapestry5.services.BeanModelSource
+ * @see org.apache.tapestry5.grid.GridDataSource
*/
@SupportsInformalParameters
public class Grid implements GridModel
@@ -107,14 +107,14 @@
private GridSortModel sortModel;
/**
- * A comma-seperated list of property names to be added to the {@link org.apache.tapestry.beaneditor.BeanModel}.
+ * A comma-seperated list of property names to be added to the {@link org.apache.tapestry5.beaneditor.BeanModel}.
* Cells for added columns will be blank unless a cell override is provided.
*/
@Parameter(defaultPrefix = BindingConstants.LITERAL)
private String add;
/**
- * A comma-separated list of property names to be retained from the {@link org.apache.tapestry.beaneditor.BeanModel}.
+ * A comma-separated list of property names to be retained from the {@link org.apache.tapestry5.beaneditor.BeanModel}.
* Only these properties will be retained, and the properties will also be reordered. The names are
* case-insensitive.
*/
@@ -123,7 +123,7 @@
private String include;
/**
- * A comma-separated list of property names to be removed from the {@link org.apache.tapestry.beaneditor.BeanModel}.
+ * A comma-separated list of property names to be removed from the {@link org.apache.tapestry5.beaneditor.BeanModel}.
* The names are case-insensitive.
*/
@Parameter(defaultPrefix = BindingConstants.LITERAL)
@@ -181,7 +181,7 @@
/**
* If true, then the Grid will be wrapped in an element that acts like a {@link
- * org.apache.tapestry.corelib.components.Zone}; all the paging and sorting links will
+ * org.apache.tapestry5.corelib.components.Zone}; all the paging and sorting links will
*/
@Parameter
private boolean inPlace;
@@ -508,7 +508,7 @@
/**
* Resets the Grid to inital settings; this sets the current page to one, and {@linkplain
- * org.apache.tapestry.grid.GridSortModel#clear() clears the sort model}.
+ * org.apache.tapestry5.grid.GridSortModel#clear() clears the sort model}.
*/
public void reset()
{
@@ -519,7 +519,7 @@
/**
* Event handler for inplaceupdate event triggered from nested components when an Ajax update occurs. The event
* context will carry the zone, which is recorded here, to allow the Grid and its sub-components to properly
- * re-render themselves. Invokes {@link org.apache.tapestry.services.ComponentEventResultProcessor#processResultValue(Object)}
+ * re-render themselves. Invokes {@link org.apache.tapestry5.services.ComponentEventResultProcessor#processResultValue(Object)}
* passing this (the Grid component) as the content provider for the update.
*/
void onInPlaceUpdate(String zone) throws IOException
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridCell.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridCell.java
index 5f99836..7fe4f2d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridCell.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridCell.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.corelib.base.AbstractPropertyOutput;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.corelib.base.AbstractPropertyOutput;
/**
* Part of {@link Grid} that renders the markup inside a single data cell. GridCell is used inside a pair of loops; the
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridColumns.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridColumns.java
index 98a0657..79d58ed 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridColumns.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridColumns.java
@@ -12,22 +12,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.*;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.grid.ColumnSort;
-import org.apache.tapestry.grid.GridConstants;
-import org.apache.tapestry.grid.GridModel;
-import org.apache.tapestry.grid.GridSortModel;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.grid.ColumnSort;
+import org.apache.tapestry5.grid.GridConstants;
+import org.apache.tapestry5.grid.GridModel;
+import org.apache.tapestry5.grid.GridSortModel;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java
index 5448f33..a3d68de 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridPager.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.grid.GridDataSource;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.services.ClientBehaviorSupport;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.grid.GridDataSource;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.services.ClientBehaviorSupport;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.annotations.Inject;
/**
* Generates a series of links used to jump to a particular page index within the overall data set.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridRows.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridRows.java
index 799953b..93648c4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridRows.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/GridRows.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.ComponentAction;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.grid.GridConstants;
-import org.apache.tapestry.grid.GridDataSource;
-import org.apache.tapestry.grid.GridModel;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.ComponentAction;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.grid.GridConstants;
+import org.apache.tapestry5.grid.GridDataSource;
+import org.apache.tapestry5.grid.GridModel;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.FormSupport;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java
index 50d7c7b..18fea4a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/If.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.Parameter;
/**
* Conditionally renders its body.
@@ -38,8 +38,8 @@
private boolean negate;
/**
- * An alternate {@link org.apache.tapestry.Block} to render if the test parameter is false. The default, null, means
- * render nothing in that situation.
+ * An alternate {@link org.apache.tapestry5.Block} to render if the test parameter is false. The default, null,
+ * means render nothing in that situation.
*/
@Parameter(name = "else")
private Block elseBlock;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java
index 3b93666..e0ea77e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Label.java
@@ -12,25 +12,25 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationDecorator;
-import org.apache.tapestry.annotation.*;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.Heartbeat;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationDecorator;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.Heartbeat;
/**
* Generates a <label> element for a particular field.
* <p/>
* A Label will render its body, if it has one. However, in most cases it will not have a body, and will render its
- * {@linkplain org.apache.tapestry.Field#getLabel() field's label} as it's body. Remember, however, that it is the field
- * label that will be used in any error messages. The Label component allows for client- and server-side validation
- * error decorations.
+ * {@linkplain org.apache.tapestry5.Field#getLabel() field's label} as it's body. Remember, however, that it is the
+ * field label that will be used in any error messages. The Label component allows for client- and server-side
+ * validation error decorations.
*/
@SupportsInformalParameters
public class Label
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Loop.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Loop.java
index 98de695..419bc01 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Loop.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Loop.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.*;
-import org.apache.tapestry.ioc.annotation.Inject;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.services.ComponentDefaultProvider;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.services.Heartbeat;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.services.ComponentDefaultProvider;
+import org.apache.tapestry5.services.FormSupport;
+import org.apache.tapestry5.services.Heartbeat;
import java.io.Serializable;
import java.util.Iterator;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Output.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Output.java
index a93c583..dba4641 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Output.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Output.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.SupportsInformalParameters;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.ComponentDefaultProvider;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.ComponentDefaultProvider;
import java.text.Format;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/OutputRaw.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/OutputRaw.java
index 49ea45f..bee38db 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/OutputRaw.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/OutputRaw.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.ComponentDefaultProvider;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.ComponentDefaultProvider;
/**
* Used to output raw markup to the client. Unlike, say, an expansion, the output from OutputRaw is unfiltered, with any
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PageLink.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PageLink.java
index 8d3f394..9f15817 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PageLink.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PageLink.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.corelib.base.AbstractLink;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.corelib.base.AbstractLink;
+import org.apache.tapestry5.ioc.annotations.Inject;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
index af4bebf..5dab076 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Palette.java
@@ -12,21 +12,21 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.IncludeJavaScriptLibrary;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.corelib.base.AbstractField;
-import org.apache.tapestry.internal.util.SelectModelRenderer;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.corelib.base.AbstractField;
+import org.apache.tapestry5.internal.util.SelectModelRenderer;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newSet;
import org.apache.tapestry5.json.JSONArray;
+import org.apache.tapestry5.services.Request;
import java.util.Collections;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PasswordField.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PasswordField.java
index 7b90f03..50fba96 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PasswordField.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PasswordField.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.corelib.base.AbstractTextField;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.corelib.base.AbstractTextField;
/**
* A version of {@link TextField}, but rendered out as an <input type="password"> element. Further, the output
* value for a PasswordField is always blank.
* <p/>
- * Includes the <code>size</code> attribute, if a {@link org.apache.tapestry.beaneditor.Width} annotation is present on
+ * Includes the <code>size</code> attribute, if a {@link org.apache.tapestry5.beaneditor.Width} annotation is present on
* the property bound to the value parameter.
*/
public class PasswordField extends AbstractTextField
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyDisplay.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyDisplay.java
index d0df959..08680f5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyDisplay.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyDisplay.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.corelib.base.AbstractPropertyOutput;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.corelib.base.AbstractPropertyOutput;
/**
* Outputs a single property value. Overrides for individual properties come from block parameters whose name matches
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java
index 48109f2..6253cb7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/PropertyEditor.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.services.*;
import java.lang.annotation.Annotation;
import java.util.Locale;
@@ -118,8 +118,8 @@
private TranslatorSource translatorSource;
/**
- * Creates a {@link org.apache.tapestry.services.PropertyEditContext} and pushes it onto the {@link
- * org.apache.tapestry.services.Environment} stack.
+ * Creates a {@link org.apache.tapestry5.services.PropertyEditContext} and pushes it onto the {@link
+ * org.apache.tapestry5.services.Environment} stack.
*/
void setupEnvironment(final String propertyName)
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Radio.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Radio.java
index 7d2d97e..c84ebc4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Radio.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Radio.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Mixin;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.corelib.mixins.DiscardBody;
-import org.apache.tapestry.corelib.mixins.RenderDisabled;
-import org.apache.tapestry.corelib.mixins.RenderInformals;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.ComponentDefaultProvider;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Mixin;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.corelib.mixins.DiscardBody;
+import org.apache.tapestry5.corelib.mixins.RenderDisabled;
+import org.apache.tapestry5.corelib.mixins.RenderInformals;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.ComponentDefaultProvider;
/**
* A radio button (i.e., <input type="radio">). Radio buttons <strong>must</strong> operate within a {@link
@@ -94,7 +94,7 @@
}
/**
- * Returns the control name provided by the containing {@link org.apache.tapestry.RadioContainer}.
+ * Returns the control name provided by the containing {@link org.apache.tapestry5.RadioContainer}.
*/
public String getControlName()
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/RadioGroup.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/RadioGroup.java
index 282fe81..875ec9e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/RadioGroup.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/RadioGroup.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.*;
public class RadioGroup implements Field
{
@@ -201,7 +201,7 @@
/**
* Returns null; the radio group does not render as a tag and so doesn't have an id to share. RadioGroup implements
- * {@link org.apache.tapestry.Field} only so it can interact with the {@link org.apache.tapestry.ValidationTracker}.
+ * {@link org.apache.tapestry5.Field} only so it can interact with the {@link org.apache.tapestry5.ValidationTracker}.
*
* @return null
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/RenderObject.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/RenderObject.java
index a834a2f..8aa2e3b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/RenderObject.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/RenderObject.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.corelib.pages.ExceptionReport;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.annotation.Primary;
-import org.apache.tapestry.services.ObjectRenderer;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.corelib.pages.ExceptionReport;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.Primary;
+import org.apache.tapestry5.services.ObjectRenderer;
/**
* Renders out an object using the {@link ObjectRenderer} service. Used primarily on the {@link ExceptionReport} page.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java
index 559bac0..d7645f1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Select.java
@@ -12,23 +12,23 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.BeforeRenderTemplate;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Mixin;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.corelib.base.AbstractField;
-import org.apache.tapestry.corelib.data.BlankOption;
-import org.apache.tapestry.corelib.mixins.RenderDisabled;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.internal.util.SelectModelRenderer;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.*;
-import org.apache.tapestry.util.EnumSelectModel;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.BeforeRenderTemplate;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Mixin;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.corelib.base.AbstractField;
+import org.apache.tapestry5.corelib.data.BlankOption;
+import org.apache.tapestry5.corelib.mixins.RenderDisabled;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.internal.util.SelectModelRenderer;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.*;
+import org.apache.tapestry5.util.EnumSelectModel;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java
index 696dc06..9bcad57 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Mixin;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.corelib.base.AbstractField;
-import org.apache.tapestry.corelib.mixins.RenderDisabled;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.services.Heartbeat;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Mixin;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.corelib.base.AbstractField;
+import org.apache.tapestry5.corelib.mixins.RenderDisabled;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.FormSupport;
+import org.apache.tapestry5.services.Heartbeat;
+import org.apache.tapestry5.services.Request;
/**
* Corresponds to <input type="submit">, a client-side element that can force the enclosing form to submit. The
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/SubmitNotifier.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/SubmitNotifier.java
index bc2e33a..a8694bd 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/SubmitNotifier.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/SubmitNotifier.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.ComponentAction;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.ComponentAction;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.FormSupport;
/**
* A non visual component used to provide notifications to its container during a form submission. Records actions into
- * the form on {@link org.apache.tapestry.annotation.BeginRender} and {@link org.apache.tapestry.annotation.AfterRender}
+ * the form on {@link org.apache.tapestry5.annotations.BeginRender} and {@link org.apache.tapestry5.annotations.AfterRender}
* that (during the form submission) triggers "BeginSubmit" and "AfterSubmit" events. The container can receive these
* events to perform setup before a group of components process their submission, and perform cleanup afterwards.
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextArea.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextArea.java
index 7d37108..1298301 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextArea.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextArea.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.corelib.base.AbstractTextField;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.corelib.base.AbstractTextField;
/**
* TextArea component corresponds to a <textarea> element. The value parameter is almost always bound to a string,
* but this is not an absolute requirement.
* <p/>
- * Includes the <code>cols</code> attribute, if a {@link org.apache.tapestry.beaneditor.Width} annotation is present on
+ * Includes the <code>cols</code> attribute, if a {@link org.apache.tapestry5.beaneditor.Width} annotation is present on
* the property bound to the value parameter.
*
- * @see org.apache.tapestry.corelib.components.TextOutput
+ * @see org.apache.tapestry5.corelib.components.TextOutput
*/
public final class TextArea extends AbstractTextField
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextField.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextField.java
index 1e12cee..bd7163f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextField.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextField.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.corelib.base.AbstractTextField;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.corelib.base.AbstractTextField;
/**
* TextField component corresponds to <input type="text"> element. The value parameter will be editted. TextField
* is generally used with string values, but other values are acceptible, as long as they can be freely converted back
* and forth to strings.
* <p/>
- * Includes the <code>size</code> attribute, if a {@link org.apache.tapestry.beaneditor.Width} annotation is present on
+ * Includes the <code>size</code> attribute, if a {@link org.apache.tapestry5.beaneditor.Width} annotation is present on
* the property bound to the value parameter.
*/
public final class TextField extends AbstractTextField
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextOutput.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextOutput.java
index e7df453..0481d49 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextOutput.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/TextOutput.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.Mixin;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.corelib.mixins.DiscardBody;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.Mixin;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.corelib.mixins.DiscardBody;
import java.util.regex.Pattern;
/**
- * Outputs paragraph oriented text, typically collected via a {@link org.apache.tapestry.corelib.components.TextArea}
+ * Outputs paragraph oriented text, typically collected via a {@link org.apache.tapestry5.corelib.components.TextArea}
* component. The TextArea is split into lines, and each line it output inside its own <p> element.
*/
public class TextOutput
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Unless.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Unless.java
index f8ce7f9..aa0ad31 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Unless.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Unless.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.Parameter;
/**
- * A close relative of the {@link org.apache.tapestry.corelib.components.If} component that inverts the meaning of its
+ * A close relative of the {@link org.apache.tapestry5.corelib.components.If} component that inverts the meaning of its
* test. This is easier than an If component with the negate parameter set to true.
*/
public class Unless
@@ -30,8 +30,8 @@
private boolean test;
/**
- * An alternate {@link org.apache.tapestry.Block} to render if the test parameter is false. The default, null, means
- * render nothing in that situation.
+ * An alternate {@link org.apache.tapestry5.Block} to render if the test parameter is false. The default, null,
+ * means render nothing in that situation.
*/
@Parameter(name = "else")
private Block elseBlock;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
index c5d01f2..7169131 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Zone.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.SupportsInformalParameters;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.internal.services.ClientBehaviorSupport;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.internal.services.ClientBehaviorSupport;
+import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.json.JSONObject;
@@ -33,7 +33,7 @@
* false).
* <p/>
* <p/>
- * When a user clicks an {@link org.apache.tapestry.corelib.components.ActionLink} whose zone parameter is set, the
+ * When a user clicks an {@link org.apache.tapestry5.corelib.components.ActionLink} whose zone parameter is set, the
* corresponding client-side Tapestry.Zone object is located. It will update the content of the Zone's <div> and
* then invoke either a show method (if the div is not visible) or an update method (if the div is visible). The show
* and update parameters are the <em>names</em> of functions attached to the Tapestry.ElementEffect object.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/BlankOption.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/BlankOption.java
index f414612..81ba7e5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/BlankOption.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/BlankOption.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.data;
+package org.apache.tapestry5.corelib.data;
/**
- * Used with the {@link org.apache.tapestry.corelib.components.Select} component to control whether an initial blank
+ * Used with the {@link org.apache.tapestry5.corelib.components.Select} component to control whether an initial blank
* option is supplied. Determines the optionality of the undelrying property from the Select's {@linkplain
- * org.apache.tapestry.FieldValidator#isRequired() validate parameter}
+ * org.apache.tapestry5.FieldValidator#isRequired() validate parameter}
*/
public enum BlankOption
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/GridPagerPosition.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/GridPagerPosition.java
index a523f1e..e93e2f5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/GridPagerPosition.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/GridPagerPosition.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.data;
+package org.apache.tapestry5.corelib.data;
-import org.apache.tapestry.corelib.components.Grid;
+import org.apache.tapestry5.corelib.components.Grid;
/**
* Used by the {@link Grid} component to control where the pager portion of the Grid should be displayed.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/InsertPosition.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/InsertPosition.java
index 6f7953e..0983962 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/InsertPosition.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/data/InsertPosition.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.data;
+package org.apache.tapestry5.corelib.data;
public enum InsertPosition
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/FormSupportAdapter.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/FormSupportAdapter.java
index c685134..0bad3ce 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/FormSupportAdapter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/FormSupportAdapter.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.internal;
+package org.apache.tapestry5.corelib.internal;
-import org.apache.tapestry.ComponentAction;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.ComponentAction;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.services.FormSupport;
/**
- * An implementation of {@link org.apache.tapestry.services.FormSupport} that delegates all behavior to another instance
- * of FormSupport. This allows some of the behavior to be overridden easily.
+ * An implementation of {@link org.apache.tapestry5.services.FormSupport} that delegates all behavior to another
+ * instance of FormSupport. This allows some of the behavior to be overridden easily.
*/
public class FormSupportAdapter implements FormSupport
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/FormSupportImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/FormSupportImpl.java
index ee439a5..cf6bb8e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/FormSupportImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/FormSupportImpl.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.internal;
+package org.apache.tapestry5.corelib.internal;
-import org.apache.tapestry.ComponentAction;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.internal.services.ClientBehaviorSupport;
-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.runtime.Component;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.ComponentAction;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.internal.services.ClientBehaviorSupport;
+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.runtime.Component;
+import org.apache.tapestry5.services.FormSupport;
import java.io.IOException;
import java.io.ObjectOutputStream;
@@ -160,4 +160,4 @@
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/InternalMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/InternalMessages.java
index 977628f..8ad6cd0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/InternalMessages.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/InternalMessages.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.internal;
+package org.apache.tapestry5.corelib.internal;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
public final class InternalMessages
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/WrappedComponentAction.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/WrappedComponentAction.java
index fa684a9..8b6cfce 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/WrappedComponentAction.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/internal/WrappedComponentAction.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.internal;
+package org.apache.tapestry5.corelib.internal;
-import org.apache.tapestry.ComponentAction;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ComponentSource;
+import org.apache.tapestry5.ComponentAction;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.ComponentSource;
import java.io.Serializable;
/**
- * A wrapper around a component id and a {@link org.apache.tapestry.ComponentAction}.
+ * A wrapper around a component id and a {@link org.apache.tapestry5.ComponentAction}.
*
- * @see org.apache.tapestry.corelib.components.FormFragment
+ * @see org.apache.tapestry5.corelib.components.FormFragment
*/
public class WrappedComponentAction implements Serializable
{
@@ -37,7 +37,7 @@
}
/**
- * @param componentId the component's complete id, suitable for use with {@link org.apache.tapestry.services.ComponentSource#getComponent(String)}.
+ * @param componentId the component's complete id, suitable for use with {@link org.apache.tapestry5.services.ComponentSource#getComponent(String)}.
* @param action the action associated with the component
*/
public WrappedComponentAction(String componentId, ComponentAction action)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java
index 4143781..e9d0028 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Autocomplete.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.mixins;
+package org.apache.tapestry5.corelib.mixins;
-import org.apache.tapestry.*;
-import org.apache.tapestry.ContentType;
-import org.apache.tapestry.annotation.*;
-import org.apache.tapestry.internal.services.ResponseRenderer;
-import org.apache.tapestry.internal.util.Holder;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.services.MarkupWriterFactory;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.util.TextStreamResponse;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.internal.services.ResponseRenderer;
+import org.apache.tapestry5.internal.util.Holder;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
import org.apache.tapestry5.json.JSONObject;
+import org.apache.tapestry5.services.MarkupWriterFactory;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.util.TextStreamResponse;
import java.util.Collections;
import java.util.List;
@@ -80,7 +80,7 @@
private MarkupWriterFactory factory;
@Inject
- @Path("classpath:org/apache/tapestry/ajax-loader.gif")
+ @Path("classpath:org/apache/tapestry5/ajax-loader.gif")
private Asset loader;
/**
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/DiscardBody.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/DiscardBody.java
index 4c19952..d5039b3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/DiscardBody.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/DiscardBody.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.mixins;
+package org.apache.tapestry5.corelib.mixins;
-import org.apache.tapestry.annotation.BeforeRenderBody;
-import org.apache.tapestry.annotation.MixinAfter;
+import org.apache.tapestry5.annotations.BeforeRenderBody;
+import org.apache.tapestry5.annotations.MixinAfter;
/**
* Discards a component's body. Returns false from the {@link BeforeRenderBody} phase, which prevents the rendering of
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderDisabled.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderDisabled.java
index 8048e0c..2974dfe 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderDisabled.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderDisabled.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.mixins;
+package org.apache.tapestry5.corelib.mixins;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.InjectContainer;
-import org.apache.tapestry.annotation.MixinAfter;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.InjectContainer;
+import org.apache.tapestry5.annotations.MixinAfter;
/**
* Renders an "disabled" attribute if the containing {@link Field#isDisabled() is disabled}.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderInformals.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderInformals.java
index 190f3da..b899825 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderInformals.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/RenderInformals.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.mixins;
+package org.apache.tapestry5.corelib.mixins;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.*;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.ioc.annotations.Inject;
/**
- * Used to render out all informal parameters, at the end of the {@link org.apache.tapestry.annotation.BeginRender}
+ * Used to render out all informal parameters, at the end of the {@link org.apache.tapestry5.annotations.BeginRender}
* phase.
* <p/>
* This mixin can be used with components that render a single tag inside the {@link BeginRender} phase. RenderInformals
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/TriggerFragment.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/TriggerFragment.java
index ca9b5eb..1f3a534 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/TriggerFragment.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/TriggerFragment.java
@@ -12,22 +12,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.mixins;
+package org.apache.tapestry5.corelib.mixins;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.ClientElement;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.InjectContainer;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.services.Heartbeat;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.ClientElement;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.InjectContainer;
+import org.apache.tapestry5.annotations.Parameter;
import org.apache.tapestry5.json.JSONArray;
+import org.apache.tapestry5.services.Heartbeat;
/**
- * A mixin that can be applied to a {@link org.apache.tapestry.corelib.components.Checkbox} or {@link
- * org.apache.tapestry.corelib.components.Radio} component that will link the input field and a {@link
- * org.apache.tapestry.corelib.components.FormFragment}, making the field control the client-side visibility of the
+ * A mixin that can be applied to a {@link org.apache.tapestry5.corelib.components.Checkbox} or {@link
+ * org.apache.tapestry5.corelib.components.Radio} component that will link the input field and a {@link
+ * org.apache.tapestry5.corelib.components.FormFragment}, making the field control the client-side visibility of the
* FormFragment.
*/
public class TriggerFragment
@@ -36,7 +36,7 @@
private Field container;
/**
- * The {@link org.apache.tapestry.corelib.components.FormFragment} instance to make dynamically visible or hidden.
+ * The {@link org.apache.tapestry5.corelib.components.FormFragment} instance to make dynamically visible or hidden.
*/
@Parameter(required = true, defaultPrefix = BindingConstants.COMPONENT)
private ClientElement fragment;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
index c103c02..ee7ce18 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
@@ -12,25 +12,25 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.pages;
+package org.apache.tapestry5.corelib.pages;
-import org.apache.tapestry.SymbolConstants;
-import org.apache.tapestry.annotation.ContentType;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.ExceptionReporter;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Session;
+import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.annotations.ContentType;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.ExceptionReporter;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Session;
import java.util.List;
/**
* Responsible for reporting runtime exceptions. This page is quite verbose and is usually overridden in a production
- * application. When {@link org.apache.tapestry.SymbolConstants#PRODUCTION_MODE} is "true", it is very abbreviated.
+ * application. When {@link org.apache.tapestry5.SymbolConstants#PRODUCTION_MODE} is "true", it is very abbreviated.
*
- * @see org.apache.tapestry.corelib.components.ExceptionDisplay
+ * @see org.apache.tapestry5.corelib.components.ExceptionDisplay
*/
@ContentType("text/html")
public class ExceptionReport implements ExceptionReporter
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PropertyDisplayBlocks.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PropertyDisplayBlocks.java
index b66a07e..601cfdb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PropertyDisplayBlocks.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PropertyDisplayBlocks.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.pages;
+package org.apache.tapestry5.corelib.pages;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.Renderable;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.PropertyOutputContext;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.Renderable;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.PropertyOutputContext;
import java.text.DateFormat;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PropertyEditBlocks.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PropertyEditBlocks.java
index 45e0350..f7a1784 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PropertyEditBlocks.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/PropertyEditBlocks.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.pages;
+package org.apache.tapestry5.corelib.pages;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.SelectModel;
-import org.apache.tapestry.ValueEncoder;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.corelib.components.*;
-import org.apache.tapestry.services.BeanBlockContribution;
-import org.apache.tapestry.services.BeanBlockSource;
-import org.apache.tapestry.services.PropertyEditContext;
-import org.apache.tapestry.util.EnumSelectModel;
-import org.apache.tapestry.util.EnumValueEncoder;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.SelectModel;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.corelib.components.*;
+import org.apache.tapestry5.services.BeanBlockContribution;
+import org.apache.tapestry5.services.BeanBlockSource;
+import org.apache.tapestry5.services.PropertyEditContext;
+import org.apache.tapestry5.util.EnumSelectModel;
+import org.apache.tapestry5.util.EnumValueEncoder;
/**
* A page that exists to contain blocks used to edit different types of properties. The blocks on this page are
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java
index 406616a..e81f37e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ServiceStatus.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.pages;
+package org.apache.tapestry5.corelib.pages;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.Meta;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.services.ServiceActivity;
-import org.apache.tapestry.ioc.services.ServiceActivityScoreboard;
-import org.apache.tapestry.services.BeanModelSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.Meta;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.services.ServiceActivity;
+import org.apache.tapestry5.ioc.services.ServiceActivityScoreboard;
+import org.apache.tapestry5.services.BeanModelSource;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/CData.java b/tapestry-core/src/main/java/org/apache/tapestry5/dom/CData.java
index 512cc4a..76891de 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/CData.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/CData.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
import java.io.PrintWriter;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Comment.java b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Comment.java
index 3329094..88a2e07 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Comment.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Comment.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
import java.io.PrintWriter;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/DTD.java b/tapestry-core/src/main/java/org/apache/tapestry5/dom/DTD.java
index 9d8a662..f903400 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/DTD.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/DTD.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
import java.io.PrintWriter;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/DefaultMarkupModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/dom/DefaultMarkupModel.java
index 568421b..92e526f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/DefaultMarkupModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/DefaultMarkupModel.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.Set;
/**
- * Default implementation of {@link org.apache.tapestry.dom.MarkupModel} that is appropriate for traditional HTML
+ * Default implementation of {@link org.apache.tapestry5.dom.MarkupModel} that is appropriate for traditional HTML
* markup. This conforms to the SGML HTML definition, including some things that are not well formed XML-style markup.
* Assumes that all tags are lower-case.
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Document.java b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Document.java
index 8a09288..18c9d26 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Document.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Document.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
-import org.apache.tapestry.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.Defense;
import java.io.PrintWriter;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/DomMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/dom/DomMessages.java
index ce1ebdc..76aae89 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/DomMessages.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/DomMessages.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
-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;
final class DomMessages
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
index ca69c6d..4c9816f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Element.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newLinkedList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newLinkedList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import java.io.PrintWriter;
import java.util.LinkedList;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/EndTagStyle.java b/tapestry-core/src/main/java/org/apache/tapestry5/dom/EndTagStyle.java
index 28f5a0a..a4858e6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/EndTagStyle.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/EndTagStyle.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
/**
* Part of a {@link MarkupModel}, used to define how end tags are handled when the {@link Document} in rendered out as a
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/MarkupModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/dom/MarkupModel.java
index 37e2a03..eb33a12 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/MarkupModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/MarkupModel.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
/**
* Used by a the DOM to determine how to produce markup. Delegates details about converted entities and some formatting
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Node.java b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Node.java
index 929ca6f..6505837 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Node.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Node.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
-import org.apache.tapestry.internal.util.PrintOutCollector;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.internal.util.PrintOutCollector;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
import java.io.PrintWriter;
import java.util.Collections;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Raw.java b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Raw.java
index 42e141f..74f8a2f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Raw.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Raw.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
import java.io.PrintWriter;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Text.java b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Text.java
index 125d79a..4f43422 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/Text.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/Text.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
import java.io.PrintWriter;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/dom/XMLMarkupModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/dom/XMLMarkupModel.java
index 3981cf7..9c97211 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/dom/XMLMarkupModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/dom/XMLMarkupModel.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
/**
* Markup model used when generating any form of XML markup.
@@ -37,4 +37,4 @@
{
return true;
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/grid/ColumnSort.java b/tapestry-core/src/main/java/org/apache/tapestry5/grid/ColumnSort.java
index 0dbab86..350f502 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/grid/ColumnSort.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/grid/ColumnSort.java
@@ -1,7 +1,7 @@
-package org.apache.tapestry.grid;
+package org.apache.tapestry5.grid;
/**
- * Identifies how a column within a {@link org.apache.tapestry.grid.GridSortModel} is sorted.
+ * Identifies how a column within a {@link org.apache.tapestry5.grid.GridSortModel} is sorted.
*/
public enum ColumnSort
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridConstants.java
index e76c17d..00888b6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridConstants.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.grid;
+package org.apache.tapestry5.grid;
public class GridConstants
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridDataSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridDataSource.java
index f2fa03d..6ff725f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridDataSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridDataSource.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.grid;
+package org.apache.tapestry5.grid;
import java.util.List;
/**
- * Defines how a {@link org.apache.tapestry.corelib.components.Grid} component (and its sub-components) gain access to
+ * Defines how a {@link org.apache.tapestry5.corelib.components.Grid} component (and its sub-components) gain access to
* the row data that is displayed on the page. In many cases, this is just a wrapper around a simple List, but the
* abstractions exist to support access to a large data set that is accessible in sections.
*/
@@ -45,7 +45,7 @@
/**
* Returns the type of value in the rows, or null if not known. This value is used to create a default {@link
- * org.apache.tapestry.beaneditor.BeanModel} when no such model is explicitly provided.
+ * org.apache.tapestry5.beaneditor.BeanModel} when no such model is explicitly provided.
*
* @return the row type, or null
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridModel.java
index 20509a5..8593110 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridModel.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.grid;
+package org.apache.tapestry5.grid;
-import org.apache.tapestry.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.BeanModel;
/**
- * A provider of model data to the sub-components of the {@link org.apache.tapestry.corelib.components.Grid} component.
+ * A provider of model data to the sub-components of the {@link org.apache.tapestry5.corelib.components.Grid} component.
* The primary implementor of this component is the Grid component itself. This is effectively a way to package three
- * values as a single parameter to components such as {@link org.apache.tapestry.corelib.components.GridColumns} and
- * {@link org.apache.tapestry.corelib.components.GridRows}.
+ * values as a single parameter to components such as {@link org.apache.tapestry5.corelib.components.GridColumns} and
+ * {@link org.apache.tapestry5.corelib.components.GridRows}.
*/
public interface GridModel
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridSortModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridSortModel.java
index 7b5c1b4..e51c30d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridSortModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/grid/GridSortModel.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.grid;
+package org.apache.tapestry5.grid;
import java.util.List;
/**
- * Models the sorting applied to the a {@link org.apache.tapestry.grid.GridDataSource}.
+ * Models the sorting applied to the a {@link org.apache.tapestry5.grid.GridDataSource}.
*/
public interface GridSortModel
{
@@ -25,7 +25,7 @@
* Identifies how (or if) a column is sorted.
*
* @param columnId
- * @return the sort for the indicated column or {@link org.apache.tapestry.grid.ColumnSort#UNSORTED} if the column
+ * @return the sort for the indicated column or {@link org.apache.tapestry5.grid.ColumnSort#UNSORTED} if the column
* is not used for sorting
*/
ColumnSort getColumnSort(String columnId);
@@ -41,7 +41,7 @@
* Returns a list of sort constraints, identifying which columns are sorted, and how. May return an empty list (but
* won't return null).
*
- * @see org.apache.tapestry.grid.GridDataSource#prepare(int, int, java.util.List)
+ * @see org.apache.tapestry5.grid.GridDataSource#prepare(int, int, java.util.List)
*/
List<SortConstraint> getSortContraints();
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/grid/SortConstraint.java b/tapestry-core/src/main/java/org/apache/tapestry5/grid/SortConstraint.java
index 6afa0b3..c63d2ee 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/grid/SortConstraint.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/grid/SortConstraint.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.grid;
+package org.apache.tapestry5.grid;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.ioc.internal.util.Defense;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.ioc.internal.util.Defense;
/**
- * Identifies how a single column (identified as a {@link org.apache.tapestry.beaneditor.PropertyModel}) is sorted.
+ * Identifies how a single column (identified as a {@link org.apache.tapestry5.beaneditor.PropertyModel}) is sorted.
*/
public class SortConstraint
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/DefaultNullFieldStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/DefaultNullFieldStrategy.java
index 00058b5..6a75570 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/DefaultNullFieldStrategy.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/DefaultNullFieldStrategy.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.NullFieldStrategy;
+import org.apache.tapestry5.NullFieldStrategy;
/**
* Default strategy, which is to do nothing: null values stay null.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/DefaultValidationDecorator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/DefaultValidationDecorator.java
index c4fefa8..33dd422 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/DefaultValidationDecorator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/DefaultValidationDecorator.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.*;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.services.Environment;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.services.Environment;
/**
* Default implementation that writes an attribute into fields or labels that are in error.
@@ -34,7 +34,7 @@
/**
* @param environment used to locate objects and services during the render
- * @param validationMessages obtained from {@link org.apache.tapestry.services.ValidationMessagesSource}, used to
+ * @param validationMessages obtained from {@link org.apache.tapestry5.services.ValidationMessagesSource}, used to
* obtain the label for the icon
* @param iconAsset asset for an icon that will be displayed after each field (marked with the
* @param markupWriter
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/EmptyEventContext.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/EmptyEventContext.java
index 924a50a..2cd3b1f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/EmptyEventContext.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/EmptyEventContext.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.EventContext;
+import org.apache.tapestry5.EventContext;
/**
* Placeholder used when no context is available.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResources.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResources.java
index 7d0250f..4c65a15 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResources.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResources.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.services.PersistentFieldManager;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.services.PersistentFieldManager;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.runtime.RenderQueue;
/**
- * An extension of {@link org.apache.tapestry.ComponentResources} that represents additional methods that are private to
- * the framework and not exposed in any public APIs.
+ * An extension of {@link org.apache.tapestry5.ComponentResources} that represents additional methods that are private
+ * to the framework and not exposed in any public APIs.
*/
public interface InternalComponentResources extends ComponentResources, InternalComponentResourcesCommon
{
@@ -40,13 +40,13 @@
/**
* Posts a change to a persistent field. If the component is still loading, then this change is ignored. Otherwise,
- * it is propagated, via the {@link Page#persistFieldChange(org.apache.tapestry.ComponentResources, String, Object)
+ * it is propagated, via the {@link Page#persistFieldChange(org.apache.tapestry5.ComponentResources, String, Object)
* page} to the {@link PersistentFieldManager}.
*/
void persistFieldChange(String fieldName, Object newValue);
/**
- * Reads the value of a parameter, via the parameter's {@link org.apache.tapestry.Binding}.
+ * Reads the value of a parameter, via the parameter's {@link org.apache.tapestry5.Binding}.
*
* @param <T>
* @param parameterName the name of the parameter to read
@@ -67,7 +67,7 @@
/**
* Updates a parameter. It is an error to update a parameter which is not bound. The parameter {@link
- * org.apache.tapestry.Binding binding} may also not support updates.
+ * org.apache.tapestry5.Binding binding} may also not support updates.
*
* @param <T>
* @param parameterName of parameter to update
@@ -76,8 +76,8 @@
<T> void writeParameter(String parameterName, T parameterValue);
/**
- * Returns true if the named parameter's {@link org.apache.tapestry.Binding} is invariant, false if otherwise, or if
- * the parameter is not bound. Invariant bindings are cached more aggressively than variant bindings.
+ * Returns true if the named parameter's {@link org.apache.tapestry5.Binding} is invariant, false if otherwise, or
+ * if the parameter is not bound. Invariant bindings are cached more aggressively than variant bindings.
*
* @param parameterName the name of parameter to check for invariance
* @return true if the binding is an invariant, false if the binding has no fixed value
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResourcesCommon.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResourcesCommon.java
index ec9ba6d..f718697 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResourcesCommon.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalComponentResourcesCommon.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.runtime.Component;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.runtime.Component;
import java.util.Map;
@@ -29,7 +29,7 @@
/**
* Returns true if the component has finished loading. Initially, this value will be false.
*
- * @see org.apache.tapestry.runtime.PageLifecycleListener#containingPageDidLoad()
+ * @see org.apache.tapestry5.runtime.PageLifecycleListener#containingPageDidLoad()
*/
boolean isLoaded();
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java
index 40ea9c6..43e378c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalConstants.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.services.Alias;
+import org.apache.tapestry5.services.Alias;
public final class InternalConstants
{
@@ -76,15 +76,15 @@
/**
* Used in some Ajax scenarios to set the content type for the response early, when the Page instance (the authority
- * on content types) is known. The value is of type {@link org.apache.tapestry.ContentType}.
+ * on content types) is known. The value is of type {@link org.apache.tapestry5.ContentType}.
*/
public static final String CONTENT_TYPE_ATTRIBUTE_NAME = "content-type";
public static final String CHARSET_CONTENT_TYPE_PARAMETER = "charset";
/**
- * Request attribute that stores a {@link org.apache.tapestry.internal.structure.Page} instance that will be
- * rendered as the {@linkplain org.apache.tapestry.SymbolConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS immediate
+ * Request attribute that stores a {@link org.apache.tapestry5.internal.structure.Page} instance that will be
+ * rendered as the {@linkplain org.apache.tapestry5.SymbolConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS immediate
* mode response}.
*/
public static final String IMMEDIATE_RESPONSE_PAGE_ATTRIBUTE = "tapestry.immediate-response-page";
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalMessages.java
index 95def3a..7e66d0d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalMessages.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/InternalMessages.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
final class InternalMessages
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/KeyValue.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/KeyValue.java
index e2c3976..37413cb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/KeyValue.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/KeyValue.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
/**
* A key/value pair.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/OptionGroupModelImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/OptionGroupModelImpl.java
index 0c5edc7..f3d7774 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/OptionGroupModelImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/OptionGroupModelImpl.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.OptionGroupModel;
-import org.apache.tapestry.OptionModel;
+import org.apache.tapestry5.OptionGroupModel;
+import org.apache.tapestry5.OptionModel;
import java.util.List;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/OptionModelImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/OptionModelImpl.java
index a9ee082..89ce561 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/OptionModelImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/OptionModelImpl.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.AbstractOptionModel;
+import org.apache.tapestry5.AbstractOptionModel;
public class OptionModelImpl extends AbstractOptionModel
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/SelectModelImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/SelectModelImpl.java
index 87b827c..429077c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/SelectModelImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/SelectModelImpl.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.OptionGroupModel;
-import org.apache.tapestry.OptionModel;
-import org.apache.tapestry.util.AbstractSelectModel;
+import org.apache.tapestry5.OptionGroupModel;
+import org.apache.tapestry5.OptionModel;
+import org.apache.tapestry5.util.AbstractSelectModel;
import java.util.Arrays;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/ServletContextSymbolProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/ServletContextSymbolProvider.java
index 2a36c3b..e25868f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/ServletContextSymbolProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/ServletContextSymbolProvider.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.SymbolProvider;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
import javax.servlet.ServletContext;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/SingleKeySymbolProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/SingleKeySymbolProvider.java
index 27b6e58..5332cfa 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/SingleKeySymbolProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/SingleKeySymbolProvider.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.ioc.services.SymbolProvider;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
/**
* Implementation of {@link SymbolProvider} that only supports a single key/value pair.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/SyntheticModuleDef.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/SyntheticModuleDef.java
index bde98ff..205a891 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/SyntheticModuleDef.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/SyntheticModuleDef.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.DecoratorDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.DecoratorDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.Collections;
import java.util.Set;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/SyntheticSymbolSourceContributionDef.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/SyntheticSymbolSourceContributionDef.java
index 97bbce2..9c1f96c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/SyntheticSymbolSourceContributionDef.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/SyntheticSymbolSourceContributionDef.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.services.SymbolProvider;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
/**
* Makes a contribution to the SymbolSource service configuration.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryAppInitializer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryAppInitializer.java
index 51e8d1d..3843b9e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryAppInitializer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryAppInitializer.java
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.ioc.IOCUtilities;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.RegistryBuilder;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.SymbolProvider;
-import org.apache.tapestry.services.Alias;
-import org.apache.tapestry.services.TapestryModule;
+import org.apache.tapestry5.ioc.IOCUtilities;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.RegistryBuilder;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
+import org.apache.tapestry5.services.Alias;
+import org.apache.tapestry5.services.TapestryModule;
/**
- * This class is used to build the {@link Registry}. The Registry contains {@link org.apache.tapestry.ioc.services.TapestryIOCModule}
+ * This class is used to build the {@link Registry}. The Registry contains {@link org.apache.tapestry5.ioc.services.TapestryIOCModule}
* and {@link TapestryModule}, any modules identified by {@link #addModules(Class[])} )}, plus the application module.
* <p/>
* The application module is optional.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryInternalUtils.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryInternalUtils.java
index 5ae9e16..251c705 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryInternalUtils.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/TapestryInternalUtils.java
@@ -12,25 +12,25 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
import org.apache.commons.codec.EncoderException;
import org.apache.commons.codec.net.URLCodec;
-import org.apache.tapestry.OptionModel;
-import org.apache.tapestry.SelectModel;
-import org.apache.tapestry.beaneditor.OrderAfter;
-import org.apache.tapestry.beaneditor.OrderBefore;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.Orderer;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
+import org.apache.tapestry5.OptionModel;
+import org.apache.tapestry5.SelectModel;
+import org.apache.tapestry5.beaneditor.OrderAfter;
+import org.apache.tapestry5.beaneditor.OrderBefore;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.Orderer;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.ClassPropertyAdapter;
+import org.apache.tapestry5.ioc.services.PropertyAdapter;
import org.slf4j.Logger;
import java.lang.reflect.Method;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/URLEventContext.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/URLEventContext.java
index cddcece..38a8dc8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/URLEventContext.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/URLEventContext.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.EventContext;
-import org.apache.tapestry.services.ContextValueEncoder;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.services.ContextValueEncoder;
/**
* Implementation based on values extracted from the URL (an event context, or a page activation context) that uses a
- * {@link org.apache.tapestry.services.ContextValueEncoder} to convert from string values to the desired values.
+ * {@link org.apache.tapestry5.services.ContextValueEncoder} to convert from string values to the desired values.
*/
public class URLEventContext implements EventContext
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/ZeroNullFieldStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/ZeroNullFieldStrategy.java
index 4bcee39..b38b0e1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/ZeroNullFieldStrategy.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/ZeroNullFieldStrategy.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.NullFieldStrategy;
+import org.apache.tapestry5.NullFieldStrategy;
/**
* Treats nulls to or from the client as if they were 0's.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanEditorMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanEditorMessages.java
index d35b460..a5187bb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanEditorMessages.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanEditorMessages.java
@@ -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.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
import java.util.Collection;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java
index c68509b..f3409f5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelImpl.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelUtils.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelUtils.java
index 78d792f..02b1ea3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelUtils.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/BeanModelUtils.java
@@ -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
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PrimitiveFieldConstraintGenerator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PrimitiveFieldConstraintGenerator.java
index 1a89aab..7dcc77c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PrimitiveFieldConstraintGenerator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PrimitiveFieldConstraintGenerator.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.java
index c8c255b..303f51e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/PropertyModelImpl.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java
index 55faf19..e01279e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGenerator.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AbstractBinding.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AbstractBinding.java
index 321ccd6..f2f11cf 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AbstractBinding.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AbstractBinding.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AssetBindingFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AssetBindingFactory.java
index 05d8356..00993f6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AssetBindingFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/AssetBindingFactory.java
@@ -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
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BindingsMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BindingsMessages.java
index d1bae76..39ba6a4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BindingsMessages.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BindingsMessages.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBinding.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBinding.java
index bd7d853..b685724 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBinding.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBinding.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBindingFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBindingFactory.java
index 49c8e7c..c235aa2 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBindingFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/BlockBindingFactory.java
@@ -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.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBinding.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBinding.java
index 15de64f..302a2f6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBinding.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBinding.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBindingFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBindingFactory.java
index d3093ba..0ca360c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBindingFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ComponentBindingFactory.java
@@ -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.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.java
index ce1bcc4..cd8417d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBinding.java
@@ -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
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBindingFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBindingFactory.java
index e0d5b7f..0dd8650 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBindingFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/LiteralBindingFactory.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/MessageBindingFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/MessageBindingFactory.java
index 7ffc2910..8856f9d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/MessageBindingFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/MessageBindingFactory.java
@@ -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
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/NullFieldStrategyBindingFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/NullFieldStrategyBindingFactory.java
index 2e8fcd1..15542ac 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/NullFieldStrategyBindingFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/NullFieldStrategyBindingFactory.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.java
index f61b8db..2853817 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBinding.java
@@ -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
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java
index f7bb01b..10e7ca7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/PropBindingFactory.java
@@ -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.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/RenderVariableBinding.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/RenderVariableBinding.java
index be12d79..74d4335 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/RenderVariableBinding.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/RenderVariableBinding.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/RenderVariableBindingFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/RenderVariableBindingFactory.java
index f5b465c..9231607 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/RenderVariableBindingFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/RenderVariableBindingFactory.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/TranslateBindingFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/TranslateBindingFactory.java
index a93c3f8..53c5a20 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/TranslateBindingFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/TranslateBindingFactory.java
@@ -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}.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactory.java
index 1b01ad9..b44b1e1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactory.java
@@ -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
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHub.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHub.java
index 489fcfa..7416339 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHub.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHub.java
@@ -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.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.java
index 303cc45..4a16a10 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/event/InvalidationEventHubImpl.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/InvalidationListener.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/InvalidationListener.java
index 6dfaa97..8240d2c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/InvalidationListener.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/InvalidationListener.java
@@ -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,
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/UpdateListener.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/UpdateListener.java
index 2c68659..fd9346e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/UpdateListener.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/events/UpdateListener.java
@@ -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.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.java
index 6bb6822..e173693 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/CollectionGridDataSource.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/NullDataSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/NullDataSource.java
index 486f8d4..a08012b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/NullDataSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/grid/NullDataSource.java
@@ -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
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ModelMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ModelMessages.java
index 030f06c..c146f06 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ModelMessages.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ModelMessages.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java
index 14740d8..40065ac 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableComponentModelImpl.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableEmbeddedComponentModelImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableEmbeddedComponentModelImpl.java
index d9e6bb4..05fe731 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableEmbeddedComponentModelImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/MutableEmbeddedComponentModelImpl.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ParameterModelImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ParameterModelImpl.java
index af5c329..f31545d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ParameterModelImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/model/ParameterModelImpl.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/AttributeToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/AttributeToken.java
index b9eb0e0..ce3ad99 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/AttributeToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/AttributeToken.java
@@ -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).
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BlockToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BlockToken.java
index 751f675..8a33c77 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BlockToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BlockToken.java
@@ -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.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BodyToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BodyToken.java
index 1552819..f4c00bf 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BodyToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/BodyToken.java
@@ -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).
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CDATAToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CDATAToken.java
index 449c3dd..d6b74e5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CDATAToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CDATAToken.java
@@ -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).
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CommentToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CommentToken.java
index f6a2107..ac41367 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CommentToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/CommentToken.java
@@ -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.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplate.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplate.java
index 7ca6df5..430b518 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplate.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplate.java
@@ -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();
}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplateImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplateImpl.java
index fcfb2a3..32d582c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplateImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ComponentTemplateImpl.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DTDToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DTDToken.java
index 6be0f40..dfbda07 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DTDToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DTDToken.java
@@ -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
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DefineNamespacePrefixToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DefineNamespacePrefixToken.java
index 6940eec..5ffc7b5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DefineNamespacePrefixToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/DefineNamespacePrefixToken.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/EndElementToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/EndElementToken.java
index d77e386..11f5951 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/EndElementToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/EndElementToken.java
@@ -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.).
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ExpansionToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ExpansionToken.java
index e20f6db..b029c9d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ExpansionToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ExpansionToken.java
@@ -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.,
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ParameterToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ParameterToken.java
index 6046200..eab158e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ParameterToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/ParameterToken.java
@@ -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.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartComponentToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartComponentToken.java
index d26098e..8ceaf77 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartComponentToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartComponentToken.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartElementToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartElementToken.java
index 33303d5..df2c16b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartElementToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/StartElementToken.java
@@ -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
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TemplateToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TemplateToken.java
index 49b1d65..2a4d802 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TemplateToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TemplateToken.java
@@ -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
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TextToken.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TextToken.java
index f7bd01c..e40db45 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TextToken.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TextToken.java
@@ -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;
/**
*
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TokenType.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TokenType.java
index b440381..e22bf11 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TokenType.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/parser/TokenType.java
@@ -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
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ComponentResourcesRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ComponentResourcesRenderer.java
index ec5b160..0d7c259 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ComponentResourcesRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ComponentResourcesRenderer.java
@@ -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
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/EventContextRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/EventContextRenderer.java
index 22b2dc4..0b7b9ac 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/EventContextRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/EventContextRenderer.java
@@ -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}.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ListRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ListRenderer.java
index 61c7d80..0b784ce 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ListRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ListRenderer.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/LocationRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/LocationRenderer.java
index 77fb8e8..93fc893 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/LocationRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/LocationRenderer.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ObjectArrayRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ObjectArrayRenderer.java
index a59cab6..03a472b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ObjectArrayRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/ObjectArrayRenderer.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/RequestRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/RequestRenderer.java
index f15434c..81db5fe 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/RequestRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/renderers/RequestRenderer.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractComponentMethodInvocation.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractComponentMethodInvocation.java
index bd7ac7f..6fbdd28 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractComponentMethodInvocation.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractComponentMethodInvocation.java
@@ -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
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractInstantiator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractInstantiator.java
index f46475d..a547792 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractInstantiator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractInstantiator.java
@@ -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.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractSessionPersistentFieldStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractSessionPersistentFieldStrategy.java
index 5c3e47a..d45def5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractSessionPersistentFieldStrategy.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AbstractSessionPersistentFieldStrategy.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionLinkTarget.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionLinkTarget.java
index 3bb3387..f694384 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionLinkTarget.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionLinkTarget.java
@@ -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.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGenerator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGenerator.java
index 9ffe5b5..e3fbead 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGenerator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGenerator.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGeneratorImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGeneratorImpl.java
index b2c5a66..b26b1e8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGeneratorImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ActionRenderResponseGeneratorImpl.java
@@ -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.Link;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.services.Response;
import java.io.IOException;
/**
- * Simply uses the {@link org.apache.tapestry.internal.services.LinkFactory} to generate a link which is then
- * {@linkplain org.apache.tapestry.services.Response#sendRedirect(org.apache.tapestry.Link)} sent as a redirect}.
+ * Simply uses the {@link org.apache.tapestry5.internal.services.LinkFactory} to generate a link which is then
+ * {@linkplain org.apache.tapestry5.services.Response#sendRedirect(org.apache.tapestry5.Link)} sent as a redirect}.
*/
public class ActionRenderResponseGeneratorImpl implements ActionRenderResponseGenerator
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxComponentEventRequestHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxComponentEventRequestHandler.java
index 141b7df..a6ab946 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxComponentEventRequestHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxComponentEventRequestHandler.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ContentType;
-import org.apache.tapestry.EventConstants;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
import org.apache.tapestry5.json.JSONObject;
+import org.apache.tapestry5.services.*;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxComponentInstanceEventResultProcessor.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxComponentInstanceEventResultProcessor.java
index e1ba236..92d6248 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxComponentInstanceEventResultProcessor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxComponentInstanceEventResultProcessor.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.RenderCommand;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.RenderCommand;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxFilter.java
index 512085d..73fe6f5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxFilter.java
@@ -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.services.*;
+import org.apache.tapestry5.services.*;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRenderer.java
index 3a19ec6..c3d2672 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRenderer.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import java.io.IOException;
@@ -20,15 +20,15 @@
* Used to render portions of a page as part of an {@linkplain AjaxComponentEventRequestHandler Ajax request}. This
* encapsulates rendering of the partial response and then the construction of a {@linkplain
* org.apache.tapestry5.json.JSONObject JSON reply}. Works with the pipeline defined by the {@link
- * org.apache.tapestry.services.PartialMarkupRenderer} service.
+ * org.apache.tapestry5.services.PartialMarkupRenderer} service.
*
- * @see org.apache.tapestry.internal.services.PageRenderQueue
+ * @see org.apache.tapestry5.internal.services.PageRenderQueue
*/
public interface AjaxPartialResponseRenderer
{
/**
* Used to render a partial response as part of an Ajax action request. A call to {@link
- * org.apache.tapestry.internal.services.PageRenderQueue#initializeForPartialPageRender(org.apache.tapestry.runtime.RenderCommand)}
+ * org.apache.tapestry5.internal.services.PageRenderQueue#initializeForPartialPageRender(org.apache.tapestry5.runtime.RenderCommand)}
* should precede this call.
*/
void renderPartialPageMarkup() throws IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRendererImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRendererImpl.java
index 51ae903..e160862 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRendererImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AjaxPartialResponseRendererImpl.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ContentType;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.services.MarkupWriterFactory;
-import org.apache.tapestry.services.PartialMarkupRenderer;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.internal.InternalConstants;
import org.apache.tapestry5.json.JSONObject;
+import org.apache.tapestry5.services.MarkupWriterFactory;
+import org.apache.tapestry5.services.PartialMarkupRenderer;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Response;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AliasImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AliasImpl.java
index 0f184a4..fc9e0fb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AliasImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AliasImpl.java
@@ -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.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.Alias;
-import org.apache.tapestry.services.AliasManager;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.Alias;
+import org.apache.tapestry5.services.AliasManager;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AliasManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AliasManagerImpl.java
index a562f69..1a94fb1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AliasManagerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AliasManagerImpl.java
@@ -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.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.AliasContribution;
-import org.apache.tapestry.services.AliasManager;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.AliasContribution;
+import org.apache.tapestry5.services.AliasManager;
import org.slf4j.Logger;
import java.util.Collection;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AnnotationDataTypeAnalyzer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AnnotationDataTypeAnalyzer.java
index d229d76..8b20666 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AnnotationDataTypeAnalyzer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AnnotationDataTypeAnalyzer.java
@@ -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.beaneditor.DataType;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
-import org.apache.tapestry.services.DataTypeAnalyzer;
+import org.apache.tapestry5.beaneditor.DataType;
+import org.apache.tapestry5.ioc.services.PropertyAdapter;
+import org.apache.tapestry5.services.DataTypeAnalyzer;
/**
* Checks for the {@link DataType} annotation, returning its value if present.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationGlobalsImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationGlobalsImpl.java
index 5c709e8..bde755e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationGlobalsImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationGlobalsImpl.java
@@ -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.services.Context;
import org.apache.tapestry5.services.ApplicationGlobals;
+import org.apache.tapestry5.services.Context;
import javax.servlet.ServletContext;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImpl.java
index 40b0479..29e218d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImpl.java
@@ -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.ioc.ObjectLocator;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newConcurrentMap;
+import org.apache.tapestry5.services.*;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStatePersistenceStrategySourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStatePersistenceStrategySourceImpl.java
index 93411ea..e5d67d9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStatePersistenceStrategySourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ApplicationStatePersistenceStrategySourceImpl.java
@@ -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.services.ApplicationStatePersistenceStrategy;
-import org.apache.tapestry.services.ApplicationStatePersistenceStrategySource;
+import org.apache.tapestry5.services.ApplicationStatePersistenceStrategy;
+import org.apache.tapestry5.services.ApplicationStatePersistenceStrategySource;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetDispatcher.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetDispatcher.java
index 851447e..ddf060c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetDispatcher.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetDispatcher.java
@@ -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.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import org.apache.tapestry.services.ClasspathAssetAliasManager;
-import org.apache.tapestry.services.Dispatcher;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.services.ClasspathAssetAliasManager;
+import org.apache.tapestry5.services.Dispatcher;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Response;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetInjectionProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetInjectionProvider.java
index dadd70a..c076a1e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetInjectionProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetInjectionProvider.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.annotation.Path;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.AssetSource;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.InjectionProvider;
+import org.apache.tapestry5.annotations.Path;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.AssetSource;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.InjectionProvider;
import static java.lang.String.format;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetObjectProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetObjectProvider.java
index ea2ab0f..e8d22f7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetObjectProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetObjectProvider.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.annotation.Path;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.services.Builtin;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.services.AssetSource;
-import org.apache.tapestry.services.Core;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.annotations.Path;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
+import org.apache.tapestry5.ioc.services.Builtin;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.services.AssetSource;
+import org.apache.tapestry5.services.Core;
/**
* Exposes assets (in the current locale). The Inject annotation must be supplemented by a {@link Path} annotation, to
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java
index 92a3cfd..08eb0c7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AssetSourceImpl.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Asset;
-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.services.ThreadLocale;
-import org.apache.tapestry.ioc.util.StrategyRegistry;
-import org.apache.tapestry.services.AssetFactory;
-import org.apache.tapestry.services.AssetSource;
+import org.apache.tapestry5.Asset;
+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.services.ThreadLocale;
+import org.apache.tapestry5.ioc.util.StrategyRegistry;
+import org.apache.tapestry5.services.AssetFactory;
+import org.apache.tapestry5.services.AssetSource;
import java.util.Locale;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AttributeExpansionBinding.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AttributeExpansionBinding.java
index de79b24..a636a69 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AttributeExpansionBinding.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/AttributeExpansionBinding.java
@@ -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.Binding;
-import org.apache.tapestry.internal.bindings.AbstractBinding;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.internal.bindings.AbstractBinding;
+import org.apache.tapestry5.ioc.Location;
/**
* Wraps a {@link StringProvider} as a read-only {@link Binding}.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BasePropertyConduit.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BasePropertyConduit.java
index 3b504f5..5e4b4ee 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BasePropertyConduit.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BasePropertyConduit.java
@@ -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.PropertyConduit;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.internal.util.Defense;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.internal.util.Defense;
import java.lang.annotation.Annotation;
/**
- * Base class for {@link org.apache.tapestry.PropertyConduit} instances created by the {@link
- * org.apache.tapestry.services.PropertyConduitSource}.
+ * Base class for {@link org.apache.tapestry5.PropertyConduit} instances created by the {@link
+ * org.apache.tapestry5.services.PropertyConduitSource}.
*/
public abstract class BasePropertyConduit implements PropertyConduit
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BaseURLSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BaseURLSourceImpl.java
index 3dbf8d0..908b7a1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BaseURLSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BaseURLSourceImpl.java
@@ -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.services.BaseURLSource;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.services.BaseURLSource;
+import org.apache.tapestry5.services.Request;
public class BaseURLSourceImpl implements BaseURLSource
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanBlockOverrideSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanBlockOverrideSourceImpl.java
index b8a4e11..0f79237 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanBlockOverrideSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanBlockOverrideSourceImpl.java
@@ -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.Block;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.BeanBlockContribution;
-import org.apache.tapestry.services.BeanBlockOverrideSource;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.BeanBlockContribution;
+import org.apache.tapestry5.services.BeanBlockOverrideSource;
import java.util.Collection;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanBlockSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanBlockSourceImpl.java
index b7761ce..c35e7cd 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanBlockSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanBlockSourceImpl.java
@@ -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.Block;
-import org.apache.tapestry.services.BeanBlockContribution;
-import org.apache.tapestry.services.BeanBlockOverrideSource;
-import org.apache.tapestry.services.BeanBlockSource;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.services.BeanBlockContribution;
+import org.apache.tapestry5.services.BeanBlockOverrideSource;
+import org.apache.tapestry5.services.BeanBlockSource;
import java.util.Collection;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanModelSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanModelSourceImpl.java
index 0c805ff..4645c34 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanModelSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BeanModelSourceImpl.java
@@ -12,24 +12,24 @@
// 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.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.NonVisual;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.internal.beaneditor.BeanModelImpl;
-import org.apache.tapestry.ioc.LoggerSource;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.annotation.Primary;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.services.*;
-import org.apache.tapestry.services.BeanModelSource;
-import org.apache.tapestry.services.ComponentLayer;
-import org.apache.tapestry.services.DataTypeAnalyzer;
-import org.apache.tapestry.services.PropertyConduitSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.NonVisual;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.internal.beaneditor.BeanModelImpl;
+import org.apache.tapestry5.ioc.LoggerSource;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.annotations.Primary;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.services.*;
+import org.apache.tapestry5.services.BeanModelSource;
+import org.apache.tapestry5.services.ComponentLayer;
+import org.apache.tapestry5.services.DataTypeAnalyzer;
+import org.apache.tapestry5.services.PropertyConduitSource;
import java.util.List;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BindingSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BindingSourceImpl.java
index 0df8db5..e372fb8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BindingSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BindingSourceImpl.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.services.BindingFactory;
-import org.apache.tapestry.services.BindingSource;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.services.BindingFactory;
+import org.apache.tapestry5.services.BindingSource;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java
index 30d39c5..f7df1e3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/BlockInjectionProvider.java
@@ -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.Block;
-import org.apache.tapestry.annotation.Id;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.InjectionProvider;
-import org.apache.tapestry.services.TransformConstants;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.Id;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.InjectionProvider;
+import org.apache.tapestry5.services.TransformConstants;
/**
* Identifies fields of type {@link Block} that have the {@link Inject} annotation and converts them into read-only
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CheckForUpdatesFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CheckForUpdatesFilter.java
index 2492d82..5d43f73 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CheckForUpdatesFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CheckForUpdatesFilter.java
@@ -12,21 +12,21 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.util.Holder;
-import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
-import org.apache.tapestry.ioc.internal.util.Invokable;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.RequestFilter;
-import org.apache.tapestry.services.RequestHandler;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.internal.util.Holder;
+import org.apache.tapestry5.ioc.internal.util.ConcurrentBarrier;
+import org.apache.tapestry5.ioc.internal.util.Invokable;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.RequestFilter;
+import org.apache.tapestry5.services.RequestHandler;
+import org.apache.tapestry5.services.Response;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
/**
- * Implements a barrier that periodically asks the {@link org.apache.tapestry.internal.services.UpdateListenerHub} to
+ * Implements a barrier that periodically asks the {@link org.apache.tapestry5.internal.services.UpdateListenerHub} to
* check for updates to files. The UpdateListenerHub is invoked from a write method, meaning that when it is called, all
* other threads will be blocked.
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClassResultProcessor.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClassResultProcessor.java
index 3e84255..aa36bf4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClassResultProcessor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClassResultProcessor.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.services.ComponentClassResolver;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImpl.java
index 35e26b6..a9f69cc 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImpl.java
@@ -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.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.ClasspathAssetAliasManager;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.ClasspathAssetAliasManager;
+import org.apache.tapestry5.services.Request;
import java.util.Collections;
import java.util.Comparator;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java
index fc10bf5..db69e52 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClasspathAssetFactory.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
-import org.apache.tapestry.services.AssetFactory;
-import org.apache.tapestry.services.ClasspathAssetAliasManager;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newConcurrentMap;
+import org.apache.tapestry5.services.AssetFactory;
+import org.apache.tapestry5.services.ClasspathAssetAliasManager;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientBehaviorSupport.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientBehaviorSupport.java
index 53f4ad0..92ab648 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientBehaviorSupport.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientBehaviorSupport.java
@@ -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.Field;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.corelib.data.InsertPosition;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.corelib.data.InsertPosition;
/**
* Collects details about zone usage for efficient initialization of the client side objects. This has grown to include
- * the client-side behavior associated with {@link org.apache.tapestry.corelib.components.FormFragment}s.
+ * the client-side behavior associated with {@link org.apache.tapestry5.corelib.components.FormFragment}s.
*
- * @see org.apache.tapestry.corelib.components.Zone
+ * @see org.apache.tapestry5.corelib.components.Zone
*/
public interface ClientBehaviorSupport
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImpl.java
index 8802f59..b26a08a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImpl.java
@@ -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.Field;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.corelib.data.InsertPosition;
-import org.apache.tapestry.ioc.internal.util.Defense;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.corelib.data.InsertPosition;
+import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.json.JSONArray;
import org.apache.tapestry5.json.JSONObject;
@@ -125,7 +125,7 @@
}
/**
- * Invoked at the end of rendering to commit (to the {@link org.apache.tapestry.RenderSupport}) any accumulated
+ * Invoked at the end of rendering to commit (to the {@link org.apache.tapestry5.RenderSupport}) any accumulated
* validations.
*/
public void commit()
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorage.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorage.java
index 3804909..6b6108e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorage.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorage.java
@@ -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.Link;
-import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.PersistentFieldStrategy;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.services.PersistentFieldChange;
+import org.apache.tapestry5.services.PersistentFieldStrategy;
/**
* Describes an object that can store {@link PersistentFieldChange}s, and manage a query parameter stored into a {@link
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImpl.java
index 4b98ebf..656664e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImpl.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.internal.util.Base64ObjectInputStream;
-import org.apache.tapestry.internal.util.Base64ObjectOutputStream;
-import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.internal.util.Base64ObjectInputStream;
+import org.apache.tapestry5.internal.util.Base64ObjectOutputStream;
+import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.PersistentFieldChange;
+import org.apache.tapestry5.services.Request;
import java.io.ObjectInputStream;
import java.io.Serializable;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java
index 30f4bd1..22b3535 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStrategy.java
@@ -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.Link;
-import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.PersistentFieldStrategy;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.services.PersistentFieldChange;
+import org.apache.tapestry5.services.PersistentFieldStrategy;
import java.util.Collection;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CoercingPropertyConduitWrapper.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CoercingPropertyConduitWrapper.java
index 01cb81e..e1135bf 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CoercingPropertyConduitWrapper.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CoercingPropertyConduitWrapper.java
@@ -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.PropertyConduit;
-import org.apache.tapestry.ioc.services.TypeCoercer;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
import java.lang.annotation.Annotation;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java
index b1dc315..c193057 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CommonResourcesInjectionProvider.java
@@ -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.ioc.Messages;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.InjectionProvider;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.InjectionProvider;
import org.slf4j.Logger;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassCache.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassCache.java
index 0668164..30fafc0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassCache.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassCache.java
@@ -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;
/**
* A cache for converting between class names and component (or other) classes. For component classes, ensures that the
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassCacheImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassCacheImpl.java
index 5d519ec..669c00d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassCacheImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassCacheImpl.java
@@ -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.events.InvalidationListener;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.ioc.services.ClassFactory;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java
index 8c74632..9823af6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassResolverImpl.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.Invokable;
-import org.apache.tapestry.ioc.services.ClassNameLocator;
-import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.LibraryMapping;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.ConcurrentBarrier;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.Invokable;
+import org.apache.tapestry5.ioc.services.ClassNameLocator;
+import org.apache.tapestry5.services.ComponentClassResolver;
+import org.apache.tapestry5.services.LibraryMapping;
import org.slf4j.Logger;
import java.util.*;
@@ -542,4 +542,4 @@
});
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformer.java
index 832e707..3615478 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformer.java
@@ -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 javassist.CtClass;
/**
- * Encapsulates all the work performed by the {@link org.apache.tapestry.internal.services.ComponentInstantiatorSource}
+ * Encapsulates all the work performed by the {@link org.apache.tapestry5.internal.services.ComponentInstantiatorSource}
* when it loads and transforms a class.
*/
public interface ComponentClassTransformer
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformerImpl.java
index b23aa40..3314fbe 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentClassTransformerImpl.java
@@ -12,31 +12,31 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import javassist.CtClass;
import javassist.CtConstructor;
import javassist.NotFoundException;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.internal.model.MutableComponentModelImpl;
-import org.apache.tapestry.ioc.LoggerSource;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.services.CtClassSource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.ComponentLayer;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.internal.model.MutableComponentModelImpl;
+import org.apache.tapestry5.ioc.LoggerSource;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.services.CtClassSource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.ComponentLayer;
import org.slf4j.Logger;
import java.lang.reflect.Modifier;
import java.util.Map;
/**
- * Implementation of {@link org.apache.tapestry.internal.services.ComponentClassTransformer}.
+ * Implementation of {@link org.apache.tapestry5.internal.services.ComponentClassTransformer}.
*/
public class ComponentClassTransformerImpl implements ComponentClassTransformer, InvalidationListener
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentDefaultProviderImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentDefaultProviderImpl.java
index 3ca58eb..3adb3c9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentDefaultProviderImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentDefaultProviderImpl.java
@@ -12,19 +12,19 @@
// 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.*;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.Messages;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.BindingSource;
-import org.apache.tapestry.services.ComponentDefaultProvider;
-import org.apache.tapestry.services.TranslatorSource;
-import org.apache.tapestry.services.ValueEncoderSource;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.ioc.Messages;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.BindingSource;
+import org.apache.tapestry5.services.ComponentDefaultProvider;
+import org.apache.tapestry5.services.TranslatorSource;
+import org.apache.tapestry5.services.ValueEncoderSource;
public class ComponentDefaultProviderImpl implements ComponentDefaultProvider
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
index 38a6d29..7749d8a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventDispatcher.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.EventConstants;
-import org.apache.tapestry.EventContext;
-import org.apache.tapestry.internal.EmptyEventContext;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.internal.URLEventContext;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.internal.EmptyEventContext;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.internal.URLEventContext;
+import org.apache.tapestry5.services.*;
import java.io.IOException;
import java.util.regex.Matcher;
@@ -38,10 +38,10 @@
* page with action context "foo" , "gnu"</li> </ul>
* <p/>
* The page name portion may itself consist of a series of folder names, i.e., "admin/user/create". The context portion
- * isn't the concern of this code, since {@link org.apache.tapestry.services.Request#getPath()} will already have
+ * isn't the concern of this code, since {@link org.apache.tapestry5.services.Request#getPath()} will already have
* stripped that off. We can act as if the context is always "/" (the path always starts with a slash).
*
- * @see LinkFactory#createActionLink(org.apache.tapestry.internal.structure.Page, String, String,boolean, Object...)
+ * @see LinkFactory#createActionLink(org.apache.tapestry5.internal.structure.Page, String, String,boolean, Object...)
*/
public class ComponentEventDispatcher implements Dispatcher
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventImpl.java
index 193332d..b280bf7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventImpl.java
@@ -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.ComponentEventCallback;
-import org.apache.tapestry.EventContext;
-import org.apache.tapestry.internal.structure.PageResources;
-import org.apache.tapestry.runtime.ComponentEvent;
+import org.apache.tapestry5.ComponentEventCallback;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.internal.structure.PageResources;
+import org.apache.tapestry5.runtime.ComponentEvent;
public class ComponentEventImpl extends EventImpl implements ComponentEvent
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventRequestHandlerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventRequestHandlerImpl.java
index 4c3b406..0676d4e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventRequestHandlerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentEventRequestHandlerImpl.java
@@ -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.EventConstants;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.services.*;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessor.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessor.java
index 4bcfd8c..4a64ef9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessor.java
@@ -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.ComponentResources;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
import org.slf4j.Logger;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSource.java
index c1814a1..1dbe7c4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSource.java
@@ -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.event.InvalidationEventHub;
-import org.apache.tapestry.ioc.internal.services.CtClassSource;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.internal.event.InvalidationEventHub;
+import org.apache.tapestry5.ioc.internal.services.CtClassSource;
+import org.apache.tapestry5.ioc.services.ClassFactory;
/**
- * Creates {@link org.apache.tapestry.internal.services.Instantiator}s for components, based on component class name.
+ * Creates {@link org.apache.tapestry5.internal.services.Instantiator}s for components, based on component class name.
* This will involve transforming the component's class before it is loaded.
* <p/>
- * In addition, a source acts as an event hub for {@link org.apache.tapestry.internal.events.InvalidationListener}s, so
+ * In addition, a source acts as an event hub for {@link org.apache.tapestry5.internal.events.InvalidationListener}s, so
* that any information derived from loaded classes can be discarded and rebuilt when classes change.
* <p/>
* The strategy used is that when <em>any</em> class (in a controlled package) changes, the entire class loader is
@@ -69,4 +69,4 @@
*/
CtClassSource getClassSource();
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java
index 8d21155..da719f1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImpl.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import javassist.*;
-import org.apache.tapestry.internal.event.InvalidationEventHubImpl;
-import org.apache.tapestry.internal.events.UpdateListener;
-import org.apache.tapestry.internal.util.URLChangeTracker;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryClassPool;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
-import org.apache.tapestry.ioc.internal.services.CtClassSource;
-import org.apache.tapestry.ioc.internal.services.CtClassSourceImpl;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.internal.event.InvalidationEventHubImpl;
+import org.apache.tapestry5.internal.events.UpdateListener;
+import org.apache.tapestry5.internal.util.URLChangeTracker;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryClassPool;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryImpl;
+import org.apache.tapestry5.ioc.internal.services.CtClassSource;
+import org.apache.tapestry5.ioc.internal.services.CtClassSourceImpl;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.services.ClassFactory;
import org.slf4j.Logger;
import java.net.URL;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInvocation.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInvocation.java
index deb121f..f70b3b8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInvocation.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInvocation.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInvocationImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInvocationImpl.java
index 847c5c4..b861120 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInvocationImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInvocationImpl.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.test.PageTester;
import java.util.List;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInvocationMap.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInvocationMap.java
index 4458646..cd19101 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInvocationMap.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentInvocationMap.java
@@ -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.Link;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.test.PageTester;
/**
* Used by the {@link PageTester} to map {@link Element}s (pulled from the rendered {@link Document}) into {@link
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImpl.java
index 84f0227..fbd10d0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImpl.java
@@ -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.events.InvalidationListener;
-import org.apache.tapestry.internal.events.UpdateListener;
-import org.apache.tapestry.internal.util.URLChangeTracker;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.model.ComponentModel;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.internal.events.UpdateListener;
+import org.apache.tapestry5.internal.util.URLChangeTracker;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.model.ComponentModel;
import org.apache.tapestry5.services.ComponentMessagesSource;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesInjectionProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesInjectionProvider.java
index b8c420e..d281a47 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesInjectionProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesInjectionProvider.java
@@ -12,18 +12,18 @@
// 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.ioc.ObjectLocator;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.InjectionProvider;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.InjectionProvider;
import static java.lang.String.format;
/**
- * Allows for the injection of the component's {@link org.apache.tapestry.ComponentResources}.
+ * Allows for the injection of the component's {@link org.apache.tapestry5.ComponentResources}.
*/
public class ComponentResourcesInjectionProvider implements InjectionProvider
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesOperation.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesOperation.java
index b659564..468d9ba 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesOperation.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResourcesOperation.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
+import org.apache.tapestry5.ComponentResources;
/**
* A kind of callback that can easily be injected into a transformed class to perform complex work.
* <p/>
* These callbacks are often injected into a transformed component class via {@link
- * org.apache.tapestry.services.ClassTransformation#addInjectedField(Class, String, Object)}. Bear in mind that such
+ * org.apache.tapestry5.services.ClassTransformation#addInjectedField(Class, String, Object)}. Bear in mind that such
* callbacks must be <em>threadsafe</em>, since every instance of such a class will share a single instance of the
* operation.
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResultProcessorWrapper.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResultProcessorWrapper.java
index 89b80a0..7cc6999 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResultProcessorWrapper.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentResultProcessorWrapper.java
@@ -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.ComponentEventCallback;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.ComponentEventCallback;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
import java.io.IOException;
@@ -52,7 +52,7 @@
}
/**
- * Returns true if {@link org.apache.tapestry.ComponentEventCallback#handleResult(Object)} was invoked, false
+ * Returns true if {@link org.apache.tapestry5.ComponentEventCallback#handleResult(Object)} was invoked, false
* otherwise.
*
* @return true if the event was aborted
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentSourceImpl.java
index 37d2ff6..380927b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentSourceImpl.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ComponentSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.ComponentSource;
public class ComponentSourceImpl implements ComponentSource
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSource.java
index 9ad2955..00316b4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSource.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.event.InvalidationEventHub;
-import org.apache.tapestry.internal.parser.ComponentTemplate;
-import org.apache.tapestry.model.ComponentModel;
+import org.apache.tapestry5.internal.event.InvalidationEventHub;
+import org.apache.tapestry5.internal.parser.ComponentTemplate;
+import org.apache.tapestry5.model.ComponentModel;
import java.util.Locale;
/**
- * Provides access to cached {@link org.apache.tapestry.internal.parser.ComponentTemplate}s. The source acts as a
+ * Provides access to cached {@link org.apache.tapestry5.internal.parser.ComponentTemplate}s. The source acts as a
* invalidation event hub, and will broadcast invalidation events when any loaded template resource changes. The
* listener for these invalidation events is the page source, which stores cached page instances.
* <p/>
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java
index f2b5eef..f6fdb3f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImpl.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.event.InvalidationEventHubImpl;
-import org.apache.tapestry.internal.events.UpdateListener;
-import org.apache.tapestry.internal.parser.ComponentTemplate;
-import org.apache.tapestry.internal.parser.TemplateToken;
-import org.apache.tapestry.internal.util.MultiKey;
-import org.apache.tapestry.internal.util.URLChangeTracker;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.model.ComponentModel;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.event.InvalidationEventHubImpl;
+import org.apache.tapestry5.internal.events.UpdateListener;
+import org.apache.tapestry5.internal.parser.ComponentTemplate;
+import org.apache.tapestry5.internal.parser.TemplateToken;
+import org.apache.tapestry5.internal.util.MultiKey;
+import org.apache.tapestry5.internal.util.URLChangeTracker;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.model.ComponentModel;
import java.util.List;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CompositeFieldValidator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CompositeFieldValidator.java
index 0eccfe4..7aa075e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CompositeFieldValidator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CompositeFieldValidator.java
@@ -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.FieldValidator;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationException;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationException;
import java.util.List;
@@ -55,4 +55,4 @@
return false;
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextAssetFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextAssetFactory.java
index 0d638ae..1dc913a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextAssetFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextAssetFactory.java
@@ -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.Asset;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.services.AssetFactory;
-import org.apache.tapestry.services.Context;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.services.AssetFactory;
+import org.apache.tapestry5.services.Context;
+import org.apache.tapestry5.services.Request;
/**
* Implementation of {@link AssetFactory} for assets that are part of the web application context.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextImpl.java
index 40a1634..2e80a12 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextImpl.java
@@ -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.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.util.Stack;
-import org.apache.tapestry.services.Context;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.util.Stack;
+import org.apache.tapestry5.services.Context;
import javax.servlet.ServletContext;
import java.io.File;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextResource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextResource.java
index b4cde64..2887d8b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextResource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextResource.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.AbstractResource;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.services.Context;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.AbstractResource;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.services.Context;
import java.io.File;
import java.net.MalformedURLException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextValueEncoderImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextValueEncoderImpl.java
index f3c19e4..ea8f365 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextValueEncoderImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ContextValueEncoderImpl.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ValueEncoder;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.services.ContextValueEncoder;
-import org.apache.tapestry.services.ValueEncoderSource;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.services.ContextValueEncoder;
+import org.apache.tapestry5.services.ValueEncoderSource;
public class ContextValueEncoderImpl implements ContextValueEncoder
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CookieSink.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CookieSink.java
index bc6d5d4..ba855cc 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CookieSink.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CookieSink.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import javax.servlet.http.Cookie;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CookieSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CookieSource.java
index 158db1f..2e15cf5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CookieSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CookieSource.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import javax.servlet.http.Cookie;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CookiesImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CookiesImpl.java
index e28a0bb..4346c49 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CookiesImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/CookiesImpl.java
@@ -12,18 +12,18 @@
// 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.annotation.IntermediateType;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.ioc.util.TimeInterval;
-import org.apache.tapestry.services.Cookies;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.ioc.annotations.IntermediateType;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.ioc.util.TimeInterval;
+import org.apache.tapestry5.services.Cookies;
+import org.apache.tapestry5.services.Request;
import javax.servlet.http.Cookie;
/**
- * Implementation of the {@link org.apache.tapestry.services.Cookies} service interface.
+ * Implementation of the {@link org.apache.tapestry5.services.Cookies} service interface.
*/
public class CookiesImpl implements Cookies
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultDataTypeAnalyzer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultDataTypeAnalyzer.java
index e074ac1..6a9c71c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultDataTypeAnalyzer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultDataTypeAnalyzer.java
@@ -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.events.InvalidationListener;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
-import org.apache.tapestry.ioc.util.StrategyRegistry;
-import org.apache.tapestry.services.DataTypeAnalyzer;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.ioc.services.PropertyAdapter;
+import org.apache.tapestry5.ioc.util.StrategyRegistry;
+import org.apache.tapestry5.services.DataTypeAnalyzer;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultInjectionProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultInjectionProvider.java
index 786236e..6b57253 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultInjectionProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultInjectionProvider.java
@@ -12,24 +12,24 @@
// 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.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.services.MasterObjectProvider;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.InjectionProvider;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.services.MasterObjectProvider;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.InjectionProvider;
import java.lang.annotation.Annotation;
/**
- * Worker for the {@link org.apache.tapestry.ioc.annotation.Inject} annotation that delegates out to the master {@link
- * org.apache.tapestry.ioc.services.MasterObjectProvider} to access the value. This worker must be scheduled after
+ * Worker for the {@link org.apache.tapestry5.ioc.annotations.Inject} annotation that delegates out to the master {@link
+ * org.apache.tapestry5.ioc.services.MasterObjectProvider} to access the value. This worker must be scheduled after
* certain other workers, such as {@link BlockInjectionProvider} (which is keyed off a combination of type and the
* Inject annotation).
*
- * @see org.apache.tapestry.ioc.services.MasterObjectProvider
+ * @see org.apache.tapestry5.ioc.services.MasterObjectProvider
*/
public class DefaultInjectionProvider implements InjectionProvider
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java
index ba0c07c..ff1a0db 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DefaultRequestExceptionHandler.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.services.ExceptionReporter;
-import org.apache.tapestry.services.RequestExceptionHandler;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.services.ExceptionReporter;
+import org.apache.tapestry5.services.RequestExceptionHandler;
import org.slf4j.Logger;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinker.java
index ec65c02..5330a51 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinker.java
@@ -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;
/**
* Responsible for injecting script and style links into the <head> and <body> element of the rendered HTML
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinkerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinkerImpl.java
index 65b58f4..0f4cdb5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinkerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/DocumentLinkerImpl.java
@@ -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.dom.Document;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import java.util.List;
import java.util.Set;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EnumValueEncoderFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EnumValueEncoderFactory.java
index 59e7181..ad80e37 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EnumValueEncoderFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EnumValueEncoderFactory.java
@@ -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.ValueEncoder;
-import org.apache.tapestry.services.ValueEncoderFactory;
-import org.apache.tapestry.util.EnumValueEncoder;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.services.ValueEncoderFactory;
+import org.apache.tapestry5.util.EnumValueEncoder;
/**
* Factory that provides a configured instance of {@link EnumValueEncoder}.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EnvironmentImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EnvironmentImpl.java
index bee1732..7f52ab6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EnvironmentImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EnvironmentImpl.java
@@ -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 static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newLinkedList;
-import org.apache.tapestry.services.Environment;
+import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newLinkedList;
+import org.apache.tapestry5.services.Environment;
import java.util.LinkedList;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EnvironmentalShadowBuilderImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EnvironmentalShadowBuilderImpl.java
index 10784b9..b699249 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EnvironmentalShadowBuilderImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EnvironmentalShadowBuilderImpl.java
@@ -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.ioc.services.Builtin;
-import org.apache.tapestry.ioc.services.ClassFab;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.MethodSignature;
-import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.services.EnvironmentalShadowBuilder;
+import org.apache.tapestry5.ioc.services.Builtin;
+import org.apache.tapestry5.ioc.services.ClassFab;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.MethodSignature;
+import org.apache.tapestry5.services.Environment;
+import org.apache.tapestry5.services.EnvironmentalShadowBuilder;
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EventImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EventImpl.java
index 50f1931..9499191 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EventImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/EventImpl.java
@@ -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.ComponentEventCallback;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.runtime.Event;
+import org.apache.tapestry5.ComponentEventCallback;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.runtime.Event;
public class EventImpl implements Event
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidationSupportImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidationSupportImpl.java
index e6deda8..d38b4e7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidationSupportImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidationSupportImpl.java
@@ -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.*;
-import org.apache.tapestry.corelib.internal.InternalMessages;
-import org.apache.tapestry.internal.util.Holder;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.ioc.util.ExceptionUtils;
-import org.apache.tapestry.services.ValidationMessagesSource;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.corelib.internal.InternalMessages;
+import org.apache.tapestry5.internal.util.Holder;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.ioc.util.ExceptionUtils;
+import org.apache.tapestry5.services.ValidationMessagesSource;
public class FieldValidationSupportImpl implements FieldValidationSupport
{
@@ -137,7 +137,7 @@
}
/**
- * Checks for a {@link org.apache.tapestry.ValidationException} inside the outer exception and throws that,
+ * Checks for a {@link org.apache.tapestry5.ValidationException} inside the outer exception and throws that,
* otherwise rethrows the runtime exception.
*
* @param outerException initially caught exception
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorDefaultSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorDefaultSourceImpl.java
index 0444cc6..526c543 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorDefaultSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorDefaultSourceImpl.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.Messages;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.services.FieldValidatorDefaultSource;
-import org.apache.tapestry.services.FieldValidatorSource;
-import org.apache.tapestry.services.ValidationConstraintGenerator;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.Messages;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.services.FieldValidatorDefaultSource;
+import org.apache.tapestry5.services.FieldValidatorSource;
+import org.apache.tapestry5.services.ValidationConstraintGenerator;
import java.util.List;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorImpl.java
index dced4ce..eb6ea27 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorImpl.java
@@ -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.*;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.services.FormSupport;
public class FieldValidatorImpl implements FieldValidator
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImpl.java
index 4806070..fe56932 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImpl.java
@@ -12,23 +12,23 @@
// 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.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.Validator;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.ioc.Messages;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.Defense.cast;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.FieldValidatorSource;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.services.ValidationMessagesSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.Validator;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.ioc.Messages;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.Defense.cast;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.FieldValidatorSource;
+import org.apache.tapestry5.services.FormSupport;
+import org.apache.tapestry5.services.ValidationMessagesSource;
import java.util.List;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FlashPersistentFieldStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FlashPersistentFieldStrategy.java
index e84407e..fca9585 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FlashPersistentFieldStrategy.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/FlashPersistentFieldStrategy.java
@@ -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.services.Request;
-import org.apache.tapestry.services.Session;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Session;
/**
* The "flash" strategy stores data inside the {@link Session session}, just like {@link
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/GenericValueEncoderFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/GenericValueEncoderFactory.java
index c91e1a9..b903319 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/GenericValueEncoderFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/GenericValueEncoderFactory.java
@@ -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.ValueEncoder;
-import org.apache.tapestry.services.ValueEncoderFactory;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.services.ValueEncoderFactory;
/**
* An implementation of {@link ValueEncoderFactory} that returns a pre-wired instance of {@link ValueEncoder}. This is
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/HeartbeatImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/HeartbeatImpl.java
index ffd615f..c146f7d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/HeartbeatImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/HeartbeatImpl.java
@@ -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.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newStack;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.util.Stack;
-import org.apache.tapestry.services.Heartbeat;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newStack;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.util.Stack;
+import org.apache.tapestry5.services.Heartbeat;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/IgnoredPathsFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/IgnoredPathsFilter.java
index c4c46df..b356092 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/IgnoredPathsFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/IgnoredPathsFilter.java
@@ -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.services.HttpServletRequestFilter;
-import org.apache.tapestry.services.HttpServletRequestHandler;
+import org.apache.tapestry5.services.HttpServletRequestFilter;
+import org.apache.tapestry5.services.HttpServletRequestHandler;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ImmediateActionRenderResponseFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ImmediateActionRenderResponseFilter.java
index 8fe96ec..a6dbff3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ImmediateActionRenderResponseFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ImmediateActionRenderResponseFilter.java
@@ -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.EventConstants;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.services.*;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ImmediateActionRenderResponseGenerator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ImmediateActionRenderResponseGenerator.java
index 9996376..c340aba 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ImmediateActionRenderResponseGenerator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ImmediateActionRenderResponseGenerator.java
@@ -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.InternalConstants;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.services.Request;
import java.io.IOException;
/**
- * Alternative implementation, used when {@link org.apache.tapestry.SymbolConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS}
+ * Alternative implementation, used when {@link org.apache.tapestry5.SymbolConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS}
* is set to true.
*/
public class ImmediateActionRenderResponseGenerator implements ActionRenderResponseGenerator
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InheritedBinding.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InheritedBinding.java
index bd03ac1..6ab8850 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InheritedBinding.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InheritedBinding.java
@@ -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.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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/Instantiator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/Instantiator.java
index 9443d71..130a244 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/Instantiator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/Instantiator.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.runtime.Component;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.runtime.Component;
/**
* An object that can instantiate a component. This is used with transformed classes, in which the normal no-arguments
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformation.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformation.java
index 2e97ad7..d526631 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformation.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformation.java
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import javassist.CtClass;
-import org.apache.tapestry.internal.util.MultiKey;
-import org.apache.tapestry.ioc.internal.util.IdAllocator;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.internal.util.MultiKey;
+import org.apache.tapestry5.ioc.internal.util.IdAllocator;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.TransformMethodSignature;
import java.util.List;
/**
- * Extends {@link org.apache.tapestry.services.ClassTransformation} with additional methods that may only be used
+ * Extends {@link org.apache.tapestry5.services.ClassTransformation} with additional methods that may only be used
* internally by Tapestry.
*/
public interface InternalClassTransformation extends ClassTransformation
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java
index 0727671..60a2934 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalClassTransformationImpl.java
@@ -12,31 +12,31 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import javassist.*;
import javassist.expr.ExprEditor;
import javassist.expr.FieldAccess;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.util.MultiKey;
-import org.apache.tapestry.ioc.internal.services.CtClassSource;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.IdAllocator;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ClassFab;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.MethodSignature;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.util.MultiKey;
+import org.apache.tapestry5.ioc.internal.services.CtClassSource;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.*;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.IdAllocator;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ClassFab;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.MethodSignature;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.*;
import org.slf4j.Logger;
import static java.lang.String.format;
@@ -45,7 +45,7 @@
import java.util.*;
/**
- * Implementation of the {@link org.apache.tapestry.internal.services.InternalClassTransformation} interface.
+ * Implementation of the {@link org.apache.tapestry5.internal.services.InternalClassTransformation} interface.
*/
public final class InternalClassTransformationImpl implements InternalClassTransformation
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java
index 65f334f..c0409f1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalModule.java
@@ -12,32 +12,30 @@
// 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.SymbolConstants;
-import org.apache.tapestry.internal.structure.PageResourcesSource;
-import org.apache.tapestry.internal.structure.PageResourcesSourceImpl;
-import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ServiceBinder;
-import org.apache.tapestry.ioc.ServiceResources;
-import org.apache.tapestry.ioc.annotation.Marker;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.ioc.internal.services.CtClassSource;
-import org.apache.tapestry.ioc.services.Builtin;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.PerthreadManager;
-import org.apache.tapestry.ioc.services.PropertyShadowBuilder;
-import org.apache.tapestry.services.*;
-import org.apache.tapestry5.services.ComponentMessagesSource;
-import org.apache.tapestry5.services.RequestGlobals;
+import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.internal.structure.PageResourcesSource;
+import org.apache.tapestry5.internal.structure.PageResourcesSourceImpl;
+import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.ServiceResources;
+import org.apache.tapestry5.ioc.annotations.Marker;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.ioc.internal.services.CtClassSource;
+import org.apache.tapestry5.ioc.services.Builtin;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.PerthreadManager;
+import org.apache.tapestry5.ioc.services.PropertyShadowBuilder;
+import org.apache.tapestry5.services.*;
import org.slf4j.Logger;
import javax.servlet.http.Cookie;
/**
- * {@link org.apache.tapestry.services.TapestryModule} has gotten too complicated and it is nice to demarkate public
+ * {@link org.apache.tapestry5.services.TapestryModule} has gotten too complicated and it is nice to demarkate public
* (and stable) from internal (and volatile).
*/
@Marker(Core.class)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalRequestGlobals.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalRequestGlobals.java
index 76c1507..7fc45ce 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalRequestGlobals.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalRequestGlobals.java
@@ -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;
/**
* Stores global per-request data internal to the framework.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalRequestGlobalsImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalRequestGlobalsImpl.java
index 3a1d59e..0e23543 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalRequestGlobalsImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InternalRequestGlobalsImpl.java
@@ -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 static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotation.Scope;
+import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry5.ioc.annotations.Scope;
@Scope(PERTHREAD_SCOPE)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InvocationBuilder.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InvocationBuilder.java
index c914a2f..ed6fe87 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InvocationBuilder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InvocationBuilder.java
@@ -12,24 +12,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import javassist.*;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ioc.internal.services.CtClassSource;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.services.ComponentMethodAdvice;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ioc.internal.services.CtClassSource;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.services.ComponentMethodAdvice;
+import org.apache.tapestry5.services.TransformMethodSignature;
import java.lang.reflect.Modifier;
import java.util.concurrent.atomic.AtomicLong;
/**
- * Used by {@link org.apache.tapestry.internal.services.InternalClassTransformationImpl} to manage adding method
+ * Used by {@link org.apache.tapestry5.internal.services.InternalClassTransformationImpl} to manage adding method
* invocation advice to arbitrary component methods.
*
- * @see org.apache.tapestry.ioc.MethodAdvice
+ * @see org.apache.tapestry5.ioc.MethodAdvice
*/
class InvocationBuilder
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InvocationTarget.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InvocationTarget.java
index cee7942..72725d5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InvocationTarget.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/InvocationTarget.java
@@ -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;
/**
- * It represents target for a {@link org.apache.tapestry.internal.services.ComponentInvocation}. For example, it may be
+ * It represents target for a {@link org.apache.tapestry5.internal.services.ComponentInvocation}. For example, it may be
* a page or an action for a component within a page.
*/
public interface InvocationTarget
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/JSONObjectEventResultProcessor.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/JSONObjectEventResultProcessor.java
index 4ffc5ba..0bc3032 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/JSONObjectEventResultProcessor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/JSONObjectEventResultProcessor.java
@@ -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.InternalConstants;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.internal.InternalConstants;
import org.apache.tapestry5.json.JSONObject;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.services.Response;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactory.java
index f218a90..dfcf813 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactory.java
@@ -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.Link;
-import org.apache.tapestry.internal.structure.Page;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.internal.structure.Page;
/**
* A source for {@link Link} objects.
@@ -34,7 +34,7 @@
* @param forForm true if the link is for a form, false otherwise
* @param context Additional path data, each value will be converted to a string and appended to the URI @return a
* link
- * @see org.apache.tapestry.ComponentResources#createActionLink(String, boolean, Object[])
+ * @see org.apache.tapestry5.ComponentResources#createActionLink(String, boolean, Object[])
*/
Link createActionLink(Page page, String nestedId, String eventType, boolean forForm, Object... context);
@@ -51,7 +51,7 @@
* @param override if true, then the provided activation context is always used even if empty
* @param activationContext the activation context for the page
* @return a link
- * @see org.apache.tapestry.ComponentResources#createPageLink(String, boolean, Object[])
+ * @see org.apache.tapestry5.ComponentResources#createPageLink(String, boolean, Object[])
*/
Link createPageLink(Page page, boolean override, Object... activationContext);
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryImpl.java
index 8c9683a..063a4ec 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryImpl.java
@@ -12,23 +12,23 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentEventCallback;
-import org.apache.tapestry.EventConstants;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.util.StrategyRegistry;
-import org.apache.tapestry.services.ContextValueEncoder;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.ComponentEventCallback;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.*;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.util.StrategyRegistry;
+import org.apache.tapestry5.services.ContextValueEncoder;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Response;
import java.util.Arrays;
import java.util.Collection;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryListener.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryListener.java
index a93cdeb..b1e9ca9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryListener.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkFactoryListener.java
@@ -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.Link;
+import org.apache.tapestry5.Link;
/**
* Listener interface for objects that need to be notified about newly created links.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkImpl.java
index a935788..1129c34 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LinkImpl.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.Response;
import java.util.List;
/**
- * Default implementation of {@link org.apache.tapestry.Link}.
+ * Default implementation of {@link org.apache.tapestry5.Link}.
*/
public class LinkImpl implements Link
{
@@ -59,8 +59,8 @@
* @param response used to encode the response when necessary
* @param optimizer optimizes complete URLs to appropriate relative URLs
* @param baseURL base URL prefix (before the context path), used when switching between secure and non-secure
- * @param contextPath path for the context {@link org.apache.tapestry.services.Request#getContextPath()}
- * @param invocation abstraction around the type of link (needed by {@link org.apache.tapestry.test.PageTester})
+ * @param contextPath path for the context {@link org.apache.tapestry5.services.Request#getContextPath()}
+ * @param invocation abstraction around the type of link (needed by {@link org.apache.tapestry5.test.PageTester})
* @param forForm if true, then a Form has requested the Link, in which case, the link should not generated
*/
public LinkImpl(Response response, RequestPathOptimizer optimizer, String baseURL, String contextPath,
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationFilter.java
index cde6b84..0df4bc9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationFilter.java
@@ -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.services.Request;
-import org.apache.tapestry.services.RequestFilter;
-import org.apache.tapestry.services.RequestHandler;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.RequestFilter;
+import org.apache.tapestry5.services.RequestHandler;
+import org.apache.tapestry5.services.Response;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetter.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetter.java
index d85edf6..a7d8c62 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import java.util.Locale;
@@ -25,4 +25,4 @@
void setThreadLocale(Locale desiredLocale);
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java
index d29988b..dedfa10 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/LocalizationSetterImpl.java
@@ -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.annotation.Inject;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.ThreadLocale;
-import org.apache.tapestry.services.PersistentLocale;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.ThreadLocale;
+import org.apache.tapestry5.services.PersistentLocale;
import java.util.Locale;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MapMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MapMessages.java
index 3b4ee87..c34780c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MapMessages.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MapMessages.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
/**
* An implementation of {@link Messages} that is based on a map.
*
*/
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.util.AbstractMessages;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.util.AbstractMessages;
import java.util.Locale;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MarkupWriterFactoryImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MarkupWriterFactoryImpl.java
index b05778c..c45021a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MarkupWriterFactoryImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MarkupWriterFactoryImpl.java
@@ -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.ContentType;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.dom.DefaultMarkupModel;
-import org.apache.tapestry.dom.MarkupModel;
-import org.apache.tapestry.dom.XMLMarkupModel;
-import org.apache.tapestry.services.MarkupWriterFactory;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.dom.DefaultMarkupModel;
+import org.apache.tapestry5.dom.MarkupModel;
+import org.apache.tapestry5.dom.XMLMarkupModel;
+import org.apache.tapestry5.services.MarkupWriterFactory;
public class MarkupWriterFactoryImpl implements MarkupWriterFactory
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MarkupWriterImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MarkupWriterImpl.java
index c8c73a4..64c8ce8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MarkupWriterImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MarkupWriterImpl.java
@@ -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.MarkupWriter;
-import org.apache.tapestry.MarkupWriterListener;
-import org.apache.tapestry.dom.*;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.MarkupWriterListener;
+import org.apache.tapestry5.dom.*;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import java.io.PrintWriter;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesBundle.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesBundle.java
index 37fcc8c..8200448 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesBundle.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesBundle.java
@@ -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.ioc.Messages;
-import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.Resource;
/**
* Represents a bundle of properties files that can be used to collect properties that are eventually used to form a
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesSource.java
index b6e8f9d..9023295 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesSource.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.event.InvalidationEventHub;
-import org.apache.tapestry.internal.events.UpdateListener;
-import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry5.internal.event.InvalidationEventHub;
+import org.apache.tapestry5.internal.events.UpdateListener;
+import org.apache.tapestry5.ioc.Messages;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesSourceImpl.java
index a7f29c9..e7f6dce 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MessagesSourceImpl.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.event.InvalidationEventHubImpl;
-import org.apache.tapestry.internal.util.MultiKey;
-import org.apache.tapestry.internal.util.URLChangeTracker;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.LocalizedNameGenerator;
+import org.apache.tapestry5.internal.event.InvalidationEventHubImpl;
+import org.apache.tapestry5.internal.util.MultiKey;
+import org.apache.tapestry5.internal.util.URLChangeTracker;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.LocalizedNameGenerator;
import java.io.InputStream;
import java.util.*;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MetaDataLocatorImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MetaDataLocatorImpl.java
index b219a92..3fa3d5b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MetaDataLocatorImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MetaDataLocatorImpl.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.services.MetaDataLocator;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.services.MetaDataLocator;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MethodCompileException.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MethodCompileException.java
index 41736c9..868df89 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MethodCompileException.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MethodCompileException.java
@@ -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;
/**
* Exception thrown when a method body fails to compile; this will allow the method body to be displayed to the user on
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MethodInvocationInfo.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MethodInvocationInfo.java
index cd99bb6..a78e1f3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MethodInvocationInfo.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/MethodInvocationInfo.java
@@ -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.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
-import org.apache.tapestry.services.ComponentMethodAdvice;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.services.ComponentMethodAdvice;
+import org.apache.tapestry5.services.TransformMethodSignature;
import java.util.List;
/**
- * A companion to {@link org.apache.tapestry.internal.services.AbstractComponentMethodInvocation} that stores most of
+ * A companion to {@link org.apache.tapestry5.internal.services.AbstractComponentMethodInvocation} that stores most of
* the method and advice information needed.
*/
public class MethodInvocationInfo
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/NoOpComponentInvocationMap.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/NoOpComponentInvocationMap.java
index c439ff3..420d627 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/NoOpComponentInvocationMap.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/NoOpComponentInvocationMap.java
@@ -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.Link;
-import org.apache.tapestry.dom.Element;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.dom.Element;
/**
- * The production implementation for {@link org.apache.tapestry.internal.services.ComponentInvocationMap}. It does
+ * The production implementation for {@link org.apache.tapestry5.internal.services.ComponentInvocationMap}. It does
* absolutely nothing because it is not needed in production.
*/
public class NoOpComponentInvocationMap implements ComponentInvocationMap
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/NullFieldStrategySourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/NullFieldStrategySourceImpl.java
index 14888b9..745bd17 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/NullFieldStrategySourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/NullFieldStrategySourceImpl.java
@@ -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.NullFieldStrategy;
-import org.apache.tapestry.services.NullFieldStrategySource;
+import org.apache.tapestry5.NullFieldStrategy;
+import org.apache.tapestry5.services.NullFieldStrategySource;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ObjectComponentEventResultProcessor.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ObjectComponentEventResultProcessor.java
index 5368486..5672d6d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ObjectComponentEventResultProcessor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ObjectComponentEventResultProcessor.java
@@ -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.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
import java.io.IOException;
import java.util.Collection;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/OpaqueConstantTarget.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/OpaqueConstantTarget.java
index 6faf45a..33becac 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/OpaqueConstantTarget.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/OpaqueConstantTarget.java
@@ -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;
/**
* An invocation target that is specified as a path without further meaning.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageContentTypeAnalyzer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageContentTypeAnalyzer.java
index 1b9c044..5a3059b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageContentTypeAnalyzer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageContentTypeAnalyzer.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ContentType;
-import org.apache.tapestry.internal.structure.Page;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.internal.structure.Page;
public interface PageContentTypeAnalyzer
{
/**
- * Analyzes the meta-data for the page and identifies the correct {@link org.apache.tapestry.ContentType} (including
- * encoding).
+ * Analyzes the meta-data for the page and identifies the correct {@link org.apache.tapestry5.ContentType}
+ * (including encoding).
*
* @param page to be rendered
* @return the content type
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageContentTypeAnalyzerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageContentTypeAnalyzerImpl.java
index 9a50771..7b73391 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageContentTypeAnalyzerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageContentTypeAnalyzerImpl.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ContentType;
-import org.apache.tapestry.MetaDataConstants;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.services.MetaDataLocator;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.MetaDataConstants;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.services.MetaDataLocator;
public class PageContentTypeAnalyzerImpl implements PageContentTypeAnalyzer
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageElementFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageElementFactory.java
index fd99891..fc8bee4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageElementFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageElementFactory.java
@@ -12,23 +12,23 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.internal.parser.AttributeToken;
-import org.apache.tapestry.internal.parser.ExpansionToken;
-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.ioc.Location;
-import org.apache.tapestry.services.BindingSource;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.internal.parser.AttributeToken;
+import org.apache.tapestry5.internal.parser.ExpansionToken;
+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.ioc.Location;
+import org.apache.tapestry5.services.BindingSource;
import java.util.Locale;
/**
- * Used by the {@link org.apache.tapestry.internal.services.PageLoader} to create page elements
+ * Used by the {@link org.apache.tapestry5.internal.services.PageLoader} to create page elements
*/
public interface PageElementFactory
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageElementFactoryImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageElementFactoryImpl.java
index 06e20c7..942da47 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageElementFactoryImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageElementFactoryImpl.java
@@ -12,24 +12,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.internal.parser.AttributeToken;
-import org.apache.tapestry.internal.parser.ExpansionToken;
-import org.apache.tapestry.internal.structure.*;
-import org.apache.tapestry.ioc.Location;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-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.runtime.RenderQueue;
-import org.apache.tapestry.services.BindingSource;
-import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.internal.parser.AttributeToken;
+import org.apache.tapestry5.internal.parser.ExpansionToken;
+import org.apache.tapestry5.internal.structure.*;
+import org.apache.tapestry5.ioc.Location;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+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.runtime.RenderQueue;
+import org.apache.tapestry5.services.BindingSource;
+import org.apache.tapestry5.services.ComponentClassResolver;
import java.util.List;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLinkTarget.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLinkTarget.java
index 5325e4d..0da4672 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLinkTarget.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLinkTarget.java
@@ -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;
/**
* It represents a component invocation target for a page link. It is passed to an {@link
- * org.apache.tapestry.services.ComponentEventRequestHandler} by both the {@link org.apache.tapestry.test.PageTester}
- * and the real Tapestry code {@link org.apache.tapestry.internal.services.PageRenderDispatcher} in order to invoke a
+ * org.apache.tapestry5.services.ComponentEventRequestHandler} by both the {@link org.apache.tapestry5.test.PageTester}
+ * and the real Tapestry code {@link org.apache.tapestry5.internal.services.PageRenderDispatcher} in order to invoke a
* page link.
*/
public class PageLinkTarget implements InvocationTarget
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLoader.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLoader.java
index cddb3d1..8cb08ff 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLoader.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLoader.java
@@ -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.ComponentResourcesCommon;
-import org.apache.tapestry.internal.event.InvalidationEventHub;
-import org.apache.tapestry.internal.structure.Page;
+import org.apache.tapestry5.ComponentResourcesCommon;
+import org.apache.tapestry5.internal.event.InvalidationEventHub;
+import org.apache.tapestry5.internal.structure.Page;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLoaderImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLoaderImpl.java
index 71ffee2..2ff79e3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLoaderImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLoaderImpl.java
@@ -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.event.InvalidationEventHubImpl;
-import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry5.internal.event.InvalidationEventHubImpl;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.services.ComponentClassResolver;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLoaderProcessor.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLoaderProcessor.java
index c926e4a..bf74c02 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLoaderProcessor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLoaderProcessor.java
@@ -12,29 +12,29 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.internal.bindings.LiteralBinding;
-import org.apache.tapestry.internal.parser.*;
-import org.apache.tapestry.internal.structure.*;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.internal.util.IdAllocator;
-import static org.apache.tapestry.ioc.internal.util.InternalUtils.isBlank;
-import static org.apache.tapestry.ioc.internal.util.InternalUtils.isNonBlank;
-import org.apache.tapestry.ioc.internal.util.OneShotLock;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.ioc.util.Stack;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.EmbeddedComponentModel;
-import org.apache.tapestry.runtime.RenderQueue;
-import org.apache.tapestry.services.BindingSource;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.internal.bindings.LiteralBinding;
+import org.apache.tapestry5.internal.parser.*;
+import org.apache.tapestry5.internal.structure.*;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.internal.util.IdAllocator;
+import static org.apache.tapestry5.ioc.internal.util.InternalUtils.isBlank;
+import static org.apache.tapestry5.ioc.internal.util.InternalUtils.isNonBlank;
+import org.apache.tapestry5.ioc.internal.util.OneShotLock;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.ioc.util.Stack;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.EmbeddedComponentModel;
+import org.apache.tapestry5.runtime.RenderQueue;
+import org.apache.tapestry5.services.BindingSource;
import org.slf4j.Logger;
import java.util.List;
@@ -199,7 +199,7 @@
/**
* @param model embededded model defining the new component, from an {@link
- * org.apache.tapestry.annotation.Component} annotation
+ * org.apache.tapestry5.annotations.Component} annotation
* @param loadingComponent the currently loading container component
* @param newComponent the new child of the container whose parameters are being bound
* @param newComponentBindings map of bindings for the new component (used to handle inheriting of informal
@@ -732,7 +732,7 @@
/**
* Invoked when a component's end tag is reached, to check and process informal parameters as per the {@link
- * org.apache.tapestry.model.EmbeddedComponentModel#getInheritInformalParameters()} flag.
+ * org.apache.tapestry5.model.EmbeddedComponentModel#getInheritInformalParameters()} flag.
*
* @param loadingComponent the container component that was loaded
* @param model
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLocator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLocator.java
index ed8574e..b50ac70 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLocator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageLocator.java
@@ -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 java.util.Locale;
/**
- * Used as a key to lookup a page from the {@link org.apache.tapestry.internal.services.PagePool}.
+ * Used as a key to lookup a page from the {@link org.apache.tapestry5.internal.services.PagePool}.
*/
public class PageLocator
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageMarkupRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageMarkupRenderer.java
index fb2d09c..7f37381 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageMarkupRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageMarkupRenderer.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.internal.structure.Page;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.internal.structure.Page;
/**
* Service used to render page markup using a MarkupWriter. This is used when rendering a complete page as part of a
- * {@linkplain org.apache.tapestry.internal.services.PageRenderRequestHandlerImpl page render request},
+ * {@linkplain org.apache.tapestry5.internal.services.PageRenderRequestHandlerImpl page render request},
*/
public interface PageMarkupRenderer
{
/**
- * Initializes the rendering using the {@link org.apache.tapestry.services.MarkupRenderer} pipeline.
+ * Initializes the rendering using the {@link org.apache.tapestry5.services.MarkupRenderer} pipeline.
*
* @param page page to render
* @param writer receives the markup
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageMarkupRendererImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageMarkupRendererImpl.java
index 531f1c1..41a1ce4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageMarkupRendererImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageMarkupRendererImpl.java
@@ -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.MarkupWriter;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.services.MarkupRenderer;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.services.Environment;
+import org.apache.tapestry5.services.MarkupRenderer;
public class PageMarkupRendererImpl implements PageMarkupRenderer
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PagePool.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PagePool.java
index bd2d063..9756ac3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PagePool.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PagePool.java
@@ -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;
/**
* Provides access to pages, creating them as necessary, and pooling them between requests.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PagePoolCache.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PagePoolCache.java
index 63e30ce..893c23c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PagePoolCache.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PagePoolCache.java
@@ -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.structure.Page;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.LinkedList;
import java.util.ListIterator;
@@ -26,7 +26,7 @@
import java.util.concurrent.locks.ReentrantLock;
/**
- * Used by {@link org.apache.tapestry.internal.services.PagePoolImpl} to maintain a cache of available and in-use page
+ * Used by {@link org.apache.tapestry5.internal.services.PagePoolImpl} to maintain a cache of available and in-use page
* instances.
* <p/>
* This code is designed to handle high volume sites and deal with request fluctuations.
@@ -79,7 +79,7 @@
/**
* Tracks the usage of a page instance, allowing a last access property to be associated with the page. CachedPage
- * instances are only accessed from within a {@link org.apache.tapestry.internal.services.PagePoolCache}, which
+ * instances are only accessed from within a {@link org.apache.tapestry5.internal.services.PagePoolCache}, which
* handles synchronization concerns.
* <p/>
* An earlier version of this code used <em>soft references</em>, but those seem to be problematic (the test suite
@@ -226,7 +226,7 @@
/**
* Finds and returns the first available page.
* <p/>
- * Side effect: removes the {@link org.apache.tapestry.internal.services.PagePoolCache.CachedPage} from the
+ * Side effect: removes the {@link org.apache.tapestry5.internal.services.PagePoolCache.CachedPage} from the
* available list and moves it to the in use list.
*
* @return the page, if any found, or null if no page is available
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PagePoolImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PagePoolImpl.java
index f1248ec..c0eb2d0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PagePoolImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PagePoolImpl.java
@@ -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.events.InvalidationListener;
-import org.apache.tapestry.internal.events.UpdateListener;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.ioc.annotation.IntermediateType;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.ThreadLocale;
-import org.apache.tapestry.ioc.util.TimeInterval;
-import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.internal.events.UpdateListener;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.ioc.annotations.IntermediateType;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.ThreadLocale;
+import org.apache.tapestry5.ioc.util.TimeInterval;
+import org.apache.tapestry5.services.ComponentClassResolver;
import org.slf4j.Logger;
import java.util.Locale;
@@ -43,10 +43,10 @@
* A <em>hard limit</em> on the number of page instances is enforced. This number may not be exceeded. Requesting a page
* instance when at the hard limit will result in a runtime exception.
* <p/>
- * As an {@link org.apache.tapestry.internal.events.UpdateListener}, the service will reduce the size of each page's
+ * As an {@link org.apache.tapestry5.internal.events.UpdateListener}, the service will reduce the size of each page's
* pool by eliminating pages that haven't been used recently.
*
- * @see org.apache.tapestry.internal.services.PagePoolCache
+ * @see org.apache.tapestry5.internal.services.PagePoolCache
*/
public class PagePoolImpl implements PagePool, InvalidationListener, UpdateListener
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java
index b46274d..db2c39f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderDispatcher.java
@@ -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.EventContext;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.internal.URLEventContext;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.internal.URLEventContext;
+import org.apache.tapestry5.services.*;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueue.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueue.java
index 3cc4be2..213f539 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueue.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueue.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.runtime.RenderCommand;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.internal.structure.Page;
import org.apache.tapestry5.json.JSONObject;
+import org.apache.tapestry5.runtime.RenderCommand;
/**
- * A wrapper around {@link org.apache.tapestry.runtime.RenderQueue}, but referencable as a (per-thread) service. This
+ * A wrapper around {@link org.apache.tapestry5.runtime.RenderQueue}, but referencable as a (per-thread) service. This
* service is scoped so that we can tell it what to render in one method, then have it do the render in another. Part of
* an elaborate scheme to keep certain interfaces public and other closely related ones private.
*/
@@ -48,7 +48,7 @@
void initializeForPartialPageRender(RenderCommand rootCommand);
/**
- * Obtains the value previously supplied to {@link #initializeForPartialPageRender(org.apache.tapestry.runtime.RenderCommand)}.
+ * Obtains the value previously supplied to {@link #initializeForPartialPageRender(org.apache.tapestry5.runtime.RenderCommand)}.
* This allows the "natural" renderer to be substituted or otherwise manipulated.
*
* @return the root renderer
@@ -56,7 +56,7 @@
RenderCommand getRootRenderCommand();
/**
- * Returns true if {@link #initializeForPartialPageRender(org.apache.tapestry.runtime.RenderCommand)} has been
+ * Returns true if {@link #initializeForPartialPageRender(org.apache.tapestry5.runtime.RenderCommand)} has been
* invoked.
*/
boolean isPartialRenderInitialized();
@@ -69,7 +69,7 @@
void render(MarkupWriter writer);
/**
- * Performs a partial markup render, as configured via {@link #initializeForPartialPageRender(org.apache.tapestry.runtime.RenderCommand)}.
+ * Performs a partial markup render, as configured via {@link #initializeForPartialPageRender(org.apache.tapestry5.runtime.RenderCommand)}.
*
* @param writer to which markup should be written
* @param reply JSONObject which will contain the partial response
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueueImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueueImpl.java
index 8e135ca..a93a7b8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueueImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderQueueImpl.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.internal.structure.Page;
-import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.runtime.RenderCommand;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.internal.structure.Page;
+import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.ioc.internal.util.Defense;
import org.apache.tapestry5.json.JSONObject;
+import org.apache.tapestry5.runtime.RenderCommand;
/**
* This services keeps track of the page being rendered and the root command for the partial render, it is therefore
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderRequestHandlerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderRequestHandlerImpl.java
index 4a1ede0..df3759b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderRequestHandlerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageRenderRequestHandlerImpl.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.EventConstants;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
-import org.apache.tapestry.services.PageRenderRequestHandler;
-import org.apache.tapestry.services.PageRenderRequestParameters;
-import org.apache.tapestry.services.Traditional;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.services.PageRenderRequestHandler;
+import org.apache.tapestry5.services.PageRenderRequestParameters;
+import org.apache.tapestry5.services.Traditional;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRenderer.java
index 70b25de..62b5282 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRenderer.java
@@ -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;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java
index e997fb8..b2058b4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageResponseRendererImpl.java
@@ -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.ContentType;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.services.MarkupWriterFactory;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.services.MarkupWriterFactory;
+import org.apache.tapestry5.services.Response;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageTemplateLocator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageTemplateLocator.java
index 8b556fd..4e61c75 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageTemplateLocator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageTemplateLocator.java
@@ -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.ioc.Resource;
-import org.apache.tapestry.model.ComponentModel;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.model.ComponentModel;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageTemplateLocatorImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageTemplateLocatorImpl.java
index 7822cf0..e6880c7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageTemplateLocatorImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PageTemplateLocatorImpl.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.services.ComponentClassResolver;
import static java.lang.String.format;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldBundleImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldBundleImpl.java
index 9a7401f..7836b22 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldBundleImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldBundleImpl.java
@@ -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.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.PersistentFieldBundle;
-import org.apache.tapestry.services.PersistentFieldChange;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.PersistentFieldBundle;
+import org.apache.tapestry5.services.PersistentFieldChange;
import java.util.Collection;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldChangeImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldChangeImpl.java
index ab3f9cb..55db306 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldChangeImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldChangeImpl.java
@@ -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 static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.services.PersistentFieldChange;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.services.PersistentFieldChange;
public class PersistentFieldChangeImpl implements PersistentFieldChange
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldManager.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldManager.java
index 44026fd..4d67ed4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldManager.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldManager.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.services.PersistentFieldBundle;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.services.PersistentFieldBundle;
/**
- * Handle persistent property changes. Primarily, delegates to a number of {@link org.apache.tapestry.services.PersistentFieldStrategy}
+ * Handle persistent property changes. Primarily, delegates to a number of {@link org.apache.tapestry5.services.PersistentFieldStrategy}
* instances.
*
- * @see org.apache.tapestry.services.TapestryModule#contributePersistentFieldManager(org.apache.tapestry.ioc.MappedConfiguration,
- * org.apache.tapestry.services.Request , org.apache.tapestry.services.PersistentFieldStrategy)
+ * @see org.apache.tapestry5.services.TapestryModule#contributePersistentFieldManager(org.apache.tapestry5.ioc.MappedConfiguration,
+ * org.apache.tapestry5.services.Request , org.apache.tapestry5.services.PersistentFieldStrategy)
*/
public interface PersistentFieldManager
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImpl.java
index 8eff5fd..c521ad5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImpl.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.MetaDataLocator;
-import org.apache.tapestry.services.PersistentFieldBundle;
-import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.PersistentFieldStrategy;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.services.MetaDataLocator;
+import org.apache.tapestry5.services.PersistentFieldBundle;
+import org.apache.tapestry5.services.PersistentFieldChange;
+import org.apache.tapestry5.services.PersistentFieldStrategy;
import java.util.Collection;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentLocaleImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentLocaleImpl.java
index 68e5193..ce7bfc4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentLocaleImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PersistentLocaleImpl.java
@@ -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.services.Cookies;
-import org.apache.tapestry.services.PersistentLocale;
+import org.apache.tapestry5.services.Cookies;
+import org.apache.tapestry5.services.PersistentLocale;
import java.util.Locale;
@@ -24,7 +24,7 @@
/**
* Name of the cookie written to the client web browser to identify the locale.
*/
- private static final String LOCALE_COOKIE_NAME = "org.apache.tapestry.locale";
+ private static final String LOCALE_COOKIE_NAME = "org.apache.tapestry5.locale";
private final Cookies cookieSource;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java
index fdb9c09..464be0d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImpl.java
@@ -12,20 +12,20 @@
// 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.PropertyConduit;
-import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.internal.util.MultiKey;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.GenericsUtils;
-import org.apache.tapestry.ioc.services.*;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.services.ComponentLayer;
-import org.apache.tapestry.services.PropertyConduitSource;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.internal.util.MultiKey;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newConcurrentMap;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.GenericsUtils;
+import org.apache.tapestry5.ioc.services.*;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.services.ComponentLayer;
+import org.apache.tapestry5.services.PropertyConduitSource;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderCommandComponentEventResultProcessor.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderCommandComponentEventResultProcessor.java
index 78a86c6..1e573a8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderCommandComponentEventResultProcessor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderCommandComponentEventResultProcessor.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.runtime.RenderCommand;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.runtime.RenderCommand;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
import java.io.IOException;
/**
- * Processor for objects that implement {@link RenderCommand} (such as {@link org.apache.tapestry.internal.structure.BlockImpl}).
+ * Processor for objects that implement {@link RenderCommand} (such as {@link org.apache.tapestry5.internal.structure.BlockImpl}).
*
* @see AjaxPartialResponseRenderer#renderPartialPageMarkup()
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueException.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueException.java
index 9a7e826..71fa8e5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueException.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueException.java
@@ -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.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
/**
* Exception used when rendering, to capture the stack of active components (for propery reporting in the exception
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueImpl.java
index 4056f95..b870d7c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderQueueImpl.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.util.Stack;
-import org.apache.tapestry.runtime.RenderCommand;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.util.Stack;
+import org.apache.tapestry5.runtime.RenderCommand;
+import org.apache.tapestry5.runtime.RenderQueue;
import org.slf4j.Logger;
public class RenderQueueImpl implements RenderQueue
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java
index 403b776..c885de9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RenderSupportImpl.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.IdAllocator;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.services.AssetSource;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.IdAllocator;
+import org.apache.tapestry5.ioc.services.SymbolSource;
import org.apache.tapestry5.json.JSONArray;
import org.apache.tapestry5.json.JSONObject;
+import org.apache.tapestry5.services.AssetSource;
import static java.lang.String.format;
import java.util.Arrays;
@@ -49,7 +49,7 @@
* @param linker Used to assemble JavaScript includes and snippets
* @param symbolSource Used to example symbols (in {@linkplain #addClasspathScriptLink(String...) in classpath
* scripts)
- * @param assetSource Used to convert classpath scripts to {@link org.apache.tapestry.Asset}s
+ * @param assetSource Used to convert classpath scripts to {@link org.apache.tapestry5.Asset}s
* @param coreScripts core scripts (evaluated as classpaths scripts) that are added to any page that includes a
* script link or script block
*/
@@ -63,7 +63,7 @@
* @param linker Used to assemble JavaScript includes and snippets
* @param symbolSource Used to example symbols (in {@linkplain #addClasspathScriptLink(String...) in classpath
* scripts)
- * @param assetSource Used to convert classpath scripts to {@link org.apache.tapestry.Asset}s
+ * @param assetSource Used to convert classpath scripts to {@link org.apache.tapestry5.Asset}s
* @param idAllocator Used to allocate unique client ids during the render
* @param coreScripts core scripts (evaluated as classpaths scripts) that are added to any page that includes a
* script link or script block
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestConstants.java
index 0bdbd54..a6f7e0b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestConstants.java
@@ -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;
/**
* Constants used when processing requests from the client web browser.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestEncodingInitializer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestEncodingInitializer.java
index 50a00e0..f53d996 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestEncodingInitializer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestEncodingInitializer.java
@@ -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;
/**
* Determines the reuest encoding for the given page and applies that to the request, so that parameters may be properly
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestEncodingInitializerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestEncodingInitializerImpl.java
index 6e0ebdc..f6e6679 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestEncodingInitializerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestEncodingInitializerImpl.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ContentType;
-import org.apache.tapestry.MetaDataConstants;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.services.MetaDataLocator;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.MetaDataConstants;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.services.MetaDataLocator;
+import org.apache.tapestry5.services.Request;
public class RequestEncodingInitializerImpl implements RequestEncodingInitializer
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestErrorFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestErrorFilter.java
index 784ab31..4346eb1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestErrorFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestErrorFilter.java
@@ -1,11 +1,12 @@
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.services.*;
import java.io.IOException;
/**
- * Filter for the {@link org.apache.tapestry.services.RequestHandler} pipeline used to intercept and report exceptions.
+ * Filter for the {@link org.apache.tapestry5.services.RequestHandler} pipeline used to intercept and report
+ * exceptions.
*/
public class RequestErrorFilter implements RequestFilter
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestGlobalsImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestGlobalsImpl.java
index e883d34..916b092 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestGlobalsImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestGlobalsImpl.java
@@ -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 static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.services.Request;
import org.apache.tapestry5.services.RequestGlobals;
+import org.apache.tapestry5.services.Response;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestImpl.java
index 52a5ed9..b70bd2e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestImpl.java
@@ -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.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Session;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Session;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
@@ -25,7 +25,7 @@
import java.util.Locale;
/**
- * Basic implementation of {@link org.apache.tapestry.services.Request} that wraps around an {@link
+ * Basic implementation of {@link org.apache.tapestry5.services.Request} that wraps around an {@link
* javax.servlet.http.HttpServletRequest}.
*/
public class RequestImpl implements Request
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCache.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCache.java
index d76b3d6..4b21e99 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCache.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCache.java
@@ -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.structure.Page;
+import org.apache.tapestry5.internal.structure.Page;
/**
* Per-thread service that caches page instances for the duration of the request, and is also responsible for tracking
* the active page (the page which will ultimately render the response).
* <p/>
* <p/>
- * Since {@link org.apache.tapestry.internal.structure.Page} is internal, most user-code should use the {@link
- * org.apache.tapestry.services.ComponentSource} service instead.
+ * Since {@link org.apache.tapestry5.internal.structure.Page} is internal, most user-code should use the {@link
+ * org.apache.tapestry5.services.ComponentSource} service instead.
*/
public interface RequestPageCache
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCacheImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCacheImpl.java
index c58f0eb..8403da1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCacheImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPageCacheImpl.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.ThreadCleanupListener;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.ThreadCleanupListener;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPathOptimizer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPathOptimizer.java
index 831c910..64262b1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPathOptimizer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPathOptimizer.java
@@ -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;
/**
* Used to optimize a path for inclusion in the rendered output of the page. When using lots of libraries, nested
@@ -20,15 +20,15 @@
* URL. Of course, you need to make sure that's turned off inside an Ajax request since the base URL of the client it
* totally unknown in that situation.
*
- * @see org.apache.tapestry.SymbolConstants#FORCE_ABSOLUTE_URIS
+ * @see org.apache.tapestry5.SymbolConstants#FORCE_ABSOLUTE_URIS
*/
public interface RequestPathOptimizer
{
/**
* Optimizes the provided path, returning a new path that is shorter but (combined with the current requests' base
* URL) will result in the same request URI. In many cases, this will return the provided path unchanged. During
- * {@linkplain org.apache.tapestry.services.Request#isXHR() XHR} requests, this will always return the provided path
- * (no optimization takes place, since the base URI of the client is unknown).
+ * {@linkplain org.apache.tapestry5.services.Request#isXHR() XHR} requests, this will always return the provided
+ * path (no optimization takes place, since the base URI of the client is unknown).
*
* @param path to be optimized
* @return the same path, or a new path that is equivalent, relative to the current request's URL
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImpl.java
index 1b2f555..98017dd 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImpl.java
@@ -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.SymbolConstants;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.services.Request;
import java.util.regex.Pattern;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestSecurityManager.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestSecurityManager.java
index effa027..4205c52 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestSecurityManager.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestSecurityManager.java
@@ -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;
@@ -22,7 +22,7 @@
* Used to manage the relationship between the security of a request and the security of a page. By secure, we mean
* whether a request uses HTTPS and whether a page demands the use of HTTPS.
*
- * @see org.apache.tapestry.services.Request#isSecure()
+ * @see org.apache.tapestry5.services.Request#isSecure()
*/
public interface RequestSecurityManager
{
@@ -42,7 +42,7 @@
*
* @param page for the security check
* @return a base URL when switching security levels, or null if the page's security matches the request security
- * @see org.apache.tapestry.services.BaseURLSource#getBaseURL(boolean)
+ * @see org.apache.tapestry5.services.BaseURLSource#getBaseURL(boolean)
*/
String getBaseURL(Page page);
}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImpl.java
index 22183b9..94225e7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImpl.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.MetaDataConstants;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.services.BaseURLSource;
-import org.apache.tapestry.services.MetaDataLocator;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.MetaDataConstants;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.services.BaseURLSource;
+import org.apache.tapestry5.services.MetaDataLocator;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Response;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceCache.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceCache.java
index cf43fd2..5872455 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceCache.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceCache.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.event.InvalidationEventHub;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.services.ResourceDigestGenerator;
+import org.apache.tapestry5.internal.event.InvalidationEventHub;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.services.ResourceDigestGenerator;
/**
* Caches information about resources on the classpath. In addition, acts as an invalidation hub for any resources for
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceCacheImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceCacheImpl.java
index cc39fba..24c3143 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceCacheImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceCacheImpl.java
@@ -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.event.InvalidationEventHubImpl;
-import org.apache.tapestry.internal.events.UpdateListener;
-import org.apache.tapestry.internal.util.URLChangeTracker;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.ResourceDigestGenerator;
+import org.apache.tapestry5.internal.event.InvalidationEventHubImpl;
+import org.apache.tapestry5.internal.events.UpdateListener;
+import org.apache.tapestry5.internal.util.URLChangeTracker;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.ResourceDigestGenerator;
import java.net.URL;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestGeneratorImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestGeneratorImpl.java
index 118698b..36e6907 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestGeneratorImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceDigestGeneratorImpl.java
@@ -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.commons.codec.binary.Hex;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.ResourceDigestGenerator;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.ResourceDigestGenerator;
import java.io.BufferedInputStream;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamer.java
index cb34acc..93b0ca8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamer.java
@@ -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.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java
index 8ab5d1a..a158c67 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResourceStreamerImpl.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.util.TimeInterval;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.util.TimeInterval;
+import org.apache.tapestry5.services.Response;
import java.io.BufferedInputStream;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseImpl.java
index 5c85483..3ef6b5e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseImpl.java
@@ -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.Link;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry5.services.Response;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseRenderer.java
index 693be63..0e5164d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseRenderer.java
@@ -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.ContentType;
+import org.apache.tapestry5.ContentType;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseRendererImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseRendererImpl.java
index a472e60..525bb8f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseRendererImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ResponseRendererImpl.java
@@ -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.ContentType;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.runtime.Component;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.runtime.Component;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RootPathDispatcher.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RootPathDispatcher.java
index 834fdaa..4331328 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RootPathDispatcher.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/RootPathDispatcher.java
@@ -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.EventContext;
-import org.apache.tapestry.internal.EmptyEventContext;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.internal.EmptyEventContext;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.services.*;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceAnnotationObjectProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceAnnotationObjectProvider.java
index b8b5e9f..da0b26f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceAnnotationObjectProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceAnnotationObjectProvider.java
@@ -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.annotation.Service;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
+import org.apache.tapestry5.annotations.Service;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
/**
* Adds support for the {@link Service} annotation (which can be applied to fields or parameters), which is used to
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceInjectionProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceInjectionProvider.java
index c9eeed8..9d5b013 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceInjectionProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServiceInjectionProvider.java
@@ -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.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.InjectionProvider;
+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.InjectionProvider;
/**
* A very late worker related to the {@link Inject} annotation that, when all other forms of injection have failed,
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServicesMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServicesMessages.java
index 74c4f62..731de65 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServicesMessages.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ServicesMessages.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import javassist.CtClass;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.RenderCommand;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.RenderCommand;
+import org.apache.tapestry5.services.TransformMethodSignature;
import java.util.Collection;
import java.util.List;
@@ -359,7 +359,7 @@
return MESSAGES.format("resource-access-forbidden", URI);
}
- static String noMarkupFromPageRender(org.apache.tapestry.internal.structure.Page page)
+ static String noMarkupFromPageRender(org.apache.tapestry5.internal.structure.Page page)
{
return MESSAGES.format("no-markup-from-page-render", page.getLogicalName());
}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategy.java
index 0ff4a7f..bb1f120 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategy.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategy.java
@@ -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.services.ApplicationStateCreator;
-import org.apache.tapestry.services.ApplicationStatePersistenceStrategy;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Session;
+import org.apache.tapestry5.services.ApplicationStateCreator;
+import org.apache.tapestry5.services.ApplicationStatePersistenceStrategy;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Session;
/**
* Stores ASOs in the {@link Session}, which will be created as necessary.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionImpl.java
index a9d0866..af6c8a3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionImpl.java
@@ -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 static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.Session;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.Session;
import javax.servlet.http.HttpSession;
import java.util.Collections;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionPersistentFieldStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionPersistentFieldStrategy.java
index 11982cf..3de9108 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionPersistentFieldStrategy.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/SessionPersistentFieldStrategy.java
@@ -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.services.Request;
-import org.apache.tapestry.services.Session;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Session;
/**
* A strategy for storing persistent page properties into the {@link Session session}.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StaticFilesFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StaticFilesFilter.java
index 97d4896..a7f0b8d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StaticFilesFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StaticFilesFilter.java
@@ -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.InternalConstants;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.services.*;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StreamResponseResultProcessor.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StreamResponseResultProcessor.java
index 294adf8..eeadd24 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StreamResponseResultProcessor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StreamResponseResultProcessor.java
@@ -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.StreamResponse;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.StreamResponse;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.services.Response;
import java.io.BufferedInputStream;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StringProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StringProvider.java
index 5d1bcac..e15340f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StringProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StringProvider.java
@@ -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;
/**
* Interface used when assembling an attribute value that contains expansions.
@@ -24,4 +24,4 @@
* aggregating together multiple StringProviders.
*/
String provideString();
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StringResultProcessor.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StringResultProcessor.java
index 0c43b3a..f24b682 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StringResultProcessor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StringResultProcessor.java
@@ -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.structure.Page;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StringValueEncoder.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StringValueEncoder.java
index 7ccdabf..dbb9a11 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StringValueEncoder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/StringValueEncoder.java
@@ -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.ValueEncoder;
+import org.apache.tapestry5.ValueEncoder;
/**
* Passes the string value from the server to the client and vice-versa without any translation.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TemplateParser.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TemplateParser.java
index 7125fb2..3908a93 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TemplateParser.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TemplateParser.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.parser.ComponentTemplate;
-import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry5.internal.parser.ComponentTemplate;
+import org.apache.tapestry5.ioc.Resource;
/**
- * Parses a resource into a {@link org.apache.tapestry.internal.parser.ComponentTemplate}.
+ * Parses a resource into a {@link org.apache.tapestry5.internal.parser.ComponentTemplate}.
*
* @see PageLoader
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TemplateParserImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TemplateParserImpl.java
index 1a68b91..eb5b187 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TemplateParserImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TemplateParserImpl.java
@@ -12,21 +12,21 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.SymbolConstants;
-import org.apache.tapestry.internal.parser.*;
-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.annotation.Symbol;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.LocationImpl;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.ioc.util.Stack;
+import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.internal.parser.*;
+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.annotations.Symbol;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.LocationImpl;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.ioc.util.Stack;
import org.slf4j.Logger;
import org.xml.sax.*;
import org.xml.sax.ext.LexicalHandler;
@@ -97,8 +97,8 @@
/**
* Because {@link org.xml.sax.ContentHandler#startPrefixMapping(String, String)} events arrive before the
* corresponding {@link org.xml.sax.ContentHandler#startElement(String, String, String, org.xml.sax.Attributes)}
- * events, we need to accumlate the {@link org.apache.tapestry.internal.parser.DefineNamespacePrefixToken}s ahead of
- * time to get the correct ordering in the output tokens list.
+ * events, we need to accumlate the {@link org.apache.tapestry5.internal.parser.DefineNamespacePrefixToken}s ahead
+ * of time to get the correct ordering in the output tokens list.
*/
private final List<DefineNamespacePrefixToken> defineNamespaceTokens = newList();
@@ -297,8 +297,8 @@
* Scans the text, using a regular expression pattern, for expansion patterns, and adds appropriate tokens for what
* it finds.
*
- * @param text to add as {@link org.apache.tapestry.internal.parser.TextToken}s and {@link
- * org.apache.tapestry.internal.parser.ExpansionToken}s
+ * @param text to add as {@link org.apache.tapestry5.internal.parser.TextToken}s and {@link
+ * org.apache.tapestry5.internal.parser.ExpansionToken}s
*/
private void addTokensForText(String text)
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TransformationException.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TransformationException.java
index 4fe6f75..ea3be56 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TransformationException.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TransformationException.java
@@ -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.ioc.internal.util.TapestryException;
-import org.apache.tapestry.services.ClassTransformation;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.services.ClassTransformation;
/**
* Exception thrown when there is a failure transforming a class, or instantiating a transformed class. The cause may be
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TranslatorSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TranslatorSourceImpl.java
index 5ceb654..f6354f1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TranslatorSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TranslatorSourceImpl.java
@@ -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.internal.events.InvalidationListener;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.util.StrategyRegistry;
-import org.apache.tapestry.services.TranslatorSource;
+import org.apache.tapestry5.Translator;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.util.StrategyRegistry;
+import org.apache.tapestry5.services.TranslatorSource;
import java.util.List;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TypeCoercedValueEncoderFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TypeCoercedValueEncoderFactory.java
index 800f29c..bee075d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TypeCoercedValueEncoderFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/TypeCoercedValueEncoderFactory.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ValueEncoder;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.services.ValueEncoderFactory;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.services.ValueEncoderFactory;
/**
- * Provides {@link org.apache.tapestry.ValueEncoder} instances that are backed by the {@link
- * org.apache.tapestry.ioc.services.TypeCoercer} service.
+ * Provides {@link org.apache.tapestry5.ValueEncoder} instances that are backed by the {@link
+ * org.apache.tapestry5.ioc.services.TypeCoercer} service.
*/
public class TypeCoercedValueEncoderFactory implements ValueEncoderFactory<Object>
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UpdateListenerHub.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UpdateListenerHub.java
index b4655e1..a340586 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UpdateListenerHub.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UpdateListenerHub.java
@@ -12,19 +12,19 @@
// 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.tapestry5.internal.events.UpdateListener;
/**
- * Manages a set of {@link org.apache.tapestry.internal.events.UpdateListener}s. Periodically (say, every request during
- * development, or every minute or so during production), request processing is locked down so that only a single thread
- * is active, and the active thread invokes {@link #fireUpdateEvent()}. Various services that are dependent on external
- * resource files (such as classes or template files) can check to see if any file they've used has changed. If so, the
- * service can invalidate its internal cache, or notify other services (typically via {@link
- * org.apache.tapestry.internal.events.InvalidationListener} that they should do the same.
+ * Manages a set of {@link org.apache.tapestry5.internal.events.UpdateListener}s. Periodically (say, every request
+ * during development, or every minute or so during production), request processing is locked down so that only a single
+ * thread is active, and the active thread invokes {@link #fireUpdateEvent()}. Various services that are dependent on
+ * external resource files (such as classes or template files) can check to see if any file they've used has changed. If
+ * so, the service can invalidate its internal cache, or notify other services (typically via {@link
+ * org.apache.tapestry5.internal.events.InvalidationListener} that they should do the same.
*
- * @see org.apache.tapestry.internal.util.URLChangeTracker
+ * @see org.apache.tapestry5.internal.util.URLChangeTracker
*/
public interface UpdateListenerHub
{
@@ -33,7 +33,7 @@
/**
* Invoked periodically to allow services to check if underlying state has changed. For example, a template file may
* have changed. Listeners will typically notify applicable listeners of their own (they usually implement {@link
- * org.apache.tapestry.internal.event.InvalidationEventHub}) when such a change occurs.
+ * org.apache.tapestry5.internal.event.InvalidationEventHub}) when such a change occurs.
*/
void fireUpdateEvent();
}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UpdateListenerHubImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UpdateListenerHubImpl.java
index 8ca275b..9b2e343 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UpdateListenerHubImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/UpdateListenerHubImpl.java
@@ -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.internal.util.CollectionFactory;
+import org.apache.tapestry5.internal.events.UpdateListener;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidationConstraintGeneratorImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidationConstraintGeneratorImpl.java
index 47ab6bd..9a1f8e4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidationConstraintGeneratorImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidationConstraintGeneratorImpl.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.services.ValidationConstraintGenerator;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.services.ValidationConstraintGenerator;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidationMessagesSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidationMessagesSourceImpl.java
index 4ccbef8..da80f79 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidationMessagesSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidationMessagesSourceImpl.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.events.UpdateListener;
-import org.apache.tapestry.internal.util.URLChangeTracker;
-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.CollectionFactory;
-import org.apache.tapestry.services.ValidationMessagesSource;
+import org.apache.tapestry5.internal.events.UpdateListener;
+import org.apache.tapestry5.internal.util.URLChangeTracker;
+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.CollectionFactory;
+import org.apache.tapestry5.services.ValidationMessagesSource;
import java.util.Collection;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidatorSpecification.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidatorSpecification.java
index fcab6b6..72d10ba 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidatorSpecification.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValidatorSpecification.java
@@ -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.TapestryInternalUtils;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
/**
* Validator type and constraint values parsed from a validator specification.
@@ -63,4 +63,4 @@
return TapestryInternalUtils.isEqual(constraintValue, ov.constraintValue);
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValueEncoderSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValueEncoderSourceImpl.java
index fa8f333..0610814 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValueEncoderSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ValueEncoderSourceImpl.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ValueEncoder;
-import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.util.StrategyRegistry;
-import org.apache.tapestry.services.ValueEncoderFactory;
-import org.apache.tapestry.services.ValueEncoderSource;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.util.StrategyRegistry;
+import org.apache.tapestry5.services.ValueEncoderFactory;
+import org.apache.tapestry5.services.ValueEncoderSource;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/BlockImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/BlockImpl.java
index ea16a40..fbfa48d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/BlockImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/BlockImpl.java
@@ -12,15 +12,15 @@
// 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.Block;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ioc.BaseLocatable;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.runtime.RenderCommand;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ioc.BaseLocatable;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.runtime.RenderCommand;
+import org.apache.tapestry5.runtime.RenderQueue;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/BodyPageElement.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/BodyPageElement.java
index 1582cad..c268db7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/BodyPageElement.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/BodyPageElement.java
@@ -12,9 +12,9 @@
// 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.services.PageLoader;
+import org.apache.tapestry5.internal.services.PageLoader;
/**
* A type of {@link PageElement} that has a body that can be added to. This is part of the constuction phase that is
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/CommentPageElement.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/CommentPageElement.java
index d75933e..d58b531 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/CommentPageElement.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/CommentPageElement.java
@@ -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.parser.CommentToken;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.internal.parser.CommentToken;
+import org.apache.tapestry5.runtime.RenderQueue;
/**
* Renders a text comment.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentCallback.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentCallback.java
index 84439fb..f559d29 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentCallback.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentCallback.java
@@ -12,9 +12,9 @@
// 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.runtime.Component;
+import org.apache.tapestry5.runtime.Component;
/**
* Callback interface, used when invoking lifecycle methods on components.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElement.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElement.java
index db2105d..6002d29 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElement.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElement.java
@@ -12,23 +12,23 @@
// 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.Block;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ComponentResourcesCommon;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.InternalComponentResourcesCommon;
-import org.apache.tapestry.internal.services.Instantiator;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.model.ParameterModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.ComponentEvent;
-import org.apache.tapestry.runtime.PageLifecycleListener;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ComponentResourcesCommon;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.InternalComponentResourcesCommon;
+import org.apache.tapestry5.internal.services.Instantiator;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.model.ParameterModel;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.ComponentEvent;
+import org.apache.tapestry5.runtime.PageLifecycleListener;
+import org.apache.tapestry5.runtime.RenderQueue;
/**
- * Extended version of {@link org.apache.tapestry.internal.structure.PageElement} for elements that are, in fact,
+ * Extended version of {@link org.apache.tapestry5.internal.structure.PageElement} for elements that are, in fact,
* components (rather than just static markup).
*/
public interface ComponentPageElement extends ComponentResourcesCommon, InternalComponentResourcesCommon, PageElement, BodyPageElement, PageLifecycleListener
@@ -92,7 +92,7 @@
ComponentPageElement getEmbeddedElement(String id);
/**
- * Returns the {@link org.apache.tapestry.ComponentResources} for a mixin attached to this component element. Mixin
+ * Returns the {@link org.apache.tapestry5.ComponentResources} for a mixin attached to this component element. Mixin
* ids are the simple names of the mixin class.
*
* @param mixinId the mixin id (case insensitive)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
index baaaeda..9ed661b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ComponentPageElementImpl.java
@@ -12,45 +12,45 @@
// 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.*;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.internal.services.ComponentEventImpl;
-import org.apache.tapestry.internal.services.EventImpl;
-import org.apache.tapestry.internal.services.Instantiator;
-import org.apache.tapestry.internal.util.NotificationEventCallback;
-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.Defense;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.ParameterModel;
-import org.apache.tapestry.runtime.*;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.internal.services.ComponentEventImpl;
+import org.apache.tapestry5.internal.services.EventImpl;
+import org.apache.tapestry5.internal.services.Instantiator;
+import org.apache.tapestry5.internal.util.NotificationEventCallback;
+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.Defense;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.ParameterModel;
+import org.apache.tapestry5.runtime.*;
import org.slf4j.Logger;
import java.util.*;
/**
- * Implements {@link org.apache.tapestry.internal.structure.PageElement} and represents a component within an overall
+ * Implements {@link org.apache.tapestry5.internal.structure.PageElement} and represents a component within an overall
* page. Much of a component page element's behavior is delegated to user code, via a {@link
- * org.apache.tapestry.runtime.Component} instance.
+ * org.apache.tapestry5.runtime.Component} instance.
* <p/>
* Once instantiated, a ComponentPageElement should be registered as a {@linkplain
- * org.apache.tapestry.internal.structure.Page#addLifecycleListener(org.apache.tapestry.runtime.PageLifecycleListener)
+ * org.apache.tapestry5.internal.structure.Page#addLifecycleListener(org.apache.tapestry5.runtime.PageLifecycleListener)
* lifecycle listener}. This could be done inside the constructors, but that tends to complicate unit tests, so its done
- * by {@link org.apache.tapestry.internal.services.PageElementFactoryImpl}.
+ * by {@link org.apache.tapestry5.internal.services.PageElementFactoryImpl}.
* <p/>
*/
public class ComponentPageElementImpl extends BaseLocatable implements ComponentPageElement, PageLifecycleListener
{
/**
- * @see #render(org.apache.tapestry.MarkupWriter, org.apache.tapestry.runtime.RenderQueue)
+ * @see #render(org.apache.tapestry5.MarkupWriter, org.apache.tapestry5.runtime.RenderQueue)
*/
private static final RenderCommand POP_COMPONENT_ID = new RenderCommand()
{
@@ -450,7 +450,7 @@
/**
* Used to detect mismatches calls to {@link MarkupWriter#element(String, Object[])} } and {@link
- * org.apache.tapestry.MarkupWriter#end()}. The expectation is that any element(s) begun by this component during
+ * org.apache.tapestry5.MarkupWriter#end()}. The expectation is that any element(s) begun by this component during
* rendering will be balanced by end() calls, resulting in the current element reverting to its initial value.
*/
private Element elementAtSetup;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/DTDPageElement.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/DTDPageElement.java
index 294d6ff..feaca34 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/DTDPageElement.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/DTDPageElement.java
@@ -17,10 +17,10 @@
*
*
*/
-package org.apache.tapestry.internal.structure;
+package org.apache.tapestry5.internal.structure;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.runtime.RenderQueue;
public class DTDPageElement implements PageElement
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ExpansionPageElement.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ExpansionPageElement.java
index 3f8d58f..83a545d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ExpansionPageElement.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/ExpansionPageElement.java
@@ -12,12 +12,12 @@
// 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.ioc.services.TypeCoercer;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.runtime.RenderQueue;
/**
*
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
index b3ce43d..a541f46 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImpl.java
@@ -12,23 +12,23 @@
// 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.*;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.services.Instantiator;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Messages;
-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.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.PageLifecycleListener;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.services.Instantiator;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Messages;
+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.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.PageLifecycleListener;
+import org.apache.tapestry5.runtime.RenderQueue;
import org.slf4j.Logger;
import java.lang.annotation.Annotation;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java
index 910195e..3b31399 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/Page.java
@@ -12,12 +12,12 @@
// 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.ComponentResources;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.PageLifecycleListener;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.PageLifecycleListener;
import org.slf4j.Logger;
import java.util.Locale;
@@ -72,7 +72,7 @@
* The page pool should discard pages that are dirty, rather than store them into the pool.
*
* @return true if the page is "dirty", false otherwise
- * @see org.apache.tapestry.runtime.PageLifecycleListener#containingPageDidDetach()
+ * @see org.apache.tapestry5.runtime.PageLifecycleListener#containingPageDidDetach()
*/
boolean detached();
@@ -87,7 +87,7 @@
/**
* Inform the page that it is now completely loaded.
*
- * @see org.apache.tapestry.runtime.PageLifecycleListener#containingPageDidLoad()
+ * @see org.apache.tapestry5.runtime.PageLifecycleListener#containingPageDidLoad()
*/
void loaded();
@@ -115,14 +115,14 @@
/**
* Creates a link that will trigger behavior in a component within the page.
*
- * @see org.apache.tapestry.ComponentResources#createActionLink(String, boolean, Object[])
+ * @see org.apache.tapestry5.ComponentResources#createActionLink(String, boolean, Object[])
*/
Link createActionLink(String nestedId, String eventType, boolean forForm, Object... context);
/**
* Creates a link to the named page.
*
- * @see org.apache.tapestry.ComponentResources#createPageLink(String, boolean, Object[])
+ * @see org.apache.tapestry5.ComponentResources#createPageLink(String, boolean, Object[])
*/
Link createPageLink(String pageName, boolean override, Object... context);
@@ -157,7 +157,7 @@
/**
* Discards all persistent field changes for the page containing the component. Changes are eliminated from
- * persistent storage (such as the {@link org.apache.tapestry.services.Session}) which will take effect in the
+ * persistent storage (such as the {@link org.apache.tapestry5.services.Session}) which will take effect in the
* <em>next</em> request (the attached page instance is not affected).
*/
void discardPersistentFieldChanges();
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageElement.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageElement.java
index 29ffe9f..0283f24 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageElement.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageElement.java
@@ -12,9 +12,9 @@
// 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.runtime.RenderCommand;
+import org.apache.tapestry5.runtime.RenderCommand;
/**
* An element within a page. Page elements are placeholders that delegate much of their behavior to application-specific
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java
index ccd1ba6..a144234 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageImpl.java
@@ -12,18 +12,18 @@
// 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.ComponentResources;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.internal.services.LinkFactory;
-import org.apache.tapestry.internal.services.PersistentFieldManager;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.PageLifecycleListener;
-import org.apache.tapestry.services.PersistentFieldBundle;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.internal.services.LinkFactory;
+import org.apache.tapestry5.internal.services.PersistentFieldManager;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.PageLifecycleListener;
+import org.apache.tapestry5.services.PersistentFieldBundle;
import org.slf4j.Logger;
import java.util.List;
@@ -46,7 +46,7 @@
private int dirtyCount;
/**
- * Obtained from the {@link org.apache.tapestry.internal.services.PersistentFieldManager} when first needed,
+ * Obtained from the {@link org.apache.tapestry5.internal.services.PersistentFieldManager} when first needed,
* discarded at the end of the request.
*/
private PersistentFieldBundle fieldBundle;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResources.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResources.java
index 6594655..679f5aa 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResources.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResources.java
@@ -12,20 +12,20 @@
// 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.ioc.Messages;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.ContextValueEncoder;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.services.ContextValueEncoder;
/**
* Provides access to common methods of various services, needed by implementations of {@link ComponentPageElement} and
- * {@link org.apache.tapestry.internal.InternalComponentResources}.
+ * {@link org.apache.tapestry5.internal.InternalComponentResources}.
*/
public interface PageResources extends ContextValueEncoder
{
/**
- * Used to obtain a {@link org.apache.tapestry.ioc.Messages} instance for a particular component. If the component
+ * Used to obtain a {@link org.apache.tapestry5.ioc.Messages} instance for a particular component. If the component
* extends from another component, then its localized properties will merge with its parent's properties (with the
* subclass overriding the super class on any conflicts).
*
@@ -46,7 +46,7 @@
* @param input
* @param targetType defines the target type
* @return the coerced value
- * @see org.apache.tapestry.ioc.services.TypeCoercer
+ * @see org.apache.tapestry5.ioc.services.TypeCoercer
*/
<S, T> T coerce(S input, Class<T> targetType);
@@ -55,7 +55,7 @@
*
* @param className fully qualified class name
* @return the class instance
- * @see org.apache.tapestry.internal.services.ComponentClassCache
+ * @see org.apache.tapestry5.internal.services.ComponentClassCache
*/
Class toClass(String className);
}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResourcesImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResourcesImpl.java
index 3a652bc..e231b88 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResourcesImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResourcesImpl.java
@@ -12,14 +12,14 @@
// 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.services.ComponentClassCache;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.ContextValueEncoder;
+import org.apache.tapestry5.internal.services.ComponentClassCache;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.model.ComponentModel;
import org.apache.tapestry5.services.ComponentMessagesSource;
+import org.apache.tapestry5.services.ContextValueEncoder;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResourcesSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResourcesSource.java
index d33d0e8..8df5393 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResourcesSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResourcesSource.java
@@ -12,7 +12,7 @@
// 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 java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResourcesSourceImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResourcesSourceImpl.java
index 802df68..3f14a16 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResourcesSourceImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/PageResourcesSourceImpl.java
@@ -12,14 +12,14 @@
// 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.services.ComponentClassCache;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.services.ContextValueEncoder;
+import org.apache.tapestry5.internal.services.ComponentClassCache;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
import org.apache.tapestry5.services.ComponentMessagesSource;
+import org.apache.tapestry5.services.ContextValueEncoder;
import java.util.Locale;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/StartElementPageElement.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/StartElementPageElement.java
index 5c316eb..19698ea 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/StartElementPageElement.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/StartElementPageElement.java
@@ -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.MarkupWriter;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.runtime.RenderQueue;
/**
*
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/StructureMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/StructureMessages.java
index d1a7579..c572eb3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/StructureMessages.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/StructureMessages.java
@@ -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.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
import java.util.Collection;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/TextPageElement.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/TextPageElement.java
index b37ba58..15392a2 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/TextPageElement.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/structure/TextPageElement.java
@@ -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.MarkupWriter;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.runtime.RenderQueue;
/**
*
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/ActionLinkInvoker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/ActionLinkInvoker.java
index 955a2e9..4730dc6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/ActionLinkInvoker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/ActionLinkInvoker.java
@@ -12,20 +12,20 @@
// 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.Link;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.internal.URLEventContext;
-import org.apache.tapestry.internal.services.ActionLinkTarget;
-import org.apache.tapestry.internal.services.ComponentInvocation;
-import org.apache.tapestry.internal.services.ComponentInvocationMap;
-import org.apache.tapestry.internal.services.InvocationTarget;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.services.ComponentEventRequestHandler;
-import org.apache.tapestry.services.ComponentEventRequestParameters;
-import org.apache.tapestry.services.ContextValueEncoder;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.internal.URLEventContext;
+import org.apache.tapestry5.internal.services.ActionLinkTarget;
+import org.apache.tapestry5.internal.services.ComponentInvocation;
+import org.apache.tapestry5.internal.services.ComponentInvocationMap;
+import org.apache.tapestry5.internal.services.InvocationTarget;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.services.ComponentEventRequestHandler;
+import org.apache.tapestry5.services.ComponentEventRequestParameters;
+import org.apache.tapestry5.services.ContextValueEncoder;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/CodeEq.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/CodeEq.java
index 27f5553..012c672 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/CodeEq.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/CodeEq.java
@@ -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 static org.easymock.EasyMock.reportMatcher;
import org.easymock.IArgumentMatcher;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/ComponentInvoker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/ComponentInvoker.java
index b49f96a..ea3338e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/ComponentInvoker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/ComponentInvoker.java
@@ -12,13 +12,13 @@
// 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.dom.Document;
-import org.apache.tapestry.internal.services.ComponentInvocation;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.internal.services.ComponentInvocation;
/**
- * Invokes a {@link org.apache.tapestry.internal.services.ComponentInvocation}.
+ * Invokes a {@link org.apache.tapestry5.internal.services.ComponentInvocation}.
*/
public interface ComponentInvoker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageLinkInvoker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageLinkInvoker.java
index 0f1d8a6..c741739 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageLinkInvoker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageLinkInvoker.java
@@ -12,18 +12,18 @@
// 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.EventContext;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.internal.URLEventContext;
-import org.apache.tapestry.internal.services.ComponentInvocation;
-import org.apache.tapestry.internal.services.InvocationTarget;
-import org.apache.tapestry.internal.services.PageLinkTarget;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.services.ContextValueEncoder;
-import org.apache.tapestry.services.PageRenderRequestHandler;
-import org.apache.tapestry.services.PageRenderRequestParameters;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.internal.URLEventContext;
+import org.apache.tapestry5.internal.services.ComponentInvocation;
+import org.apache.tapestry5.internal.services.InvocationTarget;
+import org.apache.tapestry5.internal.services.PageLinkTarget;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.services.ContextValueEncoder;
+import org.apache.tapestry5.services.PageRenderRequestHandler;
+import org.apache.tapestry5.services.PageRenderRequestParameters;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterComponentInvocationMap.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterComponentInvocationMap.java
index 0f37c3f..e153b56 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterComponentInvocationMap.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterComponentInvocationMap.java
@@ -12,15 +12,15 @@
// 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.Link;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.internal.services.ComponentInvocation;
-import org.apache.tapestry.internal.services.ComponentInvocationMap;
-import org.apache.tapestry.internal.services.NoOpComponentInvocationMap;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.internal.services.ComponentInvocation;
+import org.apache.tapestry5.internal.services.ComponentInvocationMap;
+import org.apache.tapestry5.internal.services.NoOpComponentInvocationMap;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.test.PageTester;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterContext.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterContext.java
index 675dc7a..00c20ab 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterContext.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterContext.java
@@ -12,10 +12,10 @@
// 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.services.Context;
-import org.apache.tapestry.test.TapestryTestConstants;
+import org.apache.tapestry5.services.Context;
+import org.apache.tapestry5.test.TapestryTestConstants;
import java.io.File;
import java.net.MalformedURLException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterModule.java
index 9366936..7ec3ddc 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterModule.java
@@ -12,21 +12,21 @@
// 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.SymbolConstants;
-import org.apache.tapestry.internal.services.ComponentInvocationMap;
-import org.apache.tapestry.internal.services.CookieSink;
-import org.apache.tapestry.internal.services.CookieSource;
-import org.apache.tapestry.ioc.Configuration;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ServiceBinder;
-import org.apache.tapestry.services.AliasContribution;
-import org.apache.tapestry.services.MarkupWriterFactory;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.internal.services.ComponentInvocationMap;
+import org.apache.tapestry5.internal.services.CookieSink;
+import org.apache.tapestry5.internal.services.CookieSource;
+import org.apache.tapestry5.ioc.Configuration;
+import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.services.AliasContribution;
+import org.apache.tapestry5.services.MarkupWriterFactory;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Response;
+import org.apache.tapestry5.test.PageTester;
/**
* Used in conjuction with {@link PageTester} to mock up and/or stub out portions of Tapestry that need to be handled
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterSession.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterSession.java
index b0475c7..85e22ec 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterSession.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterSession.java
@@ -12,12 +12,12 @@
// 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.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.Session;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.Session;
import java.util.List;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableCookieSinkSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableCookieSinkSource.java
index 081739a..315353b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableCookieSinkSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableCookieSinkSource.java
@@ -12,11 +12,11 @@
// 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.internal.services.CookieSink;
-import org.apache.tapestry.internal.services.CookieSource;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.internal.services.CookieSink;
+import org.apache.tapestry5.internal.services.CookieSource;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import javax.servlet.http.Cookie;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableMarkupWriterFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableMarkupWriterFactory.java
index f1a3530..d6aa9c1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableMarkupWriterFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableMarkupWriterFactory.java
@@ -12,10 +12,10 @@
// 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.MarkupWriter;
-import org.apache.tapestry.services.MarkupWriterFactory;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.services.MarkupWriterFactory;
/**
* Extension of {@link MarkupWriterFactory} that tracks the most recently created markup writer so that it can be
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableMarkupWriterFactoryImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableMarkupWriterFactoryImpl.java
index e87b56d..ada6208 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableMarkupWriterFactoryImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableMarkupWriterFactoryImpl.java
@@ -12,14 +12,14 @@
// 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.ContentType;
-import org.apache.tapestry.MarkupWriter;
-import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.services.Core;
-import org.apache.tapestry.services.MarkupWriterFactory;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.MarkupWriter;
+import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.services.Core;
+import org.apache.tapestry5.services.MarkupWriterFactory;
@Scope(PERTHREAD_SCOPE)
public class TestableMarkupWriterFactoryImpl implements TestableMarkupWriterFactory
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableRequest.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableRequest.java
index 817def2..ba04494 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableRequest.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableRequest.java
@@ -12,10 +12,10 @@
// 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.services.Request;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.test.PageTester;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableRequestImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableRequestImpl.java
index edc9652..996f47b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableRequestImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableRequestImpl.java
@@ -12,11 +12,11 @@
// 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.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.Session;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.Session;
import java.util.List;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableResponse.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableResponse.java
index 9738d6f..8d334b9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableResponse.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableResponse.java
@@ -12,15 +12,15 @@
// 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.Link;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.services.Response;
public interface TestableResponse extends Response
{
/**
- * Returns the link redirected to via {@link org.apache.tapestry.services.Response#sendRedirect(org.apache.tapestry.Link)}.
+ * Returns the link redirected to via {@link org.apache.tapestry5.services.Response#sendRedirect(org.apache.tapestry5.Link)}.
*/
Link getRedirectLink();
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableResponseImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableResponseImpl.java
index 64a7add..b20d64a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableResponseImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/TestableResponseImpl.java
@@ -12,9 +12,9 @@
// 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.Link;
+import org.apache.tapestry5.Link;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java
index f05a8f9..559f5c5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/AbstractIncludeAssetWorker.java
@@ -12,25 +12,25 @@
// 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.Asset;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.services.ComponentResourcesOperation;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.AssetSource;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.TransformConstants;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.services.ComponentResourcesOperation;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.AssetSource;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.TransformConstants;
import java.util.List;
import java.util.Locale;
/**
* Base class for workers that automatically inlcude assets in the page (via methods on {@link
- * org.apache.tapestry.RenderSupport}).
+ * org.apache.tapestry5.RenderSupport}).
*/
public abstract class AbstractIncludeAssetWorker implements ComponentClassTransformWorker
{
@@ -46,7 +46,7 @@
/**
* Expands symbols in the path, then adds an operation into the setup render phase of the component. Ultimately,
- * {@link #handleAsset(org.apache.tapestry.Asset)} will be invoked for each asset (dervied from assetPaths).
+ * {@link #handleAsset(org.apache.tapestry5.Asset)} will be invoked for each asset (dervied from assetPaths).
*
* @param transformation transformation process for component
* @param model component model for component
@@ -98,7 +98,7 @@
/**
* Invoked, from the component's setup render phase, for each asset. This method must be threadsafe. Most
- * implementation pass the asset to a particular method of {@link org.apache.tapestry.RenderSupport}.
+ * implementation pass the asset to a particular method of {@link org.apache.tapestry5.RenderSupport}.
*
* @param asset to be processed
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ApplicationStateWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ApplicationStateWorker.java
index bee46c8..715e0a5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ApplicationStateWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ApplicationStateWorker.java
@@ -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.ApplicationState;
-import org.apache.tapestry.internal.services.ComponentClassCache;
-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.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.internal.services.ComponentClassCache;
+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.apache.tapestry5.services.TransformMethodSignature;
import static java.lang.String.format;
import java.lang.reflect.Modifier;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/CachedWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/CachedWorker.java
index 7aa158c..effc547 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/CachedWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/CachedWorker.java
@@ -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.Binding;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.annotation.Cached;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.annotations.Cached;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.*;
import static java.lang.reflect.Modifier.PRIVATE;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentLifecycleMethodWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentLifecycleMethodWorker.java
index 16a3c0e..744da6a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentLifecycleMethodWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentLifecycleMethodWorker.java
@@ -12,24 +12,24 @@
// 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.MarkupWriter;
-import org.apache.tapestry.internal.util.MethodInvocationBuilder;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.MethodFilter;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.internal.util.MethodInvocationBuilder;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.MethodFilter;
+import org.apache.tapestry5.services.TransformMethodSignature;
import java.lang.annotation.Annotation;
import java.util.Iterator;
import java.util.List;
/**
- * Converts one of the methods of {@link org.apache.tapestry.runtime.Component} into a chain of command that, itself,
+ * Converts one of the methods of {@link org.apache.tapestry5.runtime.Component} into a chain of command that, itself,
* invokes certain methods (render phase methods) marked with an annotation, or named in a specific way.
*/
public class ComponentLifecycleMethodWorker implements ComponentClassTransformWorker
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java
index 0e01838..f2fe96b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java
@@ -12,27 +12,28 @@
// 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.Component;
-import org.apache.tapestry.annotation.MixinClasses;
-import org.apache.tapestry.annotation.Mixins;
-import org.apache.tapestry.internal.KeyValue;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.services.StringLocation;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.model.MutableEmbeddedComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.TransformConstants;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.MixinClasses;
+import org.apache.tapestry5.annotations.Mixins;
+import org.apache.tapestry5.internal.KeyValue;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.services.StringLocation;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.model.MutableEmbeddedComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassResolver;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.TransformConstants;
/**
- * Finds fields with the {@link org.apache.tapestry.annotation.Component} annotation and updates the model. Also checks
- * for the {@link Mixins} and {@link MixinClasses} annotations and uses them to update the {@link ComponentModel}.
+ * Finds fields with the {@link org.apache.tapestry5.annotations.Component} annotation and updates the model. Also
+ * checks for the {@link Mixins} and {@link MixinClasses} annotations and uses them to update the {@link
+ * ComponentModel}.
*/
public class ComponentWorker implements ComponentClassTransformWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ContentTypeWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ContentTypeWorker.java
index 0e69a68..2902b82 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ContentTypeWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ContentTypeWorker.java
@@ -12,17 +12,17 @@
// 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.services.ComponentClassTransformWorker;
+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.services.ComponentClassTransformWorker;
/**
- * Checks for the {@link org.apache.tapestry.annotation.ContentType} annotation, adding a corresponding meta-data value
- * when found.
+ * Checks for the {@link org.apache.tapestry5.annotations.ContentType} annotation, adding a corresponding meta-data
+ * value when found.
*/
public class ContentTypeWorker implements ComponentClassTransformWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EnvironmentalWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EnvironmentalWorker.java
index 8177fd9..b542ff4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EnvironmentalWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EnvironmentalWorker.java
@@ -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.Environmental;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.Environment;
+import org.apache.tapestry5.services.TransformMethodSignature;
import java.lang.reflect.Modifier;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/IncludeJavaScriptLibraryWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/IncludeJavaScriptLibraryWorker.java
index 378587c..a10b5f7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/IncludeJavaScriptLibraryWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/IncludeJavaScriptLibraryWorker.java
@@ -12,19 +12,19 @@
// 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.Asset;
-import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.annotation.IncludeJavaScriptLibrary;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.AssetSource;
-import org.apache.tapestry.services.ClassTransformation;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.AssetSource;
+import org.apache.tapestry5.services.ClassTransformation;
/**
- * Recognizes the {@link org.apache.tapestry.annotation.IncludeJavaScriptLibrary} annotation, and ensures that {@link
- * org.apache.tapestry.RenderSupport#addScriptLink(org.apache.tapestry.Asset[])} is invoked.
+ * Recognizes the {@link org.apache.tapestry5.annotations.IncludeJavaScriptLibrary} annotation, and ensures that {@link
+ * org.apache.tapestry5.RenderSupport#addScriptLink(org.apache.tapestry5.Asset[])} is invoked.
*/
public class IncludeJavaScriptLibraryWorker extends AbstractIncludeAssetWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/IncludeStylesheetWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/IncludeStylesheetWorker.java
index f2dc044..db4bdc9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/IncludeStylesheetWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/IncludeStylesheetWorker.java
@@ -12,19 +12,19 @@
// 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.Asset;
-import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.annotation.IncludeStylesheet;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.AssetSource;
-import org.apache.tapestry.services.ClassTransformation;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.annotations.IncludeStylesheet;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.AssetSource;
+import org.apache.tapestry5.services.ClassTransformation;
/**
- * Recognizes the {@link org.apache.tapestry.annotation.IncludeStylesheet} annotation and ensures that {@link
- * org.apache.tapestry.RenderSupport#addStylesheetLink(org.apache.tapestry.Asset, String)} is invoked.
+ * Recognizes the {@link org.apache.tapestry5.annotations.IncludeStylesheet} annotation and ensures that {@link
+ * org.apache.tapestry5.RenderSupport#addStylesheetLink(org.apache.tapestry5.Asset, String)} is invoked.
*/
public class IncludeStylesheetWorker extends AbstractIncludeAssetWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectComponentWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectComponentWorker.java
index 712129a..30625dd 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectComponentWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectComponentWorker.java
@@ -12,19 +12,19 @@
// 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.ComponentResources;
-import org.apache.tapestry.annotation.InjectComponent;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-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.ComponentResources;
+import org.apache.tapestry5.annotations.InjectComponent;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.TransformConstants;
/**
- * Recognizes the {@link org.apache.tapestry.annotation.InjectComponent} annotation, and converts the field into a
+ * Recognizes the {@link org.apache.tapestry5.annotations.InjectComponent} annotation, and converts the field into a
* read-only field containing the component. The id of the component may be explicitly stated or will be determined
* from the field name.
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectContainerWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectContainerWorker.java
index 64fe249..bbc5353 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectContainerWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectContainerWorker.java
@@ -12,20 +12,20 @@
// 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.InjectContainer;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.TransformConstants;
+import org.apache.tapestry5.annotations.InjectContainer;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.TransformConstants;
import java.util.List;
/**
- * Identifies the {@link org.apache.tapestry.annotation.InjectContainer} annotation and adds code to initialize it to
+ * Identifies the {@link org.apache.tapestry5.annotations.InjectContainer} annotation and adds code to initialize it to
* the core component.
*/
public class InjectContainerWorker implements ComponentClassTransformWorker
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectPageWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectPageWorker.java
index 5c85818..5c6e695 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectPageWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectPageWorker.java
@@ -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.annotation.InjectPage;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.*;
import java.lang.reflect.Modifier;
import java.util.List;
@@ -26,7 +26,7 @@
/**
* Peforms transformations that allow pages to be injected into components.
*
- * @see org.apache.tapestry.annotation.InjectPage
+ * @see org.apache.tapestry5.annotations.InjectPage
*/
public class InjectPageWorker implements ComponentClassTransformWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java
index 8bc8abf..59b9b7c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java
@@ -12,21 +12,21 @@
// 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.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.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;
/**
- * Performs injection triggered by any field annotated with the {@link org.apache.tapestry.ioc.annotation.Inject}
+ * Performs injection triggered by any field annotated with the {@link org.apache.tapestry5.ioc.annotations.Inject}
* annotation.
* <p/>
* The implementation of this worker mostly delegates to a chain of command of {@link
- * org.apache.tapestry.services.InjectionProvider}s.
+ * org.apache.tapestry5.services.InjectionProvider}s.
*/
public class InjectWorker implements ComponentClassTransformWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InvokePostRenderCleanupOnResourcesWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InvokePostRenderCleanupOnResourcesWorker.java
index eccc6d8..1d6d47d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InvokePostRenderCleanupOnResourcesWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InvokePostRenderCleanupOnResourcesWorker.java
@@ -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.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.TransformConstants;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.TransformConstants;
/**
* Extends a <em>root</em> component class' postRenderCleanup() method to invoke {@link
- * org.apache.tapestry.internal.InternalComponentResources#postRenderCleanup()}.
+ * org.apache.tapestry5.internal.InternalComponentResources#postRenderCleanup()}.
*/
public class InvokePostRenderCleanupOnResourcesWorker implements ComponentClassTransformWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/LogWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/LogWorker.java
index a537bd9..4481aa2 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/LogWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/LogWorker.java
@@ -12,20 +12,20 @@
// 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.Log;
-import org.apache.tapestry.ioc.MethodAdvice;
-import org.apache.tapestry.ioc.internal.services.LoggingAdvice;
-import org.apache.tapestry.ioc.services.ExceptionTracker;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.annotations.Log;
+import org.apache.tapestry5.ioc.MethodAdvice;
+import org.apache.tapestry5.ioc.internal.services.LoggingAdvice;
+import org.apache.tapestry5.ioc.services.ExceptionTracker;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.*;
import java.util.List;
/**
- * Looks for the {@link org.apache.tapestry.annotation.Log} marker annotation and adds method advice to perform the
- * logging. This is similar to what the {@link org.apache.tapestry.ioc.services.LoggingDecorator} does for service
+ * Looks for the {@link org.apache.tapestry5.annotations.Log} marker annotation and adds method advice to perform the
+ * logging. This is similar to what the {@link org.apache.tapestry5.ioc.services.LoggingDecorator} does for service
* interface methods.
*/
public class LogWorker implements ComponentClassTransformWorker
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MetaWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MetaWorker.java
index a15c195..dbeea23 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MetaWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MetaWorker.java
@@ -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.Meta;
-import org.apache.tapestry.internal.KeyValue;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.annotations.Meta;
+import org.apache.tapestry5.internal.KeyValue;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
/**
* Checks for the presence of a {@link Meta} annotation, and adds the data within to the component model.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MixinAfterWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MixinAfterWorker.java
index 8203910..0b15519 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MixinAfterWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MixinAfterWorker.java
@@ -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.annotation.MixinAfter;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.annotations.MixinAfter;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
/**
- * Looks for the {@link org.apache.tapestry.annotation.MixinAfter} annotatation and sets the {@link
- * org.apache.tapestry.model.ComponentModel#isMixinAfter() mixinAfter flag} is present.
+ * Looks for the {@link org.apache.tapestry5.annotations.MixinAfter} annotatation and sets the {@link
+ * org.apache.tapestry5.model.ComponentModel#isMixinAfter() mixinAfter flag} is present.
*/
public class MixinAfterWorker implements ComponentClassTransformWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MixinWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MixinWorker.java
index 740efc7..2772bcb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MixinWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/MixinWorker.java
@@ -12,20 +12,20 @@
// 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.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.TransformConstants;
+import org.apache.tapestry5.annotations.Mixin;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassResolver;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.TransformConstants;
import java.util.List;
/**
- * Supports the {@link org.apache.tapestry.annotation.Mixin} annotation, which allows a mixin to be part of the
+ * Supports the {@link org.apache.tapestry5.annotations.Mixin} annotation, which allows a mixin to be part of the
* implementation of a component. The annotation is applied to a field, which will become read-only, and contain a
* reference to the mixin instance.
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
index 58b604c..d9a5e31 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
@@ -12,20 +12,20 @@
// 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.EventContext;
-import org.apache.tapestry.annotation.OnEvent;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.annotations.OnEvent;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.*;
import java.util.Arrays;
import java.util.List;
/**
- * Provides implementations of the {@link org.apache.tapestry.runtime.Component#dispatchComponentEvent(org.apache.tapestry.runtime.ComponentEvent)}
- * method, based on {@link org.apache.tapestry.annotation.OnEvent} annotations.
+ * Provides implementations of the {@link org.apache.tapestry5.runtime.Component#dispatchComponentEvent(org.apache.tapestry5.runtime.ComponentEvent)}
+ * method, based on {@link org.apache.tapestry5.annotations.OnEvent} annotations.
*/
public class OnEventWorker implements ComponentClassTransformWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PageLifecycleAnnotationWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PageLifecycleAnnotationWorker.java
index e2fe04e..019472d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PageLifecycleAnnotationWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PageLifecycleAnnotationWorker.java
@@ -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.internal.util.MethodInvocationBuilder;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.MethodFilter;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.internal.util.MethodInvocationBuilder;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.MethodFilter;
+import org.apache.tapestry5.services.TransformMethodSignature;
import java.lang.annotation.Annotation;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java
index e6ed188..821dcb0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ParameterWorker.java
@@ -12,22 +12,22 @@
// 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.Binding;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.bindings.LiteralBinding;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.bindings.LiteralBinding;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.*;
import java.lang.reflect.Modifier;
import java.util.List;
/**
- * Responsible for identifying parameters via the {@link org.apache.tapestry.annotation.Parameter} annotation on
+ * Responsible for identifying parameters via the {@link org.apache.tapestry5.annotations.Parameter} annotation on
* component fields. This is one of the most complex of the transformations.
*/
public class ParameterWorker implements ComponentClassTransformWorker
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PersistWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PersistWorker.java
index 199c9e2..1cea1d5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PersistWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PersistWorker.java
@@ -12,18 +12,18 @@
// 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.Persist;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.*;
import static java.lang.String.format;
import java.lang.reflect.Modifier;
/**
- * Converts fields with the {@link org.apache.tapestry.annotation.Persist} annotation into persistent fields.
+ * Converts fields with the {@link org.apache.tapestry5.annotations.Persist} annotation into persistent fields.
*/
public class PersistWorker implements ComponentClassTransformWorker
{
@@ -40,8 +40,8 @@
* Making a field persistent: <ul> <li>Need a secondary default field that stores the initial value</li> <li>Store
* the active value into the default field when the page finishes loading</li> <li>Roll the active value back to the
* default when the page detaches</li> <ii>On changes to the active field, post the change via the {@link
- * org.apache.tapestry.internal.InternalComponentResources} </li> <li>When the page attaches, pull the persisted
- * value for the field out of the {@link org.apache.tapestry.services.PersistentFieldBundle}</li> </ul>
+ * org.apache.tapestry5.internal.InternalComponentResources} </li> <li>When the page attaches, pull the persisted
+ * value for the field out of the {@link org.apache.tapestry5.services.PersistentFieldBundle}</li> </ul>
*/
private void makeFieldPersistent(String fieldName, ClassTransformation transformation,
MutableComponentModel model)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PropertyWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PropertyWorker.java
index b8ce6fe..9fa6ba2 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PropertyWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PropertyWorker.java
@@ -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.Property;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.TransformMethodSignature;
import java.lang.reflect.Modifier;
@@ -28,7 +28,7 @@
* be transformed as necessary by other annotations. This worker needs to be scheduled before any worker that might
* delete a field.
*
- * @see org.apache.tapestry.annotation.Property
+ * @see org.apache.tapestry5.annotations.Property
*/
public class PropertyWorker implements ComponentClassTransformWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderCommandWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderCommandWorker.java
index 8d0895a..7a70df4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderCommandWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RenderCommandWorker.java
@@ -12,21 +12,21 @@
// 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.MarkupWriter;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.runtime.RenderCommand;
-import org.apache.tapestry.runtime.RenderQueue;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.runtime.RenderCommand;
+import org.apache.tapestry5.runtime.RenderQueue;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.TransformMethodSignature;
import java.lang.reflect.Modifier;
/**
* Ensures that all components implement {@link RenderCommand} by delegating to {@link
- * org.apache.tapestry.internal.InternalComponentResources#queueRender(org.apache.tapestry.runtime.RenderQueue)}.
+ * org.apache.tapestry5.internal.InternalComponentResources#queueRender(org.apache.tapestry5.runtime.RenderQueue)}.
*/
public class RenderCommandWorker implements ComponentClassTransformWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ResponseEncodingWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ResponseEncodingWorker.java
index 6c28a95..e6e07da 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ResponseEncodingWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ResponseEncodingWorker.java
@@ -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.services.ComponentClassTransformWorker;
+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.services.ComponentClassTransformWorker;
public class ResponseEncodingWorker implements ComponentClassTransformWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RetainWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RetainWorker.java
index e629be1..3e22d25 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RetainWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/RetainWorker.java
@@ -12,21 +12,21 @@
// 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.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.annotations.Retain;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
/**
- * Identifies fields with the {@link org.apache.tapestry.annotation.Retain} annotation, and "claims" them so that no
+ * Identifies fields with the {@link org.apache.tapestry5.annotations.Retain} annotation, and "claims" them so that no
* special work will occur on them.
*/
public final class RetainWorker implements ComponentClassTransformWorker
{
/**
- * Claims each field with the {@link org.apache.tapestry.annotation.Retain} annotation, claiming it using the
+ * Claims each field with the {@link org.apache.tapestry5.annotations.Retain} annotation, claiming it using the
* annotation as the tag.
*/
public void transform(ClassTransformation transformation, MutableComponentModel model)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/SecureWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/SecureWorker.java
index b6e77e0..ae9dd94 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/SecureWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/SecureWorker.java
@@ -12,17 +12,17 @@
// 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.Secure;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.MetaDataConstants;
+import org.apache.tapestry5.annotations.Secure;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
/**
- * Recognizes the {@link org.apache.tapestry.annotation.Secure} annotation and sets the {@link
- * org.apache.tapestry.MetaDataConstants#SECURE_PAGE} meta data to "true".
+ * Recognizes the {@link org.apache.tapestry5.annotations.Secure} annotation and sets the {@link
+ * org.apache.tapestry5.MetaDataConstants#SECURE_PAGE} meta data to "true".
*/
public class SecureWorker implements ComponentClassTransformWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/SupportsInformalParametersWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/SupportsInformalParametersWorker.java
index 06f5829..94b7fa5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/SupportsInformalParametersWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/SupportsInformalParametersWorker.java
@@ -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.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
/**
* Checks for the {@link SupportsInformalParameters} annotation, settting the corresponding flag on the model if
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/TransformMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/TransformMessages.java
index 2d41e6a..1c9f995 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/TransformMessages.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/TransformMessages.java
@@ -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.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.TransformMethodSignature;
class TransformMessages
{
@@ -34,11 +34,13 @@
.getComponentResources().getCompleteId(), fieldName, fieldType);
}
- static String cachedMethodMustHaveReturnValue(TransformMethodSignature method) {
+ static String cachedMethodMustHaveReturnValue(TransformMethodSignature method)
+ {
return MESSAGES.format("cached-no-return-value", method);
}
-
- static String cachedMethodsHaveNoParameters(TransformMethodSignature method) {
+
+ static String cachedMethodsHaveNoParameters(TransformMethodSignature method)
+ {
return MESSAGES.format("cached-no-parameters", method);
}
}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/UnclaimedFieldWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/UnclaimedFieldWorker.java
index 1564f46..f537515 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/UnclaimedFieldWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/UnclaimedFieldWorker.java
@@ -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.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-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.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+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 java.lang.reflect.Modifier;
import java.util.List;
@@ -26,7 +26,7 @@
/**
* Designed to be just about the last worker in the pipeline. Its job is to add cleanup code that restores transient
* fields back to their initial (null) value. Fields that have been previously {@link
- * org.apache.tapestry.services.ClassTransformation#claimField(String, Object) claimed} are ignored, as are fields that
+ * org.apache.tapestry5.services.ClassTransformation#claimField(String, Object) claimed} are ignored, as are fields that
* are final.
*/
public final class UnclaimedFieldWorker implements ComponentClassTransformWorker
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/ByteTranslator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/ByteTranslator.java
index 6f2db43..e70e4ce 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/ByteTranslator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/ByteTranslator.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.translator;
+package org.apache.tapestry5.internal.translator;
-import org.apache.tapestry.Translator;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry5.Translator;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.ioc.Messages;
public class ByteTranslator implements Translator<Byte>
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/DoubleTranslator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/DoubleTranslator.java
index 5a055bb..3063ef2 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/DoubleTranslator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/DoubleTranslator.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.translator;
+package org.apache.tapestry5.internal.translator;
-import org.apache.tapestry.Translator;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry5.Translator;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.ioc.Messages;
public class DoubleTranslator implements Translator<Double>
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/FloatTranslator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/FloatTranslator.java
index 65b9cee..6826b88 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/FloatTranslator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/FloatTranslator.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.translator;
+package org.apache.tapestry5.internal.translator;
-import org.apache.tapestry.Translator;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry5.Translator;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.ioc.Messages;
public class FloatTranslator implements Translator<Float>
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/IntegerTranslator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/IntegerTranslator.java
index e83f90b..a033b43 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/IntegerTranslator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/IntegerTranslator.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.translator;
+package org.apache.tapestry5.internal.translator;
-import org.apache.tapestry.Translator;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry5.Translator;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.ioc.Messages;
/**
* A translator for type integer.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/LongTranslator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/LongTranslator.java
index bdac2ac..e919ab9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/LongTranslator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/LongTranslator.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.translator;
+package org.apache.tapestry5.internal.translator;
-import org.apache.tapestry.Translator;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry5.Translator;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.ioc.Messages;
/**
* A translator for type long.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/StringTranslator.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/StringTranslator.java
index df8fce7..f62d63c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/StringTranslator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/translator/StringTranslator.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.translator;
+package org.apache.tapestry5.internal.translator;
-import org.apache.tapestry.Translator;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry5.Translator;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.ioc.Messages;
public class StringTranslator implements Translator<String>
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64InputStream.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64InputStream.java
index f40f5c8..8f1fe6a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64InputStream.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64InputStream.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
import org.apache.commons.codec.binary.Base64;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64ObjectInputStream.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64ObjectInputStream.java
index 247cf3d..a3bb7ca 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64ObjectInputStream.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64ObjectInputStream.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
import java.io.BufferedInputStream;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64ObjectOutputStream.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64ObjectOutputStream.java
index 52fab63..8a78800 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64ObjectOutputStream.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64ObjectOutputStream.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
import java.io.BufferedOutputStream;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64OutputStream.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64OutputStream.java
index a5ad0bb..23b3980 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64OutputStream.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Base64OutputStream.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
import org.apache.commons.codec.binary.Base64;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Holder.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Holder.java
index 0b36c3c..9db73aa 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Holder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/Holder.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
import java.util.concurrent.atomic.AtomicReference;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/IntegerRange.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/IntegerRange.java
index 7606459..1c4cf6b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/IntegerRange.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/IntegerRange.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
import java.util.Iterator;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MethodInvocationBuilder.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MethodInvocationBuilder.java
index 2b99552..20ea526 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MethodInvocationBuilder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MethodInvocationBuilder.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.TransformMethodSignature;
-import org.apache.tapestry.services.TransformUtils;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.TransformMethodSignature;
+import org.apache.tapestry5.services.TransformUtils;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MultiKey.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MultiKey.java
index 12cf041..503bb1f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MultiKey.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/MultiKey.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
import java.util.Arrays;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/NotificationEventCallback.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/NotificationEventCallback.java
index 2e3f0d7..df6466e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/NotificationEventCallback.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/NotificationEventCallback.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
-import org.apache.tapestry.ComponentEventCallback;
+import org.apache.tapestry5.ComponentEventCallback;
/**
- * A {@link org.apache.tapestry.ComponentEventCallback} used for notification events. Event handler methods may return
+ * A {@link org.apache.tapestry5.ComponentEventCallback} used for notification events. Event handler methods may return
* true (to abort the event) or false (to allow the event to continue bubbling up), but all other values are forbidden.
*/
public class NotificationEventCallback implements ComponentEventCallback
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/ParameterBuilder.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/ParameterBuilder.java
index 5f7c9c1..7c68df1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/ParameterBuilder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/ParameterBuilder.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
-import org.apache.tapestry.services.ClassTransformation;
+import org.apache.tapestry5.services.ClassTransformation;
/**
- * Builds single parameter value to pass into a method being invoked by a {@link org.apache.tapestry.internal.util.MethodInvocationBuilder}.
+ * Builds single parameter value to pass into a method being invoked by a {@link org.apache.tapestry5.internal.util.MethodInvocationBuilder}.
*/
public interface ParameterBuilder
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/PrintOutCollector.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/PrintOutCollector.java
index 1936508..4ffd9a5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/PrintOutCollector.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/PrintOutCollector.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
import java.io.PrintWriter;
import java.io.StringWriter;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/SelectModelRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/SelectModelRenderer.java
index 8226312..4f7c5dd 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/SelectModelRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/SelectModelRenderer.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
-import org.apache.tapestry.*;
+import org.apache.tapestry5.*;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/StringParameterBuilder.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/StringParameterBuilder.java
index 071e742..f874b1f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/StringParameterBuilder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/StringParameterBuilder.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
-import org.apache.tapestry.services.ClassTransformation;
+import org.apache.tapestry5.services.ClassTransformation;
import static java.lang.String.format;
/**
- * Implementation of {@link org.apache.tapestry.internal.util.ParameterBuilder} that simply provides a static string
+ * Implementation of {@link org.apache.tapestry5.internal.util.ParameterBuilder} that simply provides a static string
* value for the parameter expression.
*/
public final class StringParameterBuilder implements ParameterBuilder
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/URLChangeTracker.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/URLChangeTracker.java
index c5a14b0..fadf305 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/URLChangeTracker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/URLChangeTracker.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.io.File;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/UtilMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/UtilMessages.java
index 8ba26dc..c3c88df 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/UtilMessages.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/util/UtilMessages.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
-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 UtilMessages
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONArray.java b/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONArray.java
index 1ee99bd..64d7652 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONArray.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONArray.java
@@ -38,7 +38,7 @@
SOFTWARE.
*/
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.List;
@@ -430,4 +430,4 @@
return list.equals(other.list);
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONObject.java b/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONObject.java
index a3fcf6b..1ee0cf2 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONObject.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONObject.java
@@ -38,7 +38,7 @@
SOFTWARE.
*/
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.Map;
import java.util.Set;
@@ -851,4 +851,4 @@
return properties.equals(other.properties);
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONTokener.java b/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONTokener.java
index c7aacb0..dd542c2 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONTokener.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONTokener.java
@@ -525,4 +525,4 @@
{
return " at character " + index + " of " + source;
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java
index 2262b0d..4573887 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/model/ComponentModel.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.model;
+package org.apache.tapestry5.model;
-import org.apache.tapestry.annotation.MixinAfter;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.SupportsInformalParameters;
-import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry5.annotations.MixinAfter;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.ioc.Resource;
import org.slf4j.Logger;
import java.util.List;
@@ -44,7 +44,7 @@
/**
* Returns the ids of all embedded components defined within the component class (via the {@link
- * org.apache.tapestry.annotation.Component} annotation).
+ * org.apache.tapestry5.annotations.Component} annotation).
*/
List<String> getEmbeddedComponentIds();
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/model/EmbeddedComponentModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/model/EmbeddedComponentModel.java
index 39a0284..7ac40bc 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/model/EmbeddedComponentModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/model/EmbeddedComponentModel.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.model;
+package org.apache.tapestry5.model;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.ioc.Locatable;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.ioc.Locatable;
import java.util.List;
/**
* The model for a component embedded within another component, as defined by the {@link
- * org.apache.tapestry.annotation.Component} annotation.
+ * org.apache.tapestry5.annotations.Component} annotation.
*/
public interface EmbeddedComponentModel extends Locatable
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java
index bc4994a..d0f15cb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableComponentModel.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.model;
+package org.apache.tapestry5.model;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.ioc.Location;
/**
- * Mutable version of {@link org.apache.tapestry.model.ComponentModel} used during the transformation phase.
+ * Mutable version of {@link org.apache.tapestry5.model.ComponentModel} used during the transformation phase.
*/
public interface MutableComponentModel extends ComponentModel
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableEmbeddedComponentModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableEmbeddedComponentModel.java
index 3f3ff4e..46761c7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableEmbeddedComponentModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/model/MutableEmbeddedComponentModel.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.model;
+package org.apache.tapestry5.model;
/**
- * A mutable version of {@link org.apache.tapestry.model.EmbeddedComponentModel} that allows the parameters to be
+ * A mutable version of {@link org.apache.tapestry5.model.EmbeddedComponentModel} that allows the parameters to be
* incrementally stored.
*/
public interface MutableEmbeddedComponentModel extends EmbeddedComponentModel
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/model/ParameterModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/model/ParameterModel.java
index 2ed0fb2..ceb6531 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/model/ParameterModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/model/ParameterModel.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.model;
+package org.apache.tapestry5.model;
-import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry5.annotations.Parameter;
/**
* Model for a <em>formal</em> parameter of a component.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/Component.java b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/Component.java
index 49109ad..e1a9caf 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/Component.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/Component.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.runtime;
+package org.apache.tapestry5.runtime;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.OnEvent;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.OnEvent;
/**
* Interface that defines the lifecycle of a component, within a page, allowing for callbacks into the component for
@@ -32,7 +32,7 @@
{
/**
- * Lifecycle method invoked at the end of the {@link org.apache.tapestry.annotation.CleanupRender} render phase.
+ * Lifecycle method invoked at the end of the {@link org.apache.tapestry5.annotations.CleanupRender} render phase.
* There is no annotation for this method, it is part of CleanupRender, but is always invoked. Its specific use is
* to allow components to clean up cached parameter values.
*/
@@ -70,7 +70,7 @@
/**
* Generally used to write the close tag matching any open tag written by {@link
- * #beginRender(org.apache.tapestry.MarkupWriter, Event)}.
+ * #beginRender(org.apache.tapestry5.MarkupWriter, Event)}.
*/
void afterRender(MarkupWriter writer, Event event);
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/ComponentEvent.java b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/ComponentEvent.java
index 0531cf1..7cdb120 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/ComponentEvent.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/ComponentEvent.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.runtime;
+package org.apache.tapestry5.runtime;
-import org.apache.tapestry.ComponentResourcesCommon;
-import org.apache.tapestry.EventContext;
+import org.apache.tapestry5.ComponentResourcesCommon;
+import org.apache.tapestry5.EventContext;
/**
* An event that may originate in application logic, or as a result of a client interaction (a GET or POST from the
* client).
*
- * @see ComponentResourcesCommon#triggerEvent(String, Object[], org.apache.tapestry.ComponentEventCallback)
- * @see org.apache.tapestry.ComponentEventCallback
+ * @see ComponentResourcesCommon#triggerEvent(String, Object[], org.apache.tapestry5.ComponentEventCallback)
+ * @see org.apache.tapestry5.ComponentEventCallback
*/
public interface ComponentEvent extends Event
{
@@ -47,7 +47,7 @@
Object coerceContext(int index, String desiredTypeName);
/**
- * Returns the underlying {@link org.apache.tapestry.EventContext} as a (possibly empty) array.
+ * Returns the underlying {@link org.apache.tapestry5.EventContext} as a (possibly empty) array.
*/
Object[] getContext();
@@ -55,4 +55,4 @@
* Returns the underlying event context.
*/
EventContext getEventContext();
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/ComponentEventException.java b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/ComponentEventException.java
index 174fa5a..913ce75 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/ComponentEventException.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/ComponentEventException.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.runtime;
+package org.apache.tapestry5.runtime;
-import org.apache.tapestry.EventContext;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
/**
* A wrapper exception around any exception thrown when invoking a component event handler. In some cases, the
* underlying exception may have been a declared exception, and will be wrapped in a RuntimeException.
*
- * @see org.apache.tapestry.ioc.util.ExceptionUtils#findCause(Throwable, Class)
+ * @see org.apache.tapestry5.ioc.util.ExceptionUtils#findCause(Throwable, Class)
*/
public class ComponentEventException extends TapestryException
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/ComponentResourcesAware.java b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/ComponentResourcesAware.java
index 8fe4c09..60952fc 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/ComponentResourcesAware.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/ComponentResourcesAware.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.runtime;
+package org.apache.tapestry5.runtime;
-import org.apache.tapestry.ComponentResources;
+import org.apache.tapestry5.ComponentResources;
/**
* Interface implemented by components (after they have been transformed at load time). Component classes should not
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/Event.java b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/Event.java
index edd4df3..3c32924 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/Event.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/Event.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.runtime;
+package org.apache.tapestry5.runtime;
/**
* The core methods related to event handling. Events used in this way exist to gather data from user code, by invoking
* user methods and capturing the response. Return values from methods, if non-null, are passed to a {@link
- * org.apache.tapestry.ComponentEventCallback}. The {@link ComponentEvent} subinterface extends this by providing access
- * to a context, or set of information related to the event, along with additional data used, at runtime, to match
- * events to user code methods.
+ * org.apache.tapestry5.ComponentEventCallback}. The {@link ComponentEvent} subinterface extends this by providing
+ * access to a context, or set of information related to the event, along with additional data used, at runtime, to
+ * match events to user code methods.
*/
public interface Event
{
@@ -41,7 +41,7 @@
/**
* Stores a result for the event. Storing a non-null result value may abort the event (at the discretion of the
- * {@link org.apache.tapestry.ComponentEventCallback}).
+ * {@link org.apache.tapestry5.ComponentEventCallback}).
*
* @param result the result obtained from a method invocations
* @return true if the event is now aborted
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/PageLifecycleListener.java b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/PageLifecycleListener.java
index 1725bd2..9a82a05 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/PageLifecycleListener.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/PageLifecycleListener.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.runtime;
+package org.apache.tapestry5.runtime;
/**
* A set of methods that allow components to know about page-level operations.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/RenderCommand.java b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/RenderCommand.java
index 0fcb014..d63aff4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/RenderCommand.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/RenderCommand.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.runtime;
+package org.apache.tapestry5.runtime;
-import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry5.MarkupWriter;
/**
* A command used during rendering of a page.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/RenderQueue.java b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/RenderQueue.java
index ee6673a..15256bc 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/runtime/RenderQueue.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/runtime/RenderQueue.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.runtime;
+package org.apache.tapestry5.runtime;
-import org.apache.tapestry.ComponentResources;
+import org.apache.tapestry5.ComponentResources;
/**
* A stateful object that manages the process of rendering a page. Rending a page in Tapestry is based on a command
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/Ajax.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/Ajax.java
index ec1490f..c4425dc 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Ajax.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Ajax.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.lang.annotation.*;
/**
* Marker annotation for services related to processing an Ajax request (rather than a {@linkplain
- * org.apache.tapestry.services.Traditional traditional request}).
+ * org.apache.tapestry5.services.Traditional traditional request}).
*
* @see ComponentEventRequestHandler
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/Alias.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/Alias.java
index f93a244..8578ed5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Alias.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Alias.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ioc.ObjectProvider;
+import org.apache.tapestry5.ioc.ObjectProvider;
/**
* The Alias service provides an ObjectProvider that fits into the MasterObjectProvider command chain and disambiguates
- * injections based on type. {@linkplain org.apache.tapestry.services.AliasContribution Contibutions} to the Alias
+ * injections based on type. {@linkplain org.apache.tapestry5.services.AliasContribution Contibutions} to the Alias
* service identify the desired service to inject for a particular service interface; this is only necessary when there
* is more than one service implementing the same interface.
* <p/>
* The {@linkplain AliasManager AliasOverrides} service also takes an unordered configuration of {@link
- * org.apache.tapestry.services.AliasContribution}; such contributions override the "factory" contributions to the Alias
+ * org.apache.tapestry5.services.AliasContribution}; such contributions override the "factory" contributions to the Alias
* service itself. This is often used to replace built-in service implementations with ones that are specific to a
* particular application.
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/AliasContribution.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/AliasContribution.java
index a44b252..18030b8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/AliasContribution.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/AliasContribution.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import java.util.Formatter;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/AliasManager.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/AliasManager.java
index e821fac..fc83c03 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/AliasManager.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/AliasManager.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.util.Map;
/**
- * A thin wrapper around a set of {@link org.apache.tapestry.services.AliasContribution}s.
+ * A thin wrapper around a set of {@link org.apache.tapestry5.services.AliasContribution}s.
*/
public interface AliasManager
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationGlobals.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationGlobals.java
index c8ede1f..747222e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationGlobals.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationGlobals.java
@@ -14,7 +14,7 @@
package org.apache.tapestry5.services;
-import org.apache.tapestry.services.Context;
+import org.apache.tapestry5.services.Context;
import javax.servlet.ServletContext;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java
index 5b21e2c..1317549 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializer.java
@@ -14,7 +14,7 @@
package org.apache.tapestry5.services;
-import org.apache.tapestry.services.Context;
+import org.apache.tapestry5.services.Context;
/**
* Service interface for initializing Tapestry for the application.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializerFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializerFilter.java
index db616f6..2c4c45d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializerFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationInitializerFilter.java
@@ -14,7 +14,7 @@
package org.apache.tapestry5.services;
-import org.apache.tapestry.services.Context;
+import org.apache.tapestry5.services.Context;
/**
* Filter interface for {@link ApplicationInitializer}.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateContribution.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateContribution.java
index 66eb12b..ca92432 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateContribution.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateContribution.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.Defense;
/**
* A contribution to the configuration of the {@link ApplicationStateManager}, identifying the strategy and creator for
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateCreator.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateCreator.java
index 9354284..7e4d2de 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateCreator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateCreator.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Used by {@link ApplicationStateManager} and {@link ApplicationStatePersistenceStrategy} to create an application
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateManager.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateManager.java
index 5416da0..e0882b4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateManager.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStateManager.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Responsible for managing <em>application state objects</em>, objects which persist between requests, but are not tied
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStatePersistenceStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStatePersistenceStrategy.java
index 23b5ef9..bf83ca1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStatePersistenceStrategy.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStatePersistenceStrategy.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Used by {@link ApplicationStateManager} to manage a specific kind of ASO persistence. The stategy is responsible for
* managing ASO instances within its domain.
*
- * @see org.apache.tapestry.services.ApplicationStatePersistenceStrategySource
+ * @see org.apache.tapestry5.services.ApplicationStatePersistenceStrategySource
*/
public interface ApplicationStatePersistenceStrategy
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStatePersistenceStrategySource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStatePersistenceStrategySource.java
index 5dcc700..17b1a35 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStatePersistenceStrategySource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ApplicationStatePersistenceStrategySource.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Used to provide access to stategies via a logical name for the stategy, such as "session".
*
- * @see org.apache.tapestry.services.TapestryModule#contributeApplicationStatePersistenceStrategySource(org.apache.tapestry.ioc.MappedConfiguration,
+ * @see org.apache.tapestry5.services.TapestryModule#contributeApplicationStatePersistenceStrategySource(org.apache.tapestry5.ioc.MappedConfiguration,
* Request)
*/
public interface ApplicationStatePersistenceStrategySource
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetFactory.java
index f0ed355..9a506da 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetFactory.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.ioc.Resource;
/**
* Used by {@link AssetSource} to create new {@link Asset}s as needed.
*
- * @see org.apache.tapestry.services.AssetSource
+ * @see org.apache.tapestry5.services.AssetSource
*/
public interface AssetFactory
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetSource.java
index 50b1fe2..f331673 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetSource.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.services.ThreadLocale;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.services.ThreadLocale;
import java.util.Locale;
@@ -27,7 +27,7 @@
* (for files inside the web application context) and "classpath:" for files stored on the classpath (typically, inside
* a JAR, such as a component library).
*
- * @see org.apache.tapestry.services.TapestryModule#contributeAssetSource(org.apache.tapestry.ioc.MappedConfiguration,
+ * @see org.apache.tapestry5.services.TapestryModule#contributeAssetSource(org.apache.tapestry5.ioc.MappedConfiguration,
* AssetFactory, AssetFactory)
*/
public interface AssetSource
@@ -64,4 +64,4 @@
* @return the asset
*/
Asset getClasspathAsset(String path);
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/BaseURLSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/BaseURLSource.java
index cc2198c..d686c92 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/BaseURLSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/BaseURLSource.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Used when switching between normal/insecure (HTTP) and secure (HTTPS) mode. When a switch occurs, it is no longer
* possible to use relative URLs, instead absolute URLs must be generated. The default implementation of this is
- * simple-minded: it just tacks the correct scheme in front of {@link org.apache.tapestry.services.Request#getServerName()}.
+ * simple-minded: it just tacks the correct scheme in front of {@link org.apache.tapestry5.services.Request#getServerName()}.
* In production, behind a firewall, it is often necessary to do a bit more, since <code>getServerName()</code> will
* often be the name of the internal server (not visible to the client web browser), and a hard-coded name of a server
* that <em>is</em> visible to the web browser is needed. Further, in testing, non-default ports are often used. In
- * those cases, an overriding contribution to the {@link org.apache.tapestry.services.Alias} service will allow a custom
+ * those cases, an overriding contribution to the {@link org.apache.tapestry5.services.Alias} service will allow a custom
* implementation to supercede the default version.
*/
public interface BaseURLSource
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockContribution.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockContribution.java
index 41d37a2..6571719 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockContribution.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockContribution.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.corelib.components.Label;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry5.corelib.components.Label;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
/**
* A contribution to the {@link BeanBlockSource} service, defining a page name and block id (within the page) that can
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockOverrideSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockOverrideSource.java
index 0716a63..940c61f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockOverrideSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockOverrideSource.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.Block;
+import org.apache.tapestry5.Block;
/**
- * Used to override the default {@link org.apache.tapestry.services.BeanBlockSource} for a particular data type. The
- * service accepts the same configuration of {@link org.apache.tapestry.services.BeanBlockContribution}s as the main
+ * Used to override the default {@link org.apache.tapestry5.services.BeanBlockSource} for a particular data type. The
+ * service accepts the same configuration of {@link org.apache.tapestry5.services.BeanBlockContribution}s as the main
* service.
*/
public interface BeanBlockOverrideSource
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockSource.java
index 7682b29..c61799b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanBlockSource.java
@@ -12,24 +12,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.Block;
+import org.apache.tapestry5.Block;
/**
* A source of {@link Block}s used to display the properties of a bean (used by the {@link
- * org.apache.tapestry.corelib.components.Grid} component), or to edit the properties of a bean (used by the {@link
- * org.apache.tapestry.corelib.components.BeanEditForm} component). Contributions to this service (a configuration of
+ * org.apache.tapestry5.corelib.components.Grid} component), or to edit the properties of a bean (used by the {@link
+ * org.apache.tapestry5.corelib.components.BeanEditForm} component). Contributions to this service (a configuration of
* {@link BeanBlockContribution}s) define what properties may be editted.
* <p/>
* Blocks are accessed in terms of a <strong>data type</strong> a string that identifies the type of data to be editted,
* such as "string", "date", "boolean", etc.
* <p/>
* Tapestry contributes a number of default data types and corresponding edit and display blocks. The {@link
- * org.apache.tapestry.services.BeanBlockOverrideSource} service allows these to be overridden.
+ * org.apache.tapestry5.services.BeanBlockOverrideSource} service allows these to be overridden.
*
- * @see org.apache.tapestry.services.DataTypeAnalyzer
- * @see org.apache.tapestry.services.TapestryModule#contributeBeanBlockSource(org.apache.tapestry.ioc.Configuration)
+ * @see org.apache.tapestry5.services.DataTypeAnalyzer
+ * @see org.apache.tapestry5.services.TapestryModule#contributeBeanBlockSource(org.apache.tapestry5.ioc.Configuration)
*/
public interface BeanBlockSource
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanModelSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanModelSource.java
index a9d2a0e..d9ec944 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanModelSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/BeanModelSource.java
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.OrderBefore;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.OrderBefore;
/**
* Used by a component to create a default {@link BeanModel} for a particular bean class. Also provides support to the
* model by generating validation information for individual fields.
* <p/>
- * BeanModels are the basis for the {@link org.apache.tapestry.corelib.components.BeanEditor} and {@link
- * org.apache.tapestry.corelib.components.Grid} comopnents.
+ * BeanModels are the basis for the {@link org.apache.tapestry5.corelib.components.BeanEditor} and {@link
+ * org.apache.tapestry5.corelib.components.Grid} comopnents.
*
- * @see org.apache.tapestry.services.PropertyConduitSource
+ * @see org.apache.tapestry5.services.PropertyConduitSource
*/
public interface BeanModelSource
{
@@ -39,10 +39,10 @@
*
* @param beanClass class of object to be edited
* @param filterReadOnlyProperties if true, then properties that are read-only will be skipped (leaving only
- * read-write properties, appropriate for {@link org.apache.tapestry.corelib.components.BeanEditForm},
+ * read-write properties, appropriate for {@link org.apache.tapestry5.corelib.components.BeanEditForm},
* etc.). If false, then both read-only and read-write properties will be included
- * (appropriate for {@link org.apache.tapestry.corelib.components.Grid} or {@link
- * org.apache.tapestry.corelib.components.BeanDisplay}).
+ * (appropriate for {@link org.apache.tapestry5.corelib.components.Grid} or {@link
+ * org.apache.tapestry5.corelib.components.BeanDisplay}).
* @param resources used when resolving resources, especially component messages (used to access
* labels)
* @return a model
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/BindingFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/BindingFactory.java
index 76be41f..13c27e8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/BindingFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/BindingFactory.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ioc.Location;
/**
* Creates a binding of a particular type. This is usually invoked from the {@link
- * org.apache.tapestry.services.BindingSource} service.
+ * org.apache.tapestry5.services.BindingSource} service.
*/
public interface BindingFactory
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/BindingSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/BindingSource.java
index 2f917b4..ec534f6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/BindingSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/BindingSource.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ioc.Location;
/**
* Used to acquire bindings for component parameters. The BindingSource service strips off the binding prefix to locate
- * a {@link org.apache.tapestry.services.BindingFactory}.
+ * a {@link org.apache.tapestry5.services.BindingFactory}.
*
- * @see org.apache.tapestry.services.TapestryModule#contributeBindingSource(org.apache.tapestry.ioc.MappedConfiguration,
- * AssetSource, BindingFactory, FieldValidatorSource, TranslatorSource, org.apache.tapestry.ioc.ObjectLocator)
+ * @see org.apache.tapestry5.services.TapestryModule#contributeBindingSource(org.apache.tapestry5.ioc.MappedConfiguration,
+ * AssetSource, BindingFactory, FieldValidatorSource, TranslatorSource, org.apache.tapestry5.ioc.ObjectLocator)
*/
public interface BindingSource
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java
index f8ffaf6..8cb16fe 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ClassTransformation.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import javassist.CtBehavior;
-import org.apache.tapestry.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.AnnotationProvider;
import org.slf4j.Logger;
import java.lang.annotation.Annotation;
@@ -24,7 +24,7 @@
/**
* Contains class-specific information used when transforming a raw component class into an executable component class.
* An executable class is one that has been transformed to work within Tapestry. This includes adding interfaces
- * ({@link org.apache.tapestry.runtime.Component}) but also transforming access to fields, based on annotations and
+ * ({@link org.apache.tapestry5.runtime.Component}) but also transforming access to fields, based on annotations and
* naming conventions. Most of the changes are provided by different implementations of {@link
* ComponentClassTransformWorker}.
* <p/>
@@ -44,9 +44,9 @@
* The majority of methods concern the <em>declared</em> members (field and methods) of a specific class, rather than
* any fields or methods inherited from a base class.
*
- * @see org.apache.tapestry.services.TapestryModule#contributeComponentClassTransformWorker(org.apache.tapestry.ioc.OrderedConfiguration,
- * org.apache.tapestry.ioc.ObjectLocator, InjectionProvider, Environment, ComponentClassResolver,
- * org.apache.tapestry.internal.services.RequestPageCache, BindingSource)
+ * @see org.apache.tapestry5.services.TapestryModule#contributeComponentClassTransformWorker(org.apache.tapestry5.ioc.OrderedConfiguration,
+ * org.apache.tapestry5.ioc.ObjectLocator, InjectionProvider, Environment, ComponentClassResolver,
+ * org.apache.tapestry5.internal.services.RequestPageCache, BindingSource)
*/
public interface ClassTransformation extends AnnotationProvider
{
@@ -237,7 +237,7 @@
*
* @param methodSignature the signature of the method to extend
* @param methodBody the body of code
- * @throws org.apache.tapestry.internal.services.MethodCompileException
+ * @throws org.apache.tapestry5.internal.services.MethodCompileException
* if the provided Javassist method body can not be compiled
* @see #extendExistingMethod(TransformMethodSignature, String)
*/
@@ -249,7 +249,7 @@
*
* @param methodSignature signature of the method to extend
* @param methodBody the body of code
- * @throws org.apache.tapestry.internal.services.MethodCompileException
+ * @throws org.apache.tapestry5.internal.services.MethodCompileException
* if the provided method body can not be compiled
* @see #prefixMethod(TransformMethodSignature, String)
*/
@@ -268,13 +268,13 @@
*
* @param methodSignature
* @param methodBody
- * @throws org.apache.tapestry.internal.services.MethodCompileException
+ * @throws org.apache.tapestry5.internal.services.MethodCompileException
* if the provided method body can not be compiled
*/
void prefixMethod(TransformMethodSignature methodSignature, String methodBody);
/**
- * Returns the name of a field that provides the {@link org.apache.tapestry.ComponentResources} for the transformed
+ * Returns the name of a field that provides the {@link org.apache.tapestry5.ComponentResources} for the transformed
* component. This will be a protected field, accessible to the class and subclasses.
*
* @return name of field
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathAssetAliasManager.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathAssetAliasManager.java
index bdbe1c5..99f8dd7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathAssetAliasManager.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathAssetAliasManager.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
public interface ClasspathAssetAliasManager
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathProvider.java
index b56e7d7..e5c20d8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ClasspathProvider.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentClassResolver.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentClassResolver.java
index 9c91a8e..fd563d1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentClassResolver.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentClassResolver.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ioc.services.ClassNameLocator;
+import org.apache.tapestry5.ioc.services.ClassNameLocator;
/**
* Resolves page names and component types to fully qualified class names. Pages and components may be provided by the
@@ -22,7 +22,7 @@
* appear in component template (when specifying the type of an embedded component).
* <p/>
* The service is configured using a collection of {@link LibraryMapping}s. Each mapping maps a prefix, such as "core"
- * to a root package name, such as "org.apache.tapestry.corelib". The root package is expected to have sub-packages:
+ * to a root package name, such as "org.apache.tapestry5.corelib". The root package is expected to have sub-packages:
* "pages", "components", "mixins" and "base" ("base" is for base classes).
* <p/>
* The resolver performs a search of the classpath (via {@link ClassNameLocator}), to build up a set of case-insensitive
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentClassTransformWorker.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentClassTransformWorker.java
index d5376d6..7b5c94e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentClassTransformWorker.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentClassTransformWorker.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.model.MutableComponentModel;
+import org.apache.tapestry5.model.MutableComponentModel;
/**
* Interface for a set of objects that can perform component class transformations. Implementations should be
* multithreaded, ideally they should be stateless (all necessary state can be stored in the {@link
- * org.apache.tapestry.services.ClassTransformation}).
+ * org.apache.tapestry5.services.ClassTransformation}).
*/
public interface ComponentClassTransformWorker
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentDefaultProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentDefaultProvider.java
index 7859300..9a031e5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentDefaultProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentDefaultProvider.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.*;
+import org.apache.tapestry5.*;
/**
* A service that can be injected into a component to provide common defaults for various types of parameters.
@@ -46,7 +46,7 @@
* based on type.
*
* @param parameterName the name of the parameter whose type is used to locate a {@link
- * org.apache.tapestry.services.ValueEncoderFactory}
+ * org.apache.tapestry5.services.ValueEncoderFactory}
* @param resources the resources of the component, from which parameter and its type are extracted
* @return the value encoder, or null if the type of the parameter is not known
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestFilter.java
index a4912cf..2acec7a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestFilter.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.io.IOException;
/**
* Filter interface for {@link ComponentEventRequestHandler}.
*
- * @see org.apache.tapestry.services.TapestryModule#contributeComponentEventRequestHandler(org.apache.tapestry.ioc.OrderedConfiguration,
- * org.apache.tapestry.internal.services.RequestEncodingInitializer, ComponentEventRequestHandler ,
- * org.apache.tapestry.ioc.ObjectLocator) }
+ * @see org.apache.tapestry5.services.TapestryModule#contributeComponentEventRequestHandler(org.apache.tapestry5.ioc.OrderedConfiguration,
+ * org.apache.tapestry5.internal.services.RequestEncodingInitializer, ComponentEventRequestHandler ,
+ * org.apache.tapestry5.ioc.ObjectLocator) }
*/
public interface ComponentEventRequestFilter
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestHandler.java
index 959a2e3..f21a342 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestHandler.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.corelib.components.ActionLink;
-import org.apache.tapestry.corelib.components.Form;
+import org.apache.tapestry5.corelib.components.ActionLink;
+import org.apache.tapestry5.corelib.components.Form;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestParameters.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestParameters.java
index bfdcf7e..29709c7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestParameters.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventRequestParameters.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.EventContext;
-import org.apache.tapestry.ioc.internal.util.Defense;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.ioc.internal.util.Defense;
/**
* Encapsulates all the information that may be provided in a component event request URL.
@@ -92,7 +92,7 @@
/**
* The name of the page containing the component that was triggered. Usually this is the same as the active page,
- * but because of {@link org.apache.tapestry.Block} and similar constructs, a component from other than the active
+ * but because of {@link org.apache.tapestry5.Block} and similar constructs, a component from other than the active
* page may be rendered with the active page.
*/
public String getContainingPageName()
@@ -111,7 +111,7 @@
/**
* The type of event. When not specified in the URL, a default type of "action" ({@link
- * org.apache.tapestry.EventConstants#ACTION}) is provided.
+ * org.apache.tapestry5.EventConstants#ACTION}) is provided.
*/
public String getEventType()
{
@@ -121,8 +121,8 @@
/**
* The activation context for the <em>active page</em>, possibly empty (but not null).
*
- * @see org.apache.tapestry.ComponentResourcesCommon#triggerContextEvent(String, org.apache.tapestry.EventContext,
- * org.apache.tapestry.ComponentEventCallback)
+ * @see org.apache.tapestry5.ComponentResourcesCommon#triggerContextEvent(String, org.apache.tapestry5.EventContext,
+ * org.apache.tapestry5.ComponentEventCallback)
*/
public EventContext getPageActivationContext()
{
@@ -132,8 +132,8 @@
/**
* The event context information passed in the URL. Possibly empty (not not null).
*
- * @see org.apache.tapestry.ComponentResourcesCommon#triggerContextEvent(String, org.apache.tapestry.EventContext,
- * org.apache.tapestry.ComponentEventCallback)
+ * @see org.apache.tapestry5.ComponentResourcesCommon#triggerContextEvent(String, org.apache.tapestry5.EventContext,
+ * org.apache.tapestry5.ComponentEventCallback)
*/
public EventContext getEventContext()
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventResultProcessor.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventResultProcessor.java
index c49699c..0012069 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventResultProcessor.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentEventResultProcessor.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentLayer.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentLayer.java
index a194436..b872105 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentLayer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentLayer.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -24,8 +24,8 @@
/**
* Marker annotation used to identify a service from the component layer that conflicts, in terms of service interface,
* with a service from elsewhere. In particular, this is used to disambiguate {@link
- * org.apache.tapestry.ioc.services.ClassFactory} which has one implementation (marked with {@link
- * org.apache.tapestry.ioc.services.Builtin} and another with this annotation.
+ * org.apache.tapestry5.ioc.services.ClassFactory} which has one implementation (marked with {@link
+ * org.apache.tapestry5.ioc.services.Builtin} and another with this annotation.
*/
@Target(
{ PARAMETER, FIELD })
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMessagesSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMessagesSource.java
index 0319472..9726803 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMessagesSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMessagesSource.java
@@ -14,9 +14,9 @@
package org.apache.tapestry5.services;
-import org.apache.tapestry.internal.event.InvalidationEventHub;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.model.ComponentModel;
+import org.apache.tapestry5.internal.event.InvalidationEventHub;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.model.ComponentModel;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMethodAdvice.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMethodAdvice.java
index 9b7abb2..af41c10 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMethodAdvice.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMethodAdvice.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* An object that receives control around an "advised" method of a component. The advise can query or even replace
- * method parameters. After invoking {@link org.apache.tapestry.services.ComponentMethodInvocation#proceed()}, the
+ * method parameters. After invoking {@link org.apache.tapestry5.services.ComponentMethodInvocation#proceed()}, the
* advise may query and override thrown exceptions or the return value of the invocation.
*
* @see ClassTransformation#advise(TransformMethodSignature, ComponentMethodAdvice)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMethodInvocation.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMethodInvocation.java
index 14b3c1a..e33e5be 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMethodInvocation.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentMethodInvocation.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ioc.Invocation;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ioc.Invocation;
/**
* Encapsulates the parameters, thrown exceptions, and result of a method invocation, allowing a {@link
- * org.apache.tapestry.services.ComponentMethodAdvice} to encapsulate the invocation.
+ * org.apache.tapestry5.services.ComponentMethodAdvice} to encapsulate the invocation.
*/
public interface ComponentMethodInvocation extends Invocation
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentSource.java
index 250730c..ba422e9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ComponentSource.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.runtime.Component;
+import org.apache.tapestry5.runtime.Component;
/**
* Used by classes that need to retrieve a component by its complete id, or a page by its logical page name or root
@@ -24,14 +24,14 @@
public interface ComponentSource
{
/**
- * Gets a component by its {@linkplain org.apache.tapestry.ComponentResourcesCommon#getCompleteId() complete id}. If
+ * Gets a component by its {@linkplain org.apache.tapestry5.ComponentResourcesCommon#getCompleteId() complete id}. If
* the component id is for a mixin, then the mixin attached to the component will be returned. A mixin's complete id
* is its container's complete id, suffixed with "$" and the mixin's id (its simple class name).
*
* @param completeId complete component id (case insensitive)
* @return the component
* @throws IllegalArgumentException if the component can not be found
- * @see org.apache.tapestry.ComponentResourcesCommon#getCompleteId()
+ * @see org.apache.tapestry5.ComponentResourcesCommon#getCompleteId()
*/
Component getComponent(String completeId);
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/Context.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/Context.java
index ddd32bc..3b5a955 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Context.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Context.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.io.File;
import java.net.URL;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ContextProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ContextProvider.java
index a93eb84..90507d1 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ContextProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ContextProvider.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ContextValueEncoder.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ContextValueEncoder.java
index 222911e..60367d4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ContextValueEncoder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ContextValueEncoder.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Used to convert values used in event contexts to client string representations and back.
*
- * @See org.apache.tapestry.ValueEncoder
- * @see org.apache.tapestry.ioc.services.TypeCoercer
+ * @See org.apache.tapestry5.ValueEncoder
+ * @see org.apache.tapestry5.ioc.services.TypeCoercer
*/
public interface ContextValueEncoder
{
@@ -27,7 +27,7 @@
*
* @param value to convert (may not be null)
* @return string representation of the value
- * @see org.apache.tapestry.ValueEncoder#toClient(Object)
+ * @see org.apache.tapestry5.ValueEncoder#toClient(Object)
*/
String toClient(Object value);
@@ -37,7 +37,7 @@
* @param requiredType required type to convert the string to
* @param clientValue value obtained from context passed from client
* @return the client value converted or coerced into a server value
- * @see org.apache.tapestry.ValueEncoder#toValue(String)
+ * @see org.apache.tapestry5.ValueEncoder#toValue(String)
*/
<T> T toValue(Class<T> requiredType, String clientValue);
}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/Cookies.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/Cookies.java
index 36ee512..30adcc7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Cookies.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Cookies.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Used by other services to obtain cookie values for the current request.
@@ -28,7 +28,7 @@
/**
* Creates or updates a cookie value. The value is stored using a max age (in seconds) defined by the symbol
- * <code>org.apache.tapestry.default-cookie-max-age</code>. The factory default for this value is the equivalent of
+ * <code>org.apache.tapestry5.default-cookie-max-age</code>. The factory default for this value is the equivalent of
* one week.
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/Core.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/Core.java
index 7981870..d0c8d77 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Core.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Core.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/DataTypeAnalyzer.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/DataTypeAnalyzer.java
index 68b2d0e..5a76185 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/DataTypeAnalyzer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/DataTypeAnalyzer.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.corelib.components.BeanEditForm;
-import org.apache.tapestry.corelib.components.Grid;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
+import org.apache.tapestry5.corelib.components.BeanEditForm;
+import org.apache.tapestry5.corelib.components.Grid;
+import org.apache.tapestry5.ioc.services.PropertyAdapter;
/**
* Used by {@link BeanModelSource} to identify the type of data associated with a particular property (represented as a
@@ -30,7 +30,7 @@
* @see Grid
* @see BeanEditForm
* @see BeanBlockSource
- * @see org.apache.tapestry.services.TapestryModule#contributeDataTypeAnalyzer(org.apache.tapestry.ioc.OrderedConfiguration,
+ * @see org.apache.tapestry5.services.TapestryModule#contributeDataTypeAnalyzer(org.apache.tapestry5.ioc.OrderedConfiguration,
* DataTypeAnalyzer)
*/
public interface DataTypeAnalyzer
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/Dispatcher.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/Dispatcher.java
index 3207860..44b6af2 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Dispatcher.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Dispatcher.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.io.IOException;
@@ -20,9 +20,9 @@
* A dispatcher is responsible for recognizing an incoming request. Dispatchers form an ordered chain of command, with
* each dispatcher responsible for recognizing requests that it can process.
*
- * @see org.apache.tapestry.services.TapestryModule#contributeMasterDispatcher(org.apache.tapestry.ioc.OrderedConfiguration,
- * ClasspathAssetAliasManager, org.apache.tapestry.internal.services.ResourceCache,
- * org.apache.tapestry.internal.services.ResourceStreamer, PageRenderRequestHandler, ComponentEventRequestHandler,
+ * @see org.apache.tapestry5.services.TapestryModule#contributeMasterDispatcher(org.apache.tapestry5.ioc.OrderedConfiguration,
+ * ClasspathAssetAliasManager, org.apache.tapestry5.internal.services.ResourceCache,
+ * org.apache.tapestry5.internal.services.ResourceStreamer, PageRenderRequestHandler, ComponentEventRequestHandler,
* ComponentClassResolver, ContextValueEncoder, String)
*/
public interface Dispatcher
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/Environment.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/Environment.java
index 68efda8..3e307cc 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Environment.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Environment.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.util.NoSuchElementException;
@@ -24,8 +24,8 @@
* type. Most often, a stack has zero or one elements, but on occasion, a particular component will push an override
* onto the stack for the benefit of the components it encloses.
*
- * @see org.apache.tapestry.annotation.Environmental
- * @see org.apache.tapestry.services.EnvironmentalShadowBuilder
+ * @see org.apache.tapestry5.annotations.Environmental
+ * @see org.apache.tapestry5.services.EnvironmentalShadowBuilder
*/
public interface Environment
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/EnvironmentalShadowBuilder.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/EnvironmentalShadowBuilder.java
index e080cad..127541a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/EnvironmentalShadowBuilder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/EnvironmentalShadowBuilder.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.ioc.services.PropertyShadowBuilder;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.ioc.services.PropertyShadowBuilder;
/**
* Much like {@link PropertyShadowBuilder}, except that instead of accessing a property of some other service, it
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ExceptionReporter.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ExceptionReporter.java
index b037a81..5245ca6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ExceptionReporter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ExceptionReporter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Interface implemented by a page used for reporting exceptions.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/FieldFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/FieldFilter.java
index 9c1b1e4..ec6851c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/FieldFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/FieldFilter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Used by {@link ClassTransformation#findFields(FieldFilter)} to identify which fields to keep.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/FieldValidatorDefaultSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/FieldValidatorDefaultSource.java
index 1b81d8e..371d91d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/FieldValidatorDefaultSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/FieldValidatorDefaultSource.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.Messages;
import java.util.Locale;
@@ -29,7 +29,7 @@
{
/**
* Analyzes the property type and property annotations to determine the default set of validations for the property,
- * which are wrapped to form a {@link org.apache.tapestry.FieldValidator} for a field.
+ * which are wrapped to form a {@link org.apache.tapestry5.FieldValidator} for a field.
*
* @param field Field component for which a validator is being created
* @param overrideId the id of the component, used to locate related messages for labels and errors
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/FieldValidatorSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/FieldValidatorSource.java
index 5ec7399..578574b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/FieldValidatorSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/FieldValidatorSource.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.Validator;
-import org.apache.tapestry.corelib.components.BeanEditForm;
-import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.Validator;
+import org.apache.tapestry5.corelib.components.BeanEditForm;
+import org.apache.tapestry5.ioc.Messages;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/FormSupport.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/FormSupport.java
index ab2898a..44824fe 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/FormSupport.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/FormSupport.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ClientElement;
-import org.apache.tapestry.ComponentAction;
-import org.apache.tapestry.Field;
+import org.apache.tapestry5.ClientElement;
+import org.apache.tapestry5.ComponentAction;
+import org.apache.tapestry5.Field;
/**
* Services provided by an enclosing Form control component to the various form element components it encloses.
- * Implements {@link org.apache.tapestry.ClientElement}, to share the id of the enclosing form.
+ * Implements {@link org.apache.tapestry5.ClientElement}, to share the id of the enclosing form.
*
- * @see org.apache.tapestry.Field
+ * @see org.apache.tapestry5.Field
*/
public interface FormSupport extends ClientElement
{
@@ -41,7 +41,7 @@
<T> void store(T component, ComponentAction<T> action);
/**
- * As with {@link #store(Object, org.apache.tapestry.ComponentAction)}}, but the action is also invoked immediately.
+ * As with {@link #store(Object, org.apache.tapestry5.ComponentAction)}}, but the action is also invoked immediately.
* This is useful for defining an action that should occur symmetrically in both the render request and the form
* submission's action request.
*
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/Heartbeat.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/Heartbeat.java
index cf8e0eb..c3e0b7e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Heartbeat.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Heartbeat.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Allows for deferred execution of logic, useful when trying to get multiple components to coordinate behavior. A
@@ -20,7 +20,7 @@
* is a Label and the field it labels; since we don't know which order the two will render, we can't tell if the field's
* id is correct until after both have rendered.
* <p/>
- * The Heartbeat is injected into components via the {@link org.apache.tapestry.annotation.Environmental} annotation.
+ * The Heartbeat is injected into components via the {@link org.apache.tapestry5.annotations.Environmental} annotation.
*/
public interface Heartbeat
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/HttpServletRequestFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/HttpServletRequestFilter.java
index 4780cfa..4020b1b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/HttpServletRequestFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/HttpServletRequestFilter.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
- * Filter interface for {@link org.apache.tapestry.services.HttpServletRequestHandler}.
+ * Filter interface for {@link org.apache.tapestry5.services.HttpServletRequestHandler}.
*/
public interface HttpServletRequestFilter
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/HttpServletRequestHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/HttpServletRequestHandler.java
index b0f5eb6..be91984 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/HttpServletRequestHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/HttpServletRequestHandler.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -21,7 +21,7 @@
/**
* Service interface for the HttpServletRequestHandler pipeline service.
*
- * @see org.apache.tapestry.services.HttpServletRequestFilter
+ * @see org.apache.tapestry5.services.HttpServletRequestFilter
*/
public interface HttpServletRequestHandler
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/InjectionProvider.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/InjectionProvider.java
index 6d3b6de..cba4524 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/InjectionProvider.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/InjectionProvider.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.model.MutableComponentModel;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.model.MutableComponentModel;
/**
- * Provides some form of injection when the value for an {@link org.apache.tapestry.ioc.annotation.Inject} annotation is
+ * Provides some form of injection when the value for an {@link org.apache.tapestry5.ioc.annotations.Inject} annotation is
* present. In this case, the provider is responsible for determining the value to be injected from the field name and
* field type.
* <p/>
- * This interface will be used as part of a {@link org.apache.tapestry.ioc.services.ChainBuilder chain of command}.
+ * This interface will be used as part of a {@link org.apache.tapestry5.ioc.services.ChainBuilder chain of command}.
*/
public interface InjectionProvider
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/LibraryMapping.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/LibraryMapping.java
index ebe4fd6..9d52258 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/LibraryMapping.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/LibraryMapping.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Used to configure the {@link ComponentClassResolver}, to allow it to map prefixes to library root packages (the
@@ -24,7 +24,7 @@
* <dt>components</dt> <dd>contains components</dd> <dt>mixins</dt> <dd>contains component mixins</dd> <dt>base</dt>
* <dd>contains base classes</dd> </dl>
*
- * @see org.apache.tapestry.services.TapestryModule#contributeComponentClassResolver(org.apache.tapestry.ioc.Configuration)
+ * @see org.apache.tapestry5.services.TapestryModule#contributeComponentClassResolver(org.apache.tapestry5.ioc.Configuration)
*/
public final class LibraryMapping
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupRenderer.java
index 45b6525..1b71ca3 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupRenderer.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry5.MarkupWriter;
/**
* An object which will perform rendering of a page (or portion of a page). This interface exists to be filtered via
- * {@link org.apache.tapestry.services.MarkupRendererFilter}.
+ * {@link org.apache.tapestry5.services.MarkupRendererFilter}.
* <p/>
- * The MarkupRenderer service takes an ordered configuration of {@link org.apache.tapestry.services.MarkupRendererFilter}s,
- * which are used for ordinary page rendering (as opposed to {@linkplain org.apache.tapestry.services.PartialMarkupRenderer
+ * The MarkupRenderer service takes an ordered configuration of {@link org.apache.tapestry5.services.MarkupRendererFilter}s,
+ * which are used for ordinary page rendering (as opposed to {@linkplain org.apache.tapestry5.services.PartialMarkupRenderer
* partial page rendering} for Ajax requests). The MarkupRenderer service may be selected using the {@link
- * org.apache.tapestry.ioc.annotation.Primary} marker annotation.
+ * org.apache.tapestry5.ioc.annotations.Primary} marker annotation.
*/
public interface MarkupRenderer
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupRendererFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupRendererFilter.java
index 0bc6d38..953240e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupRendererFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupRendererFilter.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry5.MarkupWriter;
/**
- * Filter interface for {@link org.apache.tapestry.services.MarkupRenderer}, which allows for code to execute before
+ * Filter interface for {@link org.apache.tapestry5.services.MarkupRenderer}, which allows for code to execute before
* and/or after the main rendering process. Typically, this is to allow for the placement of {@linkplain
- * org.apache.tapestry.services.Environment environmental services}.
+ * org.apache.tapestry5.services.Environment environmental services}.
*
- * @see org.apache.tapestry.services.TapestryModule#contributeMarkupRenderer(org.apache.tapestry.ioc.OrderedConfiguration,
- * org.apache.tapestry.Asset, org.apache.tapestry.Asset, ValidationMessagesSource,
- * org.apache.tapestry.ioc.services.SymbolSource, AssetSource)
+ * @see org.apache.tapestry5.services.TapestryModule#contributeMarkupRenderer(org.apache.tapestry5.ioc.OrderedConfiguration,
+ * org.apache.tapestry5.Asset, org.apache.tapestry5.Asset, ValidationMessagesSource,
+ * org.apache.tapestry5.ioc.services.SymbolSource, AssetSource)
*/
public interface MarkupRendererFilter
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupWriterFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupWriterFactory.java
index 0eb0eff..1c5f115 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupWriterFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/MarkupWriterFactory.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ContentType;
-import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.MarkupWriter;
/**
- * Source for {@link org.apache.tapestry.MarkupWriter} instances.
+ * Source for {@link org.apache.tapestry5.MarkupWriter} instances.
*/
public interface MarkupWriterFactory
{
@@ -26,7 +26,7 @@
* Creates a markup writer for a particular content type.
*
* @param contentType type of content generated by the markup write; used to control the type of {@link
- * org.apache.tapestry.dom.MarkupModel} used with the {@link org.apache.tapestry.dom.Document}
+ * org.apache.tapestry5.dom.MarkupModel} used with the {@link org.apache.tapestry5.dom.Document}
* the backs the markup writer.
*/
MarkupWriter newMarkupWriter(ContentType contentType);
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/MetaDataLocator.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/MetaDataLocator.java
index d6e967a..cfeba71 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/MetaDataLocator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/MetaDataLocator.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ComponentResources;
+import org.apache.tapestry5.ComponentResources;
/**
* Used to lookup meta data concerning a particular component. The primary source of meta data is the meta data defined
- * for the component, accessed via {@link org.apache.tapestry.model.ComponentModel#getMeta(String)}. This includes meta
+ * for the component, accessed via {@link org.apache.tapestry5.model.ComponentModel#getMeta(String)}. This includes meta
* data defined by base classes. When meta-data for a particular component can not be found, a search works up the
* containment hierarchy (to the component's container, and the container's container, and so on). If <em>that</em>
* proves unfruitful, a system of defaults is provided by configuration and matched against the containing page's
* logical name.
* <p/>
- * Finally, if no metadata is available, then {@link org.apache.tapestry.ioc.services.SymbolSource#valueForSymbol(String)}
+ * Finally, if no metadata is available, then {@link org.apache.tapestry5.ioc.services.SymbolSource#valueForSymbol(String)}
* is used to obtain a value.
*/
public interface MetaDataLocator
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/MethodFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/MethodFilter.java
index c23f4db..206272c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/MethodFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/MethodFilter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Used by {@link ClassTransformation#findMethods(MethodFilter)} to accept or reject each method.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/NullFieldStrategySource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/NullFieldStrategySource.java
index f789b36..223f85c 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/NullFieldStrategySource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/NullFieldStrategySource.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.NullFieldStrategy;
+import org.apache.tapestry5.NullFieldStrategy;
/**
- * A source for {@link org.apache.tapestry.NullFieldStrategy} instances based on a logical name.
+ * A source for {@link org.apache.tapestry5.NullFieldStrategy} instances based on a logical name.
*
- * @see TapestryModule#contributeNullFieldStrategySource(org.apache.tapestry.ioc.MappedConfiguration)
+ * @see TapestryModule#contributeNullFieldStrategySource(org.apache.tapestry5.ioc.MappedConfiguration)
*/
public interface NullFieldStrategySource
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ObjectRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ObjectRenderer.java
index e870179..3d06de0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ObjectRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ObjectRenderer.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry5.MarkupWriter;
/**
* A strategy interface used for converting an object into markup that describes that object. This is primarily used in
- * terms of an {@link org.apache.tapestry.services.ExceptionReporter} page.
+ * terms of an {@link org.apache.tapestry5.services.ExceptionReporter} page.
*/
public interface ObjectRenderer<T>
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestFilter.java
index 19279d1..8a4bca6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestFilter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestHandler.java
index bf0d9c3..199d48d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestHandler.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.io.IOException;
@@ -25,7 +25,7 @@
{
/**
* Invoked to activate and render a page. In certain cases, based on values returned when activating the page, a
- * {@link org.apache.tapestry.services.ComponentEventResultProcessor} may be used to send an alternate response
+ * {@link org.apache.tapestry5.services.ComponentEventResultProcessor} may be used to send an alternate response
* (typically, a redirect).
*
* @param parameters defines the page name and activation context
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java
index 4a0e332..5104c1a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/PageRenderRequestParameters.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.EventContext;
-import org.apache.tapestry.ioc.internal.util.Defense;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.ioc.internal.util.Defense;
/**
- * Used with {@link org.apache.tapestry.services.PageRenderRequestHandler} and {@link
- * org.apache.tapestry.services.PageRenderRequestFilter} to define the logical page name and activation context for the
+ * Used with {@link org.apache.tapestry5.services.PageRenderRequestHandler} and {@link
+ * org.apache.tapestry5.services.PageRenderRequestFilter} to define the logical page name and activation context for the
* request.
*/
public class PageRenderRequestParameters
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/PartialMarkupRenderer.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/PartialMarkupRenderer.java
index 2576300..38aaf56 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/PartialMarkupRenderer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/PartialMarkupRenderer.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry5.MarkupWriter;
import org.apache.tapestry5.json.JSONObject;
/**
@@ -24,7 +24,7 @@
* <p/>
* <p/>
* The PartialMarkupRenderer service takes an ordered configuration of {@link PartialMarkupRendererFilter}s. It can be
- * selected using the {@link org.apache.tapestry.ioc.annotation.Primary} marker annotation.
+ * selected using the {@link org.apache.tapestry5.ioc.annotations.Primary} marker annotation.
*/
public interface PartialMarkupRenderer
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/PartialMarkupRendererFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/PartialMarkupRendererFilter.java
index c3ffa5c..9567faf 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/PartialMarkupRendererFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/PartialMarkupRendererFilter.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry5.MarkupWriter;
import org.apache.tapestry5.json.JSONObject;
/**
* A filter (the main interface being {@link PartialMarkupRenderer}) applied when performing a partial page render as
- * part of an Ajax-oriented request. This is similar to {@link org.apache.tapestry.services.MarkupRendererFilter} and
- * filters are often in place so as to contribute {@link org.apache.tapestry.annotation.Environmental} services to the
+ * part of an Ajax-oriented request. This is similar to {@link org.apache.tapestry5.services.MarkupRendererFilter} and
+ * filters are often in place so as to contribute {@link org.apache.tapestry5.annotations.Environmental} services to the
* pages and components that render.
*
- * @see org.apache.tapestry.services.TapestryModule#contributePartialMarkupRenderer(org.apache.tapestry.ioc.OrderedConfiguration,
- * org.apache.tapestry.Asset, ValidationMessagesSource, org.apache.tapestry.ioc.services.SymbolSource,
+ * @see org.apache.tapestry5.services.TapestryModule#contributePartialMarkupRenderer(org.apache.tapestry5.ioc.OrderedConfiguration,
+ * org.apache.tapestry5.Asset, ValidationMessagesSource, org.apache.tapestry5.ioc.services.SymbolSource,
* AssetSource)
*/
public interface PartialMarkupRendererFilter
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentFieldBundle.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentFieldBundle.java
index 073a030..fe91062 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentFieldBundle.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentFieldBundle.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Encapsulates persisted property information for an entire page.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentFieldChange.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentFieldChange.java
index 4b7a6d7..a8b02e8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentFieldChange.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentFieldChange.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
/**
* Represents a previously stored change to a persistent field, within the context of a particular page of the
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentFieldStrategy.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentFieldStrategy.java
index c83c3c8..9955643 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentFieldStrategy.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentFieldStrategy.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.util.Collection;
/**
* Defines how changes to fields (within components, within pages) may have their values persisted between requests.
- * Different implementations store the field values {@linkplain org.apache.tapestry.internal.services.SessionPersistentFieldStrategy
- * in the session}, {@linkplain org.apache.tapestry.internal.services.ClientPersistentFieldStrategy on the client}, or
+ * Different implementations store the field values {@linkplain org.apache.tapestry5.internal.services.SessionPersistentFieldStrategy
+ * in the session}, {@linkplain org.apache.tapestry5.internal.services.ClientPersistentFieldStrategy on the client}, or
* elsewhere.
*/
public interface PersistentFieldStrategy
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentLocale.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentLocale.java
index b2686fa..6e2f55d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentLocale.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/PersistentLocale.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/PropertyConduitSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/PropertyConduitSource.java
index 8729327..415419b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/PropertyConduitSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/PropertyConduitSource.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.PropertyConduit;
+import org.apache.tapestry5.PropertyConduit;
/**
- * A source for {@link org.apache.tapestry.PropertyConduit}s, which can be thought of as a compiled property path
+ * A source for {@link org.apache.tapestry5.PropertyConduit}s, which can be thought of as a compiled property path
* expression. PropertyConduits are the basis of the "prop:" binding factory, thus this service defines the expression
- * format used by the {@link org.apache.tapestry.internal.bindings.PropBindingFactory}.
+ * format used by the {@link org.apache.tapestry5.internal.bindings.PropBindingFactory}.
* <p/>
* The expression consist of one or more terms, seperated by periods. Each term may be either the name of a JavaBean
* property, or the name of a method (a method that takes no parameters). Method names are distinguished from property
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/PropertyEditContext.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/PropertyEditContext.java
index 43f1121..429f602 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/PropertyEditContext.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/PropertyEditContext.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.Translator;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.Translator;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.Messages;
/**
- * Defines a context for editing a property of a bean via {@link org.apache.tapestry.corelib.components.BeanEditor}.
- * This value is made available to blocks via the {@link org.apache.tapestry.annotation.Environmental} annotation.
+ * Defines a context for editing a property of a bean via {@link org.apache.tapestry5.corelib.components.BeanEditor}.
+ * This value is made available to blocks via the {@link org.apache.tapestry5.annotations.Environmental} annotation.
*
- * @see org.apache.tapestry.services.BeanBlockSource
+ * @see org.apache.tapestry5.services.BeanBlockSource
*/
public interface PropertyEditContext extends AnnotationProvider
{
@@ -42,7 +42,7 @@
void setPropertyValue(Object value);
/**
- * Returns the user-presentable label, for use with the {@link org.apache.tapestry.corelib.components.Label}
+ * Returns the user-presentable label, for use with the {@link org.apache.tapestry5.corelib.components.Label}
* component, or to be integrated into any validation error messages.
*/
String getLabel();
@@ -57,8 +57,8 @@
/**
* Returns the FieldValidator for the field.
*
- * @see org.apache.tapestry.beaneditor.Validate
- * @see org.apache.tapestry.services.FieldValidatorDefaultSource
+ * @see org.apache.tapestry5.beaneditor.Validate
+ * @see org.apache.tapestry5.services.FieldValidatorDefaultSource
*/
FieldValidator getValidator(Field field);
@@ -74,7 +74,7 @@
Class getPropertyType();
/**
- * Returns the message catalog for the container of the {@link org.apache.tapestry.corelib.components.BeanEditForm},
+ * Returns the message catalog for the container of the {@link org.apache.tapestry5.corelib.components.BeanEditForm},
* which is the correct place to look for strings used for labels, etc.
*/
Messages getContainerMessages();
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/PropertyOutputContext.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/PropertyOutputContext.java
index 766f99f..4f34767 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/PropertyOutputContext.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/PropertyOutputContext.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.corelib.components.Grid;
-import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry5.corelib.components.Grid;
+import org.apache.tapestry5.ioc.Messages;
/**
* Provides context information needed when displaying a value. This interface is an integral part of the {@link Grid}
* and similar output components. It is made available to components via an {@link
- * org.apache.tapestry.annotation.Environmental} annotation.
+ * org.apache.tapestry5.annotations.Environmental} annotation.
*/
public interface PropertyOutputContext
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/Request.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/Request.java
index 077d703..f201aaf 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Request.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Request.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.util.List;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestExceptionHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestExceptionHandler.java
index 861bf64..3916377 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestExceptionHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestExceptionHandler.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestFilter.java
index 3192e24..8e6b4af 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestFilter.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.io.IOException;
/**
- * Filter interface for {@link org.apache.tapestry.services.RequestHandler}. Implementations of this interface may be
+ * Filter interface for {@link org.apache.tapestry5.services.RequestHandler}. Implementations of this interface may be
* contributed into the RequestHandler service configuration.
*
- * @see org.apache.tapestry.services.TapestryModule#contributeRequestHandler(org.apache.tapestry.ioc.OrderedConfiguration,
- * Context, RequestExceptionHandler, long, long, org.apache.tapestry.internal.services.LocalizationSetter,
+ * @see org.apache.tapestry5.services.TapestryModule#contributeRequestHandler(org.apache.tapestry5.ioc.OrderedConfiguration,
+ * Context, RequestExceptionHandler, long, long, org.apache.tapestry5.internal.services.LocalizationSetter,
* RequestFilter)
*/
public interface RequestFilter
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java
index 3a02c4a..9a59ff5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestGlobals.java
@@ -14,8 +14,8 @@
package org.apache.tapestry5.services;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Response;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestHandler.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestHandler.java
index e9fe547..f54567a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestHandler.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/RequestHandler.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.io.IOException;
@@ -20,7 +20,7 @@
* Service interface for the RequestHandler pipeline service. An ordered configuration of filters may be contributed to
* the service.
*
- * @see org.apache.tapestry.services.RequestFilter
+ * @see org.apache.tapestry5.services.RequestFilter
*/
public interface RequestHandler
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ResourceDigestGenerator.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ResourceDigestGenerator.java
index b49f5d2..97b70fb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ResourceDigestGenerator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ResourceDigestGenerator.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.internal.services.ClasspathAssetFactory;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.internal.services.ClasspathAssetFactory;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
import java.net.URL;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/Response.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/Response.java
index 1509dbb..628aa22 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Response.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Response.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.Link;
+import org.apache.tapestry5.Link;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ServletApplicationInitializer.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ServletApplicationInitializer.java
index 34e1639..f2659a9 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ServletApplicationInitializer.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ServletApplicationInitializer.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import javax.servlet.ServletContext;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ServletApplicationInitializerFilter.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ServletApplicationInitializerFilter.java
index 45383cc..618dd88 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ServletApplicationInitializerFilter.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ServletApplicationInitializerFilter.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import javax.servlet.ServletContext;
/**
- * Filter interface for {@link org.apache.tapestry.services.ServletApplicationInitializer}.
+ * Filter interface for {@link org.apache.tapestry5.services.ServletApplicationInitializer}.
*
- * @see org.apache.tapestry.services.ServletApplicationInitializer
+ * @see org.apache.tapestry5.services.ServletApplicationInitializer
*/
public interface ServletApplicationInitializerFilter
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/Session.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/Session.java
index b14a476..58ed263 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Session.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Session.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import javax.servlet.http.HttpSession;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
index f22a188..8e0f8ae 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
@@ -12,39 +12,39 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.*;
-import org.apache.tapestry.beaneditor.Validate;
-import org.apache.tapestry.corelib.data.BlankOption;
-import org.apache.tapestry.corelib.data.GridPagerPosition;
-import org.apache.tapestry.corelib.data.InsertPosition;
-import org.apache.tapestry.grid.GridDataSource;
-import org.apache.tapestry.internal.*;
-import org.apache.tapestry.internal.beaneditor.PrimitiveFieldConstraintGenerator;
-import org.apache.tapestry.internal.beaneditor.ValidateAnnotationConstraintGenerator;
-import org.apache.tapestry.internal.bindings.*;
-import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.internal.grid.CollectionGridDataSource;
-import org.apache.tapestry.internal.grid.NullDataSource;
-import org.apache.tapestry.internal.renderers.*;
-import org.apache.tapestry.internal.services.*;
-import org.apache.tapestry.internal.transform.*;
-import org.apache.tapestry.internal.translator.*;
-import org.apache.tapestry.internal.util.IntegerRange;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotation.*;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.IdAllocator;
-import org.apache.tapestry.ioc.services.*;
-import org.apache.tapestry.ioc.util.StrategyRegistry;
-import org.apache.tapestry.ioc.util.TimeInterval;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.ComponentResourcesAware;
-import org.apache.tapestry.runtime.RenderCommand;
-import org.apache.tapestry.util.StringToEnumCoercion;
-import org.apache.tapestry.validator.*;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.beaneditor.Validate;
+import org.apache.tapestry5.corelib.data.BlankOption;
+import org.apache.tapestry5.corelib.data.GridPagerPosition;
+import org.apache.tapestry5.corelib.data.InsertPosition;
+import org.apache.tapestry5.grid.GridDataSource;
+import org.apache.tapestry5.internal.*;
+import org.apache.tapestry5.internal.beaneditor.PrimitiveFieldConstraintGenerator;
+import org.apache.tapestry5.internal.beaneditor.ValidateAnnotationConstraintGenerator;
+import org.apache.tapestry5.internal.bindings.*;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.internal.grid.CollectionGridDataSource;
+import org.apache.tapestry5.internal.grid.NullDataSource;
+import org.apache.tapestry5.internal.renderers.*;
+import org.apache.tapestry5.internal.services.*;
+import org.apache.tapestry5.internal.transform.*;
+import org.apache.tapestry5.internal.translator.*;
+import org.apache.tapestry5.internal.util.IntegerRange;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.annotations.*;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.IdAllocator;
+import org.apache.tapestry5.ioc.services.*;
+import org.apache.tapestry5.ioc.util.StrategyRegistry;
+import org.apache.tapestry5.ioc.util.TimeInterval;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.ComponentResourcesAware;
+import org.apache.tapestry5.runtime.RenderCommand;
+import org.apache.tapestry5.util.StringToEnumCoercion;
+import org.apache.tapestry5.validator.*;
import org.apache.tapestry5.json.JSONObject;
import org.apache.tapestry5.services.*;
import org.slf4j.Logger;
@@ -260,7 +260,7 @@
// For scriptaculous, etc., this version is not the version of the library, but the version
// bundled with Tapestry.
- configuration.add("tapestry/" + version, "org/apache/tapestry");
+ configuration.add("tapestry/" + version, "org/apache/tapestry5");
configuration.add("scriptaculous/" + version, scriptaculousPath);
@@ -269,36 +269,36 @@
public static void contributeComponentClassResolver(Configuration<LibraryMapping> configuration)
{
- configuration.add(new LibraryMapping("core", "org.apache.tapestry.corelib"));
+ configuration.add(new LibraryMapping("core", "org.apache.tapestry5.corelib"));
}
/**
* Adds a number of standard component class transform workers: <dl> <dt>Retain </dt> <dd>Allows fields to retain
* their values between requests</dd> <dt>Persist </dt> <dd>Allows fields to store their their value persistently
* between requests</dd> <dt>Parameter </dt> <dd>Identifies parameters based on the {@link
- * org.apache.tapestry.annotation.Parameter} annotation</dd> <dt>Component </dt> <dd>Defines embedded components
- * based on the {@link org.apache.tapestry.annotation.Component} annotation</dd> <dt>Mixin </dt> <dd>Adds a mixin as
+ * org.apache.tapestry5.annotations.Parameter} annotation</dd> <dt>Component </dt> <dd>Defines embedded components
+ * based on the {@link org.apache.tapestry5.annotations.Component} annotation</dd> <dt>Mixin </dt> <dd>Adds a mixin as
* part of a component's implementation</dd> <dt>Environment </dt> <dd>Allows fields to contain values extracted
- * from the {@link org.apache.tapestry.services.Environment} service</dd> <dt>Inject </dt> <dd>Used with the {@link
- * org.apache.tapestry.ioc.annotation.Inject} annotation, when a value is supplied</dd> <dt>InjectPage</dt> <dd>Adds
- * code to allow access to other pages via the {@link org.apache.tapestry.annotation.InjectPage} field
+ * from the {@link org.apache.tapestry5.services.Environment} service</dd> <dt>Inject </dt> <dd>Used with the {@link
+ * org.apache.tapestry5.ioc.annotations.Inject} annotation, when a value is supplied</dd> <dt>InjectPage</dt> <dd>Adds
+ * code to allow access to other pages via the {@link org.apache.tapestry5.annotations.InjectPage} field
* annotation</dd> <dt>InjectBlock </dt> <dd>Allows a block from the template to be injected into a field</dd>
- * <dt>IncludeStylesheet </dt> <dd>Supports the {@link org.apache.tapestry.annotation.IncludeStylesheet}
- * annotation</dd> <dt>IncludeJavaScriptLibrary </dt> <dd>Supports the {@link org.apache.tapestry.annotation.IncludeJavaScriptLibrary}
+ * <dt>IncludeStylesheet </dt> <dd>Supports the {@link org.apache.tapestry5.annotations.IncludeStylesheet}
+ * annotation</dd> <dt>IncludeJavaScriptLibrary </dt> <dd>Supports the {@link org.apache.tapestry5.annotations.IncludeJavaScriptLibrary}
* annotation</dd> <dt>SupportsInformalParameters </dt> <dd>Checks for the annotation</dd> <dt>Meta </dt> <dd>Checks
* for meta data and adds it to the component model</dd> <dt>ApplicationState </dt> <dd>Converts fields that
* reference application state objects <dt>UnclaimedField </dt> <dd>Identifies unclaimed fields and resets them to
* null/0/false at the end of the request</dd> <dt>RenderCommand </dt> <dd>Ensures all components also implement
- * {@link org.apache.tapestry.runtime.RenderCommand}</dd> <dt>SetupRender, BeginRender, etc. </dt> <dd>Correspond to
+ * {@link org.apache.tapestry5.runtime.RenderCommand}</dd> <dt>SetupRender, BeginRender, etc. </dt> <dd>Correspond to
* component render phases and annotations</dd> <dt>InvokePostRenderCleanupOnResources </dt> <dd>Makes sure {@link
- * org.apache.tapestry.internal.InternalComponentResources#postRenderCleanup()} is invoked after a component
- * finishes rendering</dd> <dt>Secure</dt> <dd>Checks for the {@link org.apache.tapestry.annotation.Secure}
- * annotation</dd> <dt>ContentType</dt> <dd>Checks for {@link org.apache.tapestry.annotation.ContentType}
- * annotation</dd> <dt>ResponseEncoding</dt> <dd>Checks for the {@link org.apache.tapestry.annotation.ResponseEncoding}
+ * org.apache.tapestry5.internal.InternalComponentResources#postRenderCleanup()} is invoked after a component
+ * finishes rendering</dd> <dt>Secure</dt> <dd>Checks for the {@link org.apache.tapestry5.annotations.Secure}
+ * annotation</dd> <dt>ContentType</dt> <dd>Checks for {@link org.apache.tapestry5.annotations.ContentType}
+ * annotation</dd> <dt>ResponseEncoding</dt> <dd>Checks for the {@link org.apache.tapestry5.annotations.ResponseEncoding}
* annotation</dd> <dt>GenerateAccessors</dt> <dd>Generates accessor methods if {@link
- * org.apache.tapestry.annotation.Property} annotation is present </dd> <dt>Cached</dt> <dd>Checks for the {@link
- * org.apache.tapestry.annotation.Cached} annotation</dd><dt>Log</dt> <dd>Checks for the {@link
- * org.apache.tapestry.annotation.Log} annotation</dd></dl>
+ * org.apache.tapestry5.annotations.Property} annotation is present </dd> <dt>Cached</dt> <dd>Checks for the {@link
+ * org.apache.tapestry5.annotations.Cached} annotation</dd><dt>Log</dt> <dd>Checks for the {@link
+ * org.apache.tapestry5.annotations.Log} annotation</dd></dl>
*/
public static void contributeComponentClassTransformWorker(
OrderedConfiguration<ComponentClassTransformWorker> configuration,
@@ -386,9 +386,9 @@
}
/**
- * <dl> <dt>Annotation</dt> <dd>Checks for {@link org.apache.tapestry.beaneditor.DataType} annotation</dd>
- * <dt>Default (ordered last)</dt> <dd>{@link org.apache.tapestry.internal.services.DefaultDataTypeAnalyzer}
- * service ({@link #contributeDefaultDataTypeAnalyzer(org.apache.tapestry.ioc.MappedConfiguration)} })</dd> </dl>
+ * <dl> <dt>Annotation</dt> <dd>Checks for {@link org.apache.tapestry5.beaneditor.DataType} annotation</dd>
+ * <dt>Default (ordered last)</dt> <dd>{@link org.apache.tapestry5.internal.services.DefaultDataTypeAnalyzer}
+ * service ({@link #contributeDefaultDataTypeAnalyzer(org.apache.tapestry5.ioc.MappedConfiguration)} })</dd> </dl>
*/
public static void contributeDataTypeAnalyzer(OrderedConfiguration<DataTypeAnalyzer> configuration,
@InjectService("DefaultDataTypeAnalyzer")
@@ -556,8 +556,8 @@
* Continues a number of filters into the RequestHandler service: <dl> <dt>StaticFiles</dt> <dd>Checks to see if the
* request is for an actual file, if so, returns true to let the servlet container process the request</dd>
* <dt>CheckForUpdates</dt> <dd>Periodically fires events that checks to see if the file system sources for any
- * cached data has changed (see {@link org.apache.tapestry.internal.services.CheckForUpdatesFilter}).
- * <dt>ErrorFilter</dt> <dd>Catches request errors and lets the {@link org.apache.tapestry.services.RequestExceptionHandler}
+ * cached data has changed (see {@link org.apache.tapestry5.internal.services.CheckForUpdatesFilter}).
+ * <dt>ErrorFilter</dt> <dd>Catches request errors and lets the {@link org.apache.tapestry5.services.RequestExceptionHandler}
* handle them</dd> <dt>Localization</dt> <dd>Determines the locale for the current request from header data or
* cookies in the request</dd> <dt>StoreIntoGlobals</dt> <dd>Stores the request and response into the {@link
* org.apache.tapestry5.services.RequestGlobals} service (this is repeated at the end of the pipeline, in case any
@@ -618,12 +618,12 @@
}
/**
- * Adds coercions: <ul> <li>String to {@link org.apache.tapestry.SelectModel} <li>String to {@link
- * org.apache.tapestry.corelib.data.InsertPosition} <li>Map to {@link org.apache.tapestry.SelectModel}
- * <li>Collection to {@link GridDataSource} <li>null to {@link org.apache.tapestry.grid.GridDataSource} <li>String
- * to {@link org.apache.tapestry.corelib.data.GridPagerPosition} <li>List to {@link org.apache.tapestry.SelectModel}
- * <li>{@link org.apache.tapestry.runtime.ComponentResourcesAware} (typically, a component) to {@link
- * org.apache.tapestry.ComponentResources} <li>String to {@link org.apache.tapestry.corelib.data.BlankOption} </ul>
+ * Adds coercions: <ul> <li>String to {@link org.apache.tapestry5.SelectModel} <li>String to {@link
+ * org.apache.tapestry5.corelib.data.InsertPosition} <li>Map to {@link org.apache.tapestry5.SelectModel}
+ * <li>Collection to {@link GridDataSource} <li>null to {@link org.apache.tapestry5.grid.GridDataSource} <li>String
+ * to {@link org.apache.tapestry5.corelib.data.GridPagerPosition} <li>List to {@link org.apache.tapestry5.SelectModel}
+ * <li>{@link org.apache.tapestry5.runtime.ComponentResourcesAware} (typically, a component) to {@link
+ * org.apache.tapestry5.ComponentResources} <li>String to {@link org.apache.tapestry5.corelib.data.BlankOption} </ul>
*/
public static void contributeTypeCoercer(Configuration<CoercionTuple> configuration)
{
@@ -797,7 +797,7 @@
/**
* Builds the source of {@link Messages} containing validation messages. The contributions are paths to message
- * bundles (resource paths within the classpath); the default contribution is "org/apache/tapestry/internal/ValidationMessages".
+ * bundles (resource paths within the classpath); the default contribution is "org/apache/tapestry5/internal/ValidationMessages".
*/
public ValidationMessagesSource buildValidationMessagesSource(Collection<String> configuration,
@@ -831,7 +831,7 @@
}
/**
- * Builds a proxy to the current {@link org.apache.tapestry.RenderSupport} inside this thread's {@link
+ * Builds a proxy to the current {@link org.apache.tapestry5.RenderSupport} inside this thread's {@link
* Environment}.
*/
public RenderSupport buildRenderSupport()
@@ -840,8 +840,8 @@
}
/**
- * Builds a proxy to the current {@link org.apache.tapestry.services.FormSupport} inside this thread's {@link
- * org.apache.tapestry.services.Environment}.
+ * Builds a proxy to the current {@link org.apache.tapestry5.services.FormSupport} inside this thread's {@link
+ * org.apache.tapestry5.services.Environment}.
*/
public FormSupport buildFormSupport()
{
@@ -858,9 +858,9 @@
}
/**
- * Analyzes properties to determine the data types, used to {@linkplain #contributeBeanBlockSource(org.apache.tapestry.ioc.Configuration)}
+ * Analyzes properties to determine the data types, used to {@linkplain #contributeBeanBlockSource(org.apache.tapestry5.ioc.Configuration)}
* locale display and edit blocks} for properties. The default behaviors look for a {@link
- * org.apache.tapestry.beaneditor.DataType} annotation before deriving the data type from the property type.
+ * org.apache.tapestry5.beaneditor.DataType} annotation before deriving the data type from the property type.
*/
@Marker(Primary.class)
public DataTypeAnalyzer buildDataTypeAnalyzer(List<DataTypeAnalyzer> configuration)
@@ -1049,7 +1049,7 @@
}
/**
- * Returns a {@link org.apache.tapestry.ioc.services.ClassFactory} that can be used to create extra classes around
+ * Returns a {@link org.apache.tapestry5.ioc.services.ClassFactory} that can be used to create extra classes around
* component classes. This ClassFactory will be cleared whenever an underlying component class is discovered to have
* changed. Use of this class factory implies that your code will become aware of this (if necessary) to discard any
* cached object (alas, this currently involves dipping into the internals side to register for the correct
@@ -1110,14 +1110,14 @@
/**
* The MarkupRenderer service is used to render a full page as markup. Supports an ordered configuration of {@link
- * org.apache.tapestry.services.MarkupRendererFilter}s.
+ * org.apache.tapestry5.services.MarkupRendererFilter}s.
*
* @param pageRenderQueue handles the bulk of the work
* @param logger used to log errors building the pipeline
* @param configuration filters on this service
* @return the service
- * @see #contributeMarkupRenderer(org.apache.tapestry.ioc.OrderedConfiguration, org.apache.tapestry.Asset,
- * org.apache.tapestry.Asset, ValidationMessagesSource, org.apache.tapestry.ioc.services.SymbolSource,
+ * @see #contributeMarkupRenderer(org.apache.tapestry5.ioc.OrderedConfiguration, org.apache.tapestry5.Asset,
+ * org.apache.tapestry5.Asset, ValidationMessagesSource, org.apache.tapestry5.ioc.services.SymbolSource,
* AssetSource)
*/
public MarkupRenderer buildMarkupRenderer(final PageRenderQueue pageRenderQueue, Logger logger,
@@ -1136,15 +1136,15 @@
}
/**
- * A wrapper around {@link org.apache.tapestry.internal.services.PageRenderQueue} used for partial page renders.
- * Supports an ordered configuration of {@link org.apache.tapestry.services.PartialMarkupRendererFilter}s.
+ * A wrapper around {@link org.apache.tapestry5.internal.services.PageRenderQueue} used for partial page renders.
+ * Supports an ordered configuration of {@link org.apache.tapestry5.services.PartialMarkupRendererFilter}s.
*
* @param logger used to log warnings creating the pipeline
* @param configuration filters for the service
* @param renderQueue does most of the work
* @return the service
- * @see #contributePartialMarkupRenderer(org.apache.tapestry.ioc.OrderedConfiguration, org.apache.tapestry.Asset,
- * org.apache.tapestry.ioc.services.SymbolSource, AssetSource, ValidationMessagesSource)
+ * @see #contributePartialMarkupRenderer(org.apache.tapestry5.ioc.OrderedConfiguration, org.apache.tapestry5.Asset,
+ * org.apache.tapestry5.ioc.services.SymbolSource, AssetSource, ValidationMessagesSource)
*/
public PartialMarkupRenderer buildPartialMarkupRenderer(Logger logger,
List<PartialMarkupRendererFilter> configuration,
@@ -1175,7 +1175,7 @@
* Builds the component action request handler for traditional (non-Ajax) requests. These typically result in a
* redirect to a Tapestry render URL.
*
- * @see org.apache.tapestry.internal.services.ComponentEventRequestHandlerImpl
+ * @see org.apache.tapestry5.internal.services.ComponentEventRequestHandlerImpl
*/
@Marker(Traditional.class)
public ComponentEventRequestHandler buildComponentEventRequestHandler(
@@ -1186,7 +1186,7 @@
}
/**
- * Builds the action request handler for Ajax requests, based on {@link org.apache.tapestry.internal.services.AjaxComponentEventRequestHandler}.
+ * Builds the action request handler for Ajax requests, based on {@link org.apache.tapestry5.internal.services.AjaxComponentEventRequestHandler}.
* Filters on the request handler are supported here as well.
*/
@Marker(Ajax.class)
@@ -1229,7 +1229,7 @@
* render link)</dd> <dt>String</dt> <dd>Sends a page render redirect</dd> <dt>Class</dt> <dd>Interpreted as the
* class name of a page, sends a page render render redirect (this is more refactoring safe than the page name)</dd>
* <dt>{@link Component}</dt> <dd>A page's root component (though a non-root component will work, but will generate
- * a warning). A direct to the containing page is sent.</dd> <dt>{@link org.apache.tapestry.StreamResponse}</dt>
+ * a warning). A direct to the containing page is sent.</dd> <dt>{@link org.apache.tapestry5.StreamResponse}</dt>
* <dd>The stream response is sent as the actual reply.</dd> <dt>URL</dt> <dd>Sends a redirect to a (presumably)
* external URL</dd> </dl>
*/
@@ -1273,10 +1273,10 @@
/**
* Contributes handlers for the following types: <dl> <dt>Object</dt> <dd>Failure case, added to provide more useful
- * exception message</dd> <dt>{@link RenderCommand}</dt> <dd>Typically, a {@link org.apache.tapestry.Block}</dd>
+ * exception message</dd> <dt>{@link RenderCommand}</dt> <dd>Typically, a {@link org.apache.tapestry5.Block}</dd>
* <dt>{@link Component}</dt> <dd>Renders the component and its body</dd> <dt>{@link
* org.apache.tapestry5.json.JSONObject}</dt> <dd>The JSONObject is returned as a text/javascript response</dd>
- * <dt>{@link org.apache.tapestry.StreamResponse}</dt> <dd>The stream response is sent as the actual response</dd>
+ * <dt>{@link org.apache.tapestry5.StreamResponse}</dt> <dd>The stream response is sent as the actual response</dd>
* </dl>
*/
@@ -1293,7 +1293,7 @@
* The MasterDispatcher is a chain-of-command of individual Dispatchers, each handling (like a servlet) a particular
* kind of incoming request. <dl> <dt>RootPath</dt> <dd>Renders the start page for the "/" request</dd>
* <dt>Asset</dt> <dd>Provides access to classpath assets</dd> <dt>PageRender</dt> <dd>Identifies the {@link
- * org.apache.tapestry.services.PageRenderRequestParameters} and forwards onto {@link PageRenderRequestHandler}</dd>
+ * org.apache.tapestry5.services.PageRenderRequestParameters} and forwards onto {@link PageRenderRequestHandler}</dd>
* <dt>ComponentEvent</dt> <dd>Identifies the {@link ComponentEventRequestParameters} and forwards onto the {@link
* ComponentEventRequestHandler}</dd> </dl>
*/
@@ -1323,8 +1323,8 @@
/**
* Contributes a default object renderer for type Object, plus specialized renderers for {@link
- * org.apache.tapestry.services.Request}, {@link org.apache.tapestry.ioc.Location}, {@link
- * org.apache.tapestry.ComponentResources}, {@link org.apache.tapestry.EventContext}, List, and Object[].
+ * org.apache.tapestry5.services.Request}, {@link org.apache.tapestry5.ioc.Location}, {@link
+ * org.apache.tapestry5.ComponentResources}, {@link org.apache.tapestry5.EventContext}, List, and Object[].
*/
public void contributeObjectRenderer(MappedConfiguration<Class, ObjectRenderer> configuration,
@@ -1367,13 +1367,13 @@
/**
- * Adds page render filters, each of which provides an {@link org.apache.tapestry.annotation.Environmental} service.
+ * Adds page render filters, each of which provides an {@link org.apache.tapestry5.annotations.Environmental} service.
* Filters often provide {@link Environmental} services needed by components as they render. <dl>
- * <dt>PageRenderSupport</dt> <dd>Provides {@link org.apache.tapestry.RenderSupport}</dd>
- * <dt>ClientBehaviorSupport</dt> <dd>Provides {@link org.apache.tapestry.internal.services.ClientBehaviorSupport}</dd>
- * <dt>Heartbeat</dt> <dd>Provides {@link org.apache.tapestry.services.Heartbeat}</dd>
- * <dt>DefaultValidationDecorator</dt> <dd>Provides {@link org.apache.tapestry.ValidationDecorator} (as an instance
- * of {@link org.apache.tapestry.internal.DefaultValidationDecorator})</dd> </dl>
+ * <dt>PageRenderSupport</dt> <dd>Provides {@link org.apache.tapestry5.RenderSupport}</dd>
+ * <dt>ClientBehaviorSupport</dt> <dd>Provides {@link org.apache.tapestry5.internal.services.ClientBehaviorSupport}</dd>
+ * <dt>Heartbeat</dt> <dd>Provides {@link org.apache.tapestry5.services.Heartbeat}</dd>
+ * <dt>DefaultValidationDecorator</dt> <dd>Provides {@link org.apache.tapestry5.ValidationDecorator} (as an instance
+ * of {@link org.apache.tapestry5.internal.DefaultValidationDecorator})</dd> </dl>
*/
public void contributeMarkupRenderer(OrderedConfiguration<MarkupRendererFilter> configuration,
@@ -1408,7 +1408,7 @@
// Uses functions defined by the prior three
- "org/apache/tapestry/tapestry.js");
+ "org/apache/tapestry5/tapestry.js");
support.addStylesheetLink(stylesheetAsset, null);
@@ -1487,13 +1487,13 @@
/**
* Contributes {@link PartialMarkupRendererFilter}s used when rendering a partial Ajax response. This is an analog
- * to {@link #contributeMarkupRenderer(org.apache.tapestry.ioc.OrderedConfiguration, org.apache.tapestry.Asset,
- * org.apache.tapestry.Asset, ValidationMessagesSource, org.apache.tapestry.ioc.services.SymbolSource, AssetSource)}
+ * to {@link #contributeMarkupRenderer(org.apache.tapestry5.ioc.OrderedConfiguration, org.apache.tapestry5.Asset,
+ * org.apache.tapestry5.Asset, ValidationMessagesSource, org.apache.tapestry5.ioc.services.SymbolSource, AssetSource)}
* } and overlaps it to some degree. <dl> <dt> PageRenderSupport </dt> <dd>Provides {@link
- * org.apache.tapestry.RenderSupport}</dd> <dt>ClientBehaviorSupport</dt> <dd>Provides {@link
- * org.apache.tapestry.internal.services.ClientBehaviorSupport}</dd> <dt>Heartbeat</dt> <dd>Provides {@link
- * org.apache.tapestry.services.Heartbeat}</dd> <dt>DefaultValidationDecorator</dt> <dd>Provides {@link
- * org.apache.tapestry.ValidationDecorator} (as an instance of {@link org.apache.tapestry.internal.DefaultValidationDecorator})</dd>
+ * org.apache.tapestry5.RenderSupport}</dd> <dt>ClientBehaviorSupport</dt> <dd>Provides {@link
+ * org.apache.tapestry5.internal.services.ClientBehaviorSupport}</dd> <dt>Heartbeat</dt> <dd>Provides {@link
+ * org.apache.tapestry5.services.Heartbeat}</dd> <dt>DefaultValidationDecorator</dt> <dd>Provides {@link
+ * org.apache.tapestry5.ValidationDecorator} (as an instance of {@link org.apache.tapestry5.internal.DefaultValidationDecorator})</dd>
* </dl>
*/
public void contributePartialMarkupRenderer(OrderedConfiguration<PartialMarkupRendererFilter> configuration,
@@ -1632,7 +1632,7 @@
public void contributeValidationMessagesSource(Configuration<String> configuration)
{
- configuration.add("org/apache/tapestry/internal/ValidationMessages");
+ configuration.add("org/apache/tapestry5/internal/ValidationMessages");
}
public ValueEncoderSource buildValueEncoderSource(Map<Class, ValueEncoderFactory> configuration)
@@ -1742,8 +1742,8 @@
configuration.add("tapestry.start-page-name", "start");
- configuration.add("tapestry.default-stylesheet", "org/apache/tapestry/default.css");
- configuration.add("tapestry.field-error-marker", "org/apache/tapestry/field-error-marker.gif");
+ configuration.add("tapestry.default-stylesheet", "org/apache/tapestry5/default.css");
+ configuration.add("tapestry.field-error-marker", "org/apache/tapestry5/field-error-marker.gif");
configuration.add("tapestry.page-pool.soft-limit", "5");
configuration.add("tapestry.page-pool.soft-wait", "10 ms");
@@ -1768,11 +1768,11 @@
// contribution based on the path.
configuration.add("tapestry.scriptaculous", "classpath:${tapestry.scriptaculous.path}");
- configuration.add("tapestry.scriptaculous.path", "org/apache/tapestry/scriptaculous_1_8");
+ configuration.add("tapestry.scriptaculous.path", "org/apache/tapestry5/scriptaculous_1_8");
// Likewise for WebFX DatePicker, currently version 1.0.6
- configuration.add("tapestry.datepicker.path", "org/apache/tapestry/datepicker_106");
+ configuration.add("tapestry.datepicker.path", "org/apache/tapestry5/datepicker_106");
configuration.add("tapestry.datepicker", "classpath:${tapestry.datepicker.path}");
configuration.add(PersistentFieldManagerImpl.META_KEY, PersistentFieldManagerImpl.DEFAULT_STRATEGY);
@@ -1794,7 +1794,7 @@
}
/**
- * Adds a listener to the {@link org.apache.tapestry.internal.services.ComponentInstantiatorSource} that clears the
+ * Adds a listener to the {@link org.apache.tapestry5.internal.services.ComponentInstantiatorSource} that clears the
* {@link PropertyAccess} and {@link TypeCoercer} caches on a class loader invalidation. In addition, forces the
* realization of {@link ComponentClassResolver} at startup.
*/
@@ -1970,7 +1970,7 @@
/**
* Contributes filters: <dl> <dt>Ajax</dt> <dd>Determines if the request is Ajax oriented, and redirects to an
* alternative handler if so</dd> <dt>ImmediateRender</dt> <dd>When {@linkplain
- * org.apache.tapestry.SymbolConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS immediate action response rendering}
+ * org.apache.tapestry5.SymbolConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS immediate action response rendering}
* is enabled, generates the markup response (instead of a page redirect response, which is the normal behavior)
* </dd> <dt>Secure</dt> <dd>Sends a redirect if an non-secure request accesses a secure page</dd></dl>
*/
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/Traditional.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/Traditional.java
index 31d926d..d3eb8e6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/Traditional.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/Traditional.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
import java.lang.annotation.*;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformConstants.java
index 096033d..7f10fdc 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformConstants.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.runtime.ComponentEvent;
-import org.apache.tapestry.runtime.Event;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.runtime.ComponentEvent;
+import org.apache.tapestry5.runtime.Event;
import java.lang.reflect.Modifier;
/**
- * Constants used by implementations of {@link org.apache.tapestry.services.ComponentClassTransformWorker}.
+ * Constants used by implementations of {@link org.apache.tapestry5.services.ComponentClassTransformWorker}.
*/
public final class TransformConstants
{
@@ -31,94 +31,94 @@
Event.class.getName() };
/**
- * Signature for {@link org.apache.tapestry.runtime.Component#dispatchComponentEvent(org.apache.tapestry.runtime.ComponentEvent)}.
+ * Signature for {@link org.apache.tapestry5.runtime.Component#dispatchComponentEvent(org.apache.tapestry5.runtime.ComponentEvent)}.
*
- * @see org.apache.tapestry.annotation.OnEvent
+ * @see org.apache.tapestry5.annotations.OnEvent
*/
public static final TransformMethodSignature DISPATCH_COMPONENT_EVENT = new TransformMethodSignature(
Modifier.PUBLIC, "boolean", "dispatchComponentEvent", new String[] { ComponentEvent.class.getName() },
null);
/**
- * Signature for {@link org.apache.tapestry.runtime.PageLifecycleListener#containingPageDidLoad()}.
+ * Signature for {@link org.apache.tapestry5.runtime.PageLifecycleListener#containingPageDidLoad()}.
*/
public static final TransformMethodSignature CONTAINING_PAGE_DID_LOAD_SIGNATURE = new TransformMethodSignature(
"containingPageDidLoad");
/**
- * Signature for {@link org.apache.tapestry.runtime.Component#postRenderCleanup()}.
+ * Signature for {@link org.apache.tapestry5.runtime.Component#postRenderCleanup()}.
*/
public static final TransformMethodSignature POST_RENDER_CLEANUP_SIGNATURE = new TransformMethodSignature(
"postRenderCleanup");
/**
- * Signature for {@link org.apache.tapestry.runtime.PageLifecycleListener#containingPageDidDetach()}.
+ * Signature for {@link org.apache.tapestry5.runtime.PageLifecycleListener#containingPageDidDetach()}.
*/
public static final TransformMethodSignature CONTAINING_PAGE_DID_DETACH_SIGNATURE = new TransformMethodSignature(
"containingPageDidDetach");
/**
- * Signature for {@link org.apache.tapestry.runtime.PageLifecycleListener#containingPageDidAttach()}.
+ * Signature for {@link org.apache.tapestry5.runtime.PageLifecycleListener#containingPageDidAttach()}.
*/
public static final TransformMethodSignature CONTAINING_PAGE_DID_ATTACH_SIGNATURE = new TransformMethodSignature(
"containingPageDidAttach");
/**
- * Signature for {@link org.apache.tapestry.runtime.Component#setupRender(MarkupWriter, Event)}.
+ * Signature for {@link org.apache.tapestry5.runtime.Component#setupRender(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotation.SetupRender
+ * @see org.apache.tapestry5.annotations.SetupRender
*/
public static final TransformMethodSignature SETUP_RENDER_SIGNATURE = renderPhaseSignature("setupRender");
/**
- * Signature for {@link org.apache.tapestry.runtime.Component#beginRender(MarkupWriter, Event)}.
+ * Signature for {@link org.apache.tapestry5.runtime.Component#beginRender(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotation.BeginRender
+ * @see org.apache.tapestry5.annotations.BeginRender
*/
public static final TransformMethodSignature BEGIN_RENDER_SIGNATURE = renderPhaseSignature("beginRender");
/**
- * Signature for {@link org.apache.tapestry.runtime.Component#beforeRenderTemplate(MarkupWriter, Event)}.
+ * Signature for {@link org.apache.tapestry5.runtime.Component#beforeRenderTemplate(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotation.BeforeRenderTemplate
+ * @see org.apache.tapestry5.annotations.BeforeRenderTemplate
*/
public static final TransformMethodSignature BEFORE_RENDER_TEMPLATE_SIGNATURE = renderPhaseSignature(
"beforeRenderTemplate");
/**
- * Signature for {@link org.apache.tapestry.runtime.Component#afterRenderTemplate(MarkupWriter, Event)}.
+ * Signature for {@link org.apache.tapestry5.runtime.Component#afterRenderTemplate(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotation.BeforeRenderTemplate
+ * @see org.apache.tapestry5.annotations.BeforeRenderTemplate
*/
public static final TransformMethodSignature AFTER_RENDER_TEMPLATE_SIGNATURE = renderPhaseSignature(
"afterRenderTemplate");
/**
- * Signature for {@link org.apache.tapestry.runtime.Component#beforeRenderBody(MarkupWriter, Event)}.
+ * Signature for {@link org.apache.tapestry5.runtime.Component#beforeRenderBody(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotation.BeforeRenderBody
+ * @see org.apache.tapestry5.annotations.BeforeRenderBody
*/
public static final TransformMethodSignature BEFORE_RENDER_BODY_SIGNATURE = renderPhaseSignature(
"beforeRenderBody");
/**
- * Signature for {@link org.apache.tapestry.runtime.Component#afterRenderBody(MarkupWriter, Event)}.
+ * Signature for {@link org.apache.tapestry5.runtime.Component#afterRenderBody(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotation.AfterRenderBody
+ * @see org.apache.tapestry5.annotations.AfterRenderBody
*/
public static final TransformMethodSignature AFTER_RENDER_BODY_SIGNATURE = renderPhaseSignature("afterRenderBody");
/**
- * Signature for {@link org.apache.tapestry.runtime.Component#afterRender(MarkupWriter, Event)}
+ * Signature for {@link org.apache.tapestry5.runtime.Component#afterRender(MarkupWriter, Event)}
*
- * @see org.apache.tapestry.annotation.AfterRender
+ * @see org.apache.tapestry5.annotations.AfterRender
*/
public static final TransformMethodSignature AFTER_RENDER_SIGNATURE = renderPhaseSignature("afterRender");
/**
- * Signature for {@link org.apache.tapestry.runtime.Component#cleanupRender(MarkupWriter, Event)}.
+ * Signature for {@link org.apache.tapestry5.runtime.Component#cleanupRender(MarkupWriter, Event)}.
*
- * @see org.apache.tapestry.annotation.CleanupRender
+ * @see org.apache.tapestry5.annotations.CleanupRender
*/
public static final TransformMethodSignature CLEANUP_RENDER_SIGNATURE = renderPhaseSignature("cleanupRender");
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformMethodSignature.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformMethodSignature.java
index cc62b6c..e838de5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformMethodSignature.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformMethodSignature.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
import java.lang.reflect.Modifier;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformUtils.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformUtils.java
index ea97580..da8256d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformUtils.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/TransformUtils.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
import java.util.Map;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/TranslatorSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/TranslatorSource.java
index da0013b..bd84ee6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/TranslatorSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/TranslatorSource.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.Translator;
+import org.apache.tapestry5.Translator;
/**
* A source for {@link Translator}s, either by name.
@@ -32,7 +32,7 @@
/**
* Finds a {@link Translator} that is appropriate to the given type, which is usually obtained via {@link
- * org.apache.tapestry.Binding#getBindingType()}. Performs an inheritanced-based search for the best match.
+ * org.apache.tapestry5.Binding#getBindingType()}. Performs an inheritanced-based search for the best match.
*
* @param valueType the type of value for which a default translator is needed
* @return the matching translator, or null if no match can be found
@@ -41,7 +41,7 @@
/**
* Finds a {@link Translator} that is appropriate to the given type, which is usually obtained via {@link
- * org.apache.tapestry.Binding#getBindingType()}. Performs an inheritanced-based search for the best match.
+ * org.apache.tapestry5.Binding#getBindingType()}. Performs an inheritanced-based search for the best match.
*
* @param valueType the type of value for which a default translator is needed
* @return the matching translator
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ValidationConstraintGenerator.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ValidationConstraintGenerator.java
index d436375..5f877e7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ValidationConstraintGenerator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ValidationConstraintGenerator.java
@@ -12,25 +12,25 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.ioc.AnnotationProvider;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.ioc.AnnotationProvider;
import java.util.List;
/**
* Invoked to generate a list of validation constraint strings for a property. This typically involves scanning the
* property for annotations or naming conventions that confer the desired validation. The constraint strings are
- * ultimately handed to {@link FieldValidatorSource#createValidator(org.apache.tapestry.Field, String, String, String,
- * org.apache.tapestry.ioc.Messages, java.util.Locale)}.
+ * ultimately handed to {@link FieldValidatorSource#createValidator(org.apache.tapestry5.Field, String, String, String,
+ * org.apache.tapestry5.ioc.Messages, java.util.Locale)}.
*/
public interface ValidationConstraintGenerator
{
/**
* For a given property, identify all the approprite validation constraints. Each returned value is the name of a
* validator (i.e., "required") or a validator name and configuration (i.e., "minlength=5"). These contraints are
- * exactly the individual terms in a {@link FieldValidatorSource#createValidators(org.apache.tapestry.Field, String)
+ * exactly the individual terms in a {@link FieldValidatorSource#createValidators(org.apache.tapestry5.Field, String)
* validate specification}. These will ultimately be used to create {@link FieldValidator}s for the field that edits
* the property.
*
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ValidationMessagesSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ValidationMessagesSource.java
index bb28702..5b9f3ae 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ValidationMessagesSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ValidationMessagesSource.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry5.ioc.Messages;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ValueEncoderFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ValueEncoderFactory.java
index ba6ac94..db3a48e 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ValueEncoderFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ValueEncoderFactory.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ValueEncoder;
+import org.apache.tapestry5.ValueEncoder;
/**
* A source for {@link ValueEncoder} instances of a given type.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/ValueEncoderSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/ValueEncoderSource.java
index 82ae67e..02f45fc 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/ValueEncoderSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/ValueEncoderSource.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ValueEncoder;
+import org.apache.tapestry5.ValueEncoder;
/**
* A source for value encoders based on a property type.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java b/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java
index 7f4a670..aa53c2d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/test/PageTester.java
@@ -12,22 +12,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.test;
+package org.apache.tapestry5.test;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.dom.Node;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.SingleKeySymbolProvider;
-import org.apache.tapestry.internal.TapestryAppInitializer;
-import org.apache.tapestry.internal.services.*;
-import org.apache.tapestry.internal.test.*;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.services.SymbolProvider;
-import org.apache.tapestry.ioc.util.StrategyRegistry;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.dom.Node;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.SingleKeySymbolProvider;
+import org.apache.tapestry5.internal.TapestryAppInitializer;
+import org.apache.tapestry5.internal.services.*;
+import org.apache.tapestry5.internal.test.*;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
+import org.apache.tapestry5.ioc.util.StrategyRegistry;
import org.apache.tapestry5.services.ApplicationGlobals;
import java.util.Locale;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java b/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
index a31ef4b..4aa5f45 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
@@ -12,29 +12,29 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.test;
+package org.apache.tapestry5.test;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Id;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.Path;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.internal.services.MapMessages;
-import org.apache.tapestry.internal.services.MarkupWriterImpl;
-import static org.apache.tapestry.internal.test.CodeEq.codeEq;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.test.IOCTestCase;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.EmbeddedComponentModel;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.model.ParameterModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Id;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.Path;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.internal.services.MapMessages;
+import org.apache.tapestry5.internal.services.MarkupWriterImpl;
+import static org.apache.tapestry5.internal.test.CodeEq.codeEq;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.EmbeddedComponentModel;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.model.ParameterModel;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.*;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.eq;
import org.easymock.IAnswer;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/util/AbstractSelectModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/util/AbstractSelectModel.java
index 151236b..c8a4e6a 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/util/AbstractSelectModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/util/AbstractSelectModel.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
-import org.apache.tapestry.OptionGroupModel;
-import org.apache.tapestry.OptionModel;
-import org.apache.tapestry.SelectModel;
-import org.apache.tapestry.SelectModelVisitor;
+import org.apache.tapestry5.OptionGroupModel;
+import org.apache.tapestry5.OptionModel;
+import org.apache.tapestry5.SelectModel;
+import org.apache.tapestry5.SelectModelVisitor;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/util/DefaultPrimaryKeyEncoder.java b/tapestry-core/src/main/java/org/apache/tapestry5/util/DefaultPrimaryKeyEncoder.java
index c4fb9fd..cc2c316 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/util/DefaultPrimaryKeyEncoder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/util/DefaultPrimaryKeyEncoder.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
-import org.apache.tapestry.PrimaryKeyEncoder;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
+import org.apache.tapestry5.PrimaryKeyEncoder;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
import java.io.Serializable;
import java.util.LinkedHashMap;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumSelectModel.java b/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumSelectModel.java
index 3ca3ae8..3d585bd 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumSelectModel.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumSelectModel.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
-import org.apache.tapestry.OptionGroupModel;
-import org.apache.tapestry.OptionModel;
-import org.apache.tapestry.internal.OptionModelImpl;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.OptionGroupModel;
+import org.apache.tapestry5.OptionModel;
+import org.apache.tapestry5.internal.OptionModelImpl;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
import java.io.Serializable;
import java.util.List;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumValueEncoder.java b/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumValueEncoder.java
index c2f44a0..d24cd76 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumValueEncoder.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/util/EnumValueEncoder.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
-import org.apache.tapestry.ValueEncoder;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ValueEncoder;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
/**
* A value encoder that can be used for aribrary Enum types. The enum name is stored as the client side value.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/util/PublicUtilMessages.java b/tapestry-core/src/main/java/org/apache/tapestry5/util/PublicUtilMessages.java
index 0af3806..aaa3480 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/util/PublicUtilMessages.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/util/PublicUtilMessages.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
import java.util.Collection;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java b/tapestry-core/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
index af8187c..04227de 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/util/StringToEnumCoercion.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.Coercion;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.Coercion;
import java.util.Map;
/**
- * A {@link org.apache.tapestry.ioc.services.Coercion} for converting strings into an instance of a particular
+ * A {@link org.apache.tapestry5.ioc.services.Coercion} for converting strings into an instance of a particular
* enumerated type. The {@link Enum#name() name} is used as the key to identify the enum instance, in a case-insensitive
* fashion.
*
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/util/TextStreamResponse.java b/tapestry-core/src/main/java/org/apache/tapestry5/util/TextStreamResponse.java
index bb688a1..a085877 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/util/TextStreamResponse.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/util/TextStreamResponse.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
-import org.apache.tapestry.StreamResponse;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.StreamResponse;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.services.Response;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/validator/AbstractValidator.java b/tapestry-core/src/main/java/org/apache/tapestry5/validator/AbstractValidator.java
index c431024..ff95ae8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/validator/AbstractValidator.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/validator/AbstractValidator.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.validator;
+package org.apache.tapestry5.validator;
-import org.apache.tapestry.Validator;
+import org.apache.tapestry5.Validator;
/**
- * Base class for constructing a {@link org.apache.tapestry.Validator}.
+ * Base class for constructing a {@link org.apache.tapestry5.Validator}.
*/
public abstract class AbstractValidator<C, T> implements Validator<C, T>
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/validator/Max.java b/tapestry-core/src/main/java/org/apache/tapestry5/validator/Max.java
index 93ca9d2..c314c80 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/validator/Max.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/validator/Max.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.validator;
+package org.apache.tapestry5.validator;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.services.FormSupport;
/**
* Enforces a maximum integer value.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/validator/MaxLength.java b/tapestry-core/src/main/java/org/apache/tapestry5/validator/MaxLength.java
index 6ce1db8..a44ecf6 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/validator/MaxLength.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/validator/MaxLength.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.validator;
+package org.apache.tapestry5.validator;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.services.FormSupport;
public final class MaxLength extends AbstractValidator<Integer, String>
{
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/validator/Min.java b/tapestry-core/src/main/java/org/apache/tapestry5/validator/Min.java
index 2a429be..8ee7bb5 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/validator/Min.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/validator/Min.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.validator;
+package org.apache.tapestry5.validator;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.services.FormSupport;
/* A vaidator that enforces that a number is greater than some minimum integer value. */
public class Min extends AbstractValidator<Long, Number>
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/validator/MinLength.java b/tapestry-core/src/main/java/org/apache/tapestry5/validator/MinLength.java
index 9013709..c18a7cd 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/validator/MinLength.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/validator/MinLength.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.validator;
+package org.apache.tapestry5.validator;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.services.FormSupport;
/**
* Validates that a string value has a minimum length.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/validator/Regexp.java b/tapestry-core/src/main/java/org/apache/tapestry5/validator/Regexp.java
index 3444220..495ad43 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/validator/Regexp.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/validator/Regexp.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.validator;
+package org.apache.tapestry5.validator;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.services.FormSupport;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -50,4 +50,4 @@
if (!matcher.matches()) throw new ValidationException(buildMessage(formatter, field, constraintValue));
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/validator/Required.java b/tapestry-core/src/main/java/org/apache/tapestry5/validator/Required.java
index 5d82050..6730dee 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/validator/Required.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/validator/Required.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.validator;
+package org.apache.tapestry5.validator;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.services.FormSupport;
/**
* A validator that enforces that the value is not null and not the empty string. This validator is not configurable.
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/base/BaseStrings.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/base/BaseStrings.properties
index 5c48f3b..53ccbc3 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/base/BaseStrings.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/base/BaseStrings.properties
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-null-value-in-path=Property '%s' contains a null value in the path.
\ No newline at end of file
+null-value-in-path=Property '%s' contains a null value in the path.
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/Errors.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/Errors.properties
index 1a73dd2..016b3d8 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/Errors.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/Errors.properties
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-default-banner=You must correct the following errors before you may continue.
\ No newline at end of file
+default-banner=You must correct the following errors before you may continue.
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/Errors_it.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/Errors_it.properties
index 8d88b4d..a81e384 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/Errors_it.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/Errors_it.properties
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-default-banner=Per poter proseguire è necessario correggere gli errori seguenti.
\ No newline at end of file
+default-banner=Per poter proseguire è necessario correggere gli errori seguenti.
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/GridColumns.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/GridColumns.properties
index 139840c..b8f0636 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/GridColumns.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/GridColumns.properties
@@ -14,4 +14,4 @@
ascending=[Asc]
descending=[Desc]
-sortable=[Sortable]
\ No newline at end of file
+sortable=[Sortable]
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/GridPager.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/GridPager.properties
index 9215dbb..4934c67 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/GridPager.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/GridPager.properties
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-goto-page=Go to page %d
\ No newline at end of file
+goto-page=Go to page %d
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/PropertyEditor.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/PropertyEditor.properties
index 74b425a..a5aeb36 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/PropertyEditor.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/components/PropertyEditor.properties
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-block-error=Unable to locate a block to edit property '%s' (with data type '%s') of object %s: %s
\ No newline at end of file
+block-error=Unable to locate a block to edit property '%s' (with data type '%s') of object %s: %s
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/internal/ValidationMessages.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/internal/ValidationMessages.properties
index fada18c..6d659d1 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/internal/ValidationMessages.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/internal/ValidationMessages.properties
@@ -32,4 +32,4 @@
# The label/alt text for the icon that is displayed next to each field.
-icon-label=[Error]
\ No newline at end of file
+icon-label=[Error]
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_it.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_it.properties
index ad71b65..6c461ae 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_it.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_it.properties
@@ -32,4 +32,4 @@
# The label/alt text for the icon that is displayed next to each field.
-icon-label=[Errore]
\ No newline at end of file
+icon-label=[Errore]
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/internal/beaneditor/BeanEditorStrings.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/internal/beaneditor/BeanEditorStrings.properties
index ca88199..7649525 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/internal/beaneditor/BeanEditorStrings.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/internal/beaneditor/BeanEditorStrings.properties
@@ -14,4 +14,4 @@
duplicate-property-name=Bean editor model for %s already contains a property model for property '%s'.
unknown-property=Bean editor model for %s does not contain a property named '%s'. Available properties: %s.
-unknown-property-id=Bean editor model for %s does not contain a property with id '%s'. Available property ids: %s.
\ No newline at end of file
+unknown-property-id=Bean editor model for %s does not contain a property with id '%s'. Available property ids: %s.
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/internal/model/ModelStrings.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/internal/model/ModelStrings.properties
index 2480d1b..1d44441 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/internal/model/ModelStrings.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/internal/model/ModelStrings.properties
@@ -16,4 +16,4 @@
duplicate-parameter-value=A value for parameter '%s' of embedded component %s (of component class %s) has already been provided.
duplicate-component-id=Embedded component '%s' has already been defined for component class %s.
duplicate-mixin=Mixin %s (for component %s) has already been defined.
-missing-persistent-field=No field persistence strategy has been defined for field '%s'.
\ No newline at end of file
+missing-persistent-field=No field persistence strategy has been defined for field '%s'.
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/internal/transform/TransformStrings.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/internal/transform/TransformStrings.properties
index c5f0109..6e6f056 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/internal/transform/TransformStrings.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/internal/transform/TransformStrings.properties
@@ -15,4 +15,4 @@
field-injection-error=Error obtaining injected value for field %s.%s: %s
component-not-assignable-to-field=Component %s is not assignable to field %s (of type %s).
cached-no-return-value=@Cached may only be used with methods that return values: %s
-cached-no-parameters=@Cached cannot be used with methods that accept parameters: %s
\ No newline at end of file
+cached-no-parameters=@Cached cannot be used with methods that accept parameters: %s
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/internal/util/UtilStrings.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/internal/util/UtilStrings.properties
index 6e5f136..7e13afd 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/internal/util/UtilStrings.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/internal/util/UtilStrings.properties
@@ -13,4 +13,4 @@
# limitations under the License.
no-return-value-accepted=Event '%s' from %s received an event handler method return value of %s. \
- This type of event does not support return values from event handler methods.
\ No newline at end of file
+ This type of event does not support return values from event handler methods.
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/util/PublicUtilStrings.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/util/PublicUtilStrings.properties
index ba1ac69..e7664eb 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/util/PublicUtilStrings.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/util/PublicUtilStrings.properties
@@ -14,4 +14,4 @@
duplicate-key=Key %s may not be added with value %s, as an existing value, %s, is already present.
missing-value=Key for value %s not found. Available values: %s
-missing-enum-value=Input '%s' does not identify a value from enumerated type %s. Available values: %s.
\ No newline at end of file
+missing-enum-value=Input '%s' does not identify a value from enumerated type %s. Available values: %s.
diff --git a/tapestry-core/src/site/apt/guide/ajax.apt b/tapestry-core/src/site/apt/guide/ajax.apt
index a45951d..8d48d7c 100644
--- a/tapestry-core/src/site/apt/guide/ajax.apt
+++ b/tapestry-core/src/site/apt/guide/ajax.apt
@@ -48,7 +48,7 @@
the JavaScript libraries.
Most of this is accomplished via the
- {{{../../apidocs/org/apache/tapestry/RenderSupport.html}RenderSupport}} object.
+ {{{../../apidocs/org/apache/tapestry5/RenderSupport.html}RenderSupport}} object.
RenderSupport include a number of methods that will be used by components, or event by
services that are called from components.
@@ -111,7 +111,7 @@
* Injecting RenderSupport
RenderSupport is an <environmental> object, so you will normally inject it via the
- {{{../../apidocs/org/apache/tapestry/annotation/Environmental.html}Environmental}} annotation:
+ {{{../../apidocs/org/apache/tapestry5/annotations/Environmental.html}Environmental}} annotation:
+---+
@Environmental
@@ -142,7 +142,7 @@
IncludeJavaScriptLibrary Annotation
The
- {{{../../apidocs/org/apache/tapestry/annotation/IncludeJavaScriptLibrary.html}IncludeJavaScriptLibrary}} annotation
+ {{{../../apidocs/org/apache/tapestry5/annotations/IncludeJavaScriptLibrary.html}IncludeJavaScriptLibrary}} annotation
is the easy way to include one or more JavaScript libraries.
The previous example could be re-written as:
@@ -163,7 +163,7 @@
* Autocomplete Mixin
The
- {{{../../apidocs/org/apache/tapestry/corelib/mixins/Autocomplete.html}Autocomplete}}
+ {{{../../apidocs/org/apache/tapestry5/corelib/mixins/Autocomplete.html}Autocomplete}}
mixin exists to allow a text field to query the server for completions for a partially
entered phrase. It is often used in situations where the field exists to select a single value from
a large set, too large to succesfully download to the client as a drop down list; for example, when the
@@ -261,7 +261,7 @@
or page class.
This is accomplished by injecting the
- {{{../../apidocs/org/apache/tapestry/services/Request.html}Request}} object, and invoking the isXHR() method.
+ {{{../../apidocs/org/apache/tapestry5/services/Request.html}Request}} object, and invoking the isXHR() method.
This value will be true for Ajax requests, and false for traditional request.
** Zone Functions
@@ -321,9 +321,9 @@
* A Block or Component to render as the response. The response will be a JSON hash, with a "content" key
whose value is the rendered markup. This is the basis for updates with the Zone component.
- * A {{{../../apidocs/org/apache/tapestry/json/JSONObject.html}JSONObject}}, which will be sent as the response.
+ * A {{{../../apidocs/org/apache/tapestry5/json/JSONObject.html}JSONObject}}, which will be sent as the response.
- * A {{{../../apidocs/org/apache/tapestry/StreamResponse.html}StreamResponse}}, which will be sent as the response.
+ * A {{{../../apidocs/org/apache/tapestry5/StreamResponse.html}StreamResponse}}, which will be sent as the response.
[]
diff --git a/tapestry-core/src/site/apt/guide/appstate.apt b/tapestry-core/src/site/apt/guide/appstate.apt
index 574019a..33e6012 100644
--- a/tapestry-core/src/site/apt/guide/appstate.apt
+++ b/tapestry-core/src/site/apt/guide/appstate.apt
@@ -14,7 +14,7 @@
With an ASO, the value is automatically stored outside the page; with the default storage strategy, it is stored in the session.
A field holding an ASO is marked with the
- {{{../../apidocs/org/apache/tapestry/annotation/ApplicationState.html}ApplicationState}} annotation.
+ {{{../../apidocs/org/apache/tapestry5/annotations/ApplicationState.html}ApplicationState}} annotation.
Example:
@@ -79,7 +79,7 @@
Alternately, you will configure an ASO so that you can control how it is instantiated. You may need to inject some values into the ASO
when it is first created, or otherwise initialize it. In this second case, you may provide an
- {{{../../apidocs/org/apache/tapestry/services/ApplicationStateCreator.html}ApplicationStateCreator}} object, which will be called upon to create the ASO
+ {{{../../apidocs/org/apache/tapestry5/services/ApplicationStateCreator.html}ApplicationStateCreator}} object, which will be called upon to create the ASO
as necessary. This is also the technique to use when you want your ASO to be represented by an <interface> rather than a <class>: you need to provide
a creator that knows about the class that implements the interface.
@@ -107,5 +107,5 @@
example.
Finally, we create an
- {{{../../apidocs/org/apache/tapestry/services/ApplicationStateContribution.html}ApplicationStateContribution}}
+ {{{../../apidocs/org/apache/tapestry5/services/ApplicationStateContribution.html}ApplicationStateContribution}}
identifying the strategy name and the creator, and give that to the configuration.
\ No newline at end of file
diff --git a/tapestry-core/src/site/apt/guide/assets.apt b/tapestry-core/src/site/apt/guide/assets.apt
index 6d0a8bf..738b5ab 100644
--- a/tapestry-core/src/site/apt/guide/assets.apt
+++ b/tapestry-core/src/site/apt/guide/assets.apt
@@ -12,14 +12,14 @@
Tapestry will also make files stored <on the classpath>, with your Java class files, visible to the web browser.
- Assets are exposed to your code as instances of the {{{../../apidocs/org/apache/tapestry/Asset.html}Asset}} interface.
+ Assets are exposed to your code as instances of the {{{../../apidocs/org/apache/tapestry5/Asset.html}Asset}} interface.
Injecting Assets
Components learn about assets via injection. The
{{{inject.html}Inject}} annotation allows Assets to be injected into components as read-only properties. The path to
the resource is specified using the
- {{{../../apidocs/org/apache/tapestry/annotation/Path.html}Path}} annotation.
+ {{{../../apidocs/org/apache/tapestry5/annotations/Path.html}Path}} annotation.
+----+
@Inject
@@ -74,7 +74,7 @@
If you wish to create new domains for assets, for example to allow assets to be stored on the file system or in a database,
you may define a new
- {{{../../apidocs/org/apache/tapestry/services/AssetFactory.html}AssetFactory}}
+ {{{../../apidocs/org/apache/tapestry5/services/AssetFactory.html}AssetFactory}}
and contribute it to the AssetSource service configuration.
Simplified Paths
@@ -93,7 +93,7 @@
}
+---+
- Thus, the generated URLs may say <<</assets/tapestry/Foo.gif>>> but the underlying file will be <<</org/apache/tapestry/Foo.gif>>> (within the classpath).
+ Thus, the generated URLs may say <<</assets/tapestry5/Foo.gif>>> but the underlying file will be <<</org/apache/tapestry5/Foo.gif>>> (within the classpath).
Care should be taken to not create overlapping mappings, as the results would not be predictable.
diff --git a/tapestry-core/src/site/apt/guide/beaneditform.apt b/tapestry-core/src/site/apt/guide/beaneditform.apt
index 75eb940..8726e9b 100644
--- a/tapestry-core/src/site/apt/guide/beaneditform.apt
+++ b/tapestry-core/src/site/apt/guide/beaneditform.apt
@@ -51,7 +51,7 @@
In some cases, a property may be updatable and of a supported type for editing, but should not be presented to the user for editing: for example,
a property that holds the primary key of a database entity. In such a case, the
- {{{../../apidocs/org/apache/tapestry/beaneditor/NonVisual.html}NonVisual}} annotation may be applied to the property (either the getter
+ {{{../../apidocs/org/apache/tapestry5/beaneditor/NonVisual.html}NonVisual}} annotation may be applied to the property (either the getter
or the setter method).
* Default Validation
@@ -59,12 +59,12 @@
Default validation for fields is primary determined by property type.
If desired, additional validation may be specified using the
- {{{../../apidocs/org/apache/tapestry/beaneditor/Validate.html}Validate}} annotation.
+ {{{../../apidocs/org/apache/tapestry5/beaneditor/Validate.html}Validate}} annotation.
* Property ordering
By default, the order in which properties are presented is as defined above (order of the getter method).
- The {{{../../apidocs/org/apache/tapestry/beaneditor/Order.html}Order}} annotation may be used to modify the normal ordering.
+ The {{{../../apidocs/org/apache/tapestry5/beaneditor/Order.html}Order}} annotation may be used to modify the normal ordering.
* Default Label
@@ -113,7 +113,7 @@
Providing the BeanModel
- The BeanEditForm component operates in terms of a {{{../../apidocs/org/apache/tapestry/beaneditor/BeanModel.html}BeanModel}}, which describes
+ The BeanEditForm component operates in terms of a {{{../../apidocs/org/apache/tapestry5/beaneditor/BeanModel.html}BeanModel}}, which describes
the properties, their presentation order, labels and so forth.
Normally, the BeanEditForm automatically creates the BeanModel as needed, based on the type of object bound to its object parameter.
@@ -163,8 +163,8 @@
First, decide on a logical name for the data type. For example, you may decide that the BigDecimal type will represent currency in your application, so name the data type "currency".
Next, you must make contributions to the
- {{{../../apidocs/org/apache/tapestry/services/DataTypeAnalyzer.html}DataTypeAnalyzer}} or
- {{{../../apidocs/org/apache/tapestry/services/DefaultDataTypeAnalyzer.html}DefaultDataTypeAnalyzer}} services to match properties to your new name.
+ {{{../../apidocs/org/apache/tapestry5/services/DataTypeAnalyzer.html}DataTypeAnalyzer}} or
+ {{{../../apidocs/org/apache/tapestry5/services/DefaultDataTypeAnalyzer.html}DefaultDataTypeAnalyzer}} services to match properties to your new name.
DataTypeAnalyzer is a chain of command that can make match properties to data types based on property type or annotations on the property. In general,
DefaultDataTypeAnalyzer is used, as that only needs to consider property type. DefaultDataTypeAnalyzer matches property types to data types, based on a search up
@@ -216,7 +216,7 @@
+--+
Finally, we tell the BeanEditForm component about the editor via a contribution to the
- {{{../../apidocs/org/apache/tapestry/services/BeanBlockSource.html}BeanBlockSource}} service:
+ {{{../../apidocs/org/apache/tapestry5/services/BeanBlockSource.html}BeanBlockSource}} service:
+---+
public static void contributeBeanBlockSource(Configuration<BeanBlockContribution> configuration)
diff --git a/tapestry-core/src/site/apt/guide/component-classes.apt b/tapestry-core/src/site/apt/guide/component-classes.apt
index de171e5..9d65e79 100644
--- a/tapestry-core/src/site/apt/guide/component-classes.apt
+++ b/tapestry-core/src/site/apt/guide/component-classes.apt
@@ -33,8 +33,8 @@
+----+
package org.example.myapp.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.BeginRender;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.BeginRender;
public class HelloWorld
{
@@ -47,7 +47,7 @@
+----+
This component's only job is to write out a fixed message. The
- {{{../../apidocs/org/apache/tapestry/annotation/BeginRender.html}BeginRender}} annotation is
+ {{{../../apidocs/org/apache/tapestry5/annotations/BeginRender.html}BeginRender}} annotation is
a type of <{{{rendering.html}component lifecycle annotation}}>, a method annotation that instructs
Tapestry when and under what circumstances to invoke methods of your class.
@@ -138,7 +138,7 @@
Be aware that you will need to provide getter and setter methods to access your classes'
instance variables. Tapestry <does not> do this automatically unless you provide
- the {{{../../apidocs/org/apache/tapestry/annotation/Property.html}Property}} annotation on the field.
+ the {{{../../apidocs/org/apache/tapestry5/annotations/Property.html}Property}} annotation on the field.
Transient Instance Variables
@@ -151,7 +151,7 @@
If you have a variable that can keep its value between requests and you would like
to defeat that reset logic, then you should attach a
- {{{../../apidocs/org/apache/tapestry/annotation/Retain.html}Retain}} annotation to the field. You should take
+ {{{../../apidocs/org/apache/tapestry5/annotations/Retain.html}Retain}} annotation to the field. You should take
care that no client-specific data is stored into such a field, since on a later request
the same page <instance> may be used for a different user. Likewise, on a later request for the <same> user,
a <different> page instance may be used.
@@ -173,7 +173,7 @@
Parameters
{{{parameters.html}Component parameters}} are also identified using private fields of your class, with
- the {{{.../apidocs/org/apache/tapestry/annotation/Parameter.html}Parameter}} annotation.
+ the {{{.../apidocs/org/apache/tapestry5/annotations/Parameter.html}Parameter}} annotation.
Persistent Fields
@@ -187,7 +187,7 @@
You can define the type of component inside template, or you can create an instance variable for the component
and use the
- {{{../../apidocs/org/apache/tapestry/annotation/Component.html}Component}} annotation to define the component type
+ {{{../../apidocs/org/apache/tapestry5/annotations/Component.html}Component}} annotation to define the component type
and parameters.
Example:
@@ -195,8 +195,8 @@
+---+
package org.example.app.pages;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.Property;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Property;
import org.example.app.components.Count;
public class Countdown
diff --git a/tapestry-core/src/site/apt/guide/conf.apt b/tapestry-core/src/site/apt/guide/conf.apt
index 49121b2..6ad0b54 100644
--- a/tapestry-core/src/site/apt/guide/conf.apt
+++ b/tapestry-core/src/site/apt/guide/conf.apt
@@ -35,7 +35,7 @@
</context-param>
<filter>
<filter-name>app</filter-name>
- <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+ <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>app</filter-name>
@@ -81,7 +81,7 @@
These symbols are always defined in terms of strings, that are coerced to the appropriate type (a number,
a boolean, etc.). Of special note are <time intervals>, which are specified in a
- {{{../../apidocs/org/apache/tapestry/ioc/util/TimeInterval.html}particular format}}.
+ {{{../../apidocs/org/apache/tapestry5/ioc/util/TimeInterval.html}particular format}}.
[tapestry.compress-whitespace]
@@ -104,7 +104,7 @@
of the stylesheet are subject to change at any time (they are considered internal), so replacing the stylesheet,
rather than overriding selected rules within it, entails some risk.
- The default is org/apache/tapestry/default.css, stored on the classpath.
+ The default is org/apache/tapestry5/default.css, stored on the classpath.
[tapestry.file-check-interval]
Time interval between file system checks. During a file system check, only a single thread is active (all others
@@ -164,7 +164,7 @@
an entirely new page instance. The default is "10 ms".
[tapestry.secure-page]
- If true, then the page may only be accessed via HTTPS. The {{{../../apidocs/org/apache/tapestry/annotation/Secure.html}@Secure}}
+ If true, then the page may only be accessed via HTTPS. The {{{../../apidocs/org/apache/tapestry5/annotations/Secure.html}@Secure}}
annotation will set this value to true.
[tapestry.scriptaculous]
diff --git a/tapestry-core/src/site/apt/guide/css.apt b/tapestry-core/src/site/apt/guide/css.apt
index ac461bf..50a2e25 100644
--- a/tapestry-core/src/site/apt/guide/css.apt
+++ b/tapestry-core/src/site/apt/guide/css.apt
@@ -42,7 +42,7 @@
Using the IncludeStylesheet Annotation
Another approach to adding a stylesheet is to include an
- {{{../../apidocs/org/apache/tapestry/annotation/IncludeStylesheet.html}IncludeStylesheet}} annotation on your component class:
+ {{{../../apidocs/org/apache/tapestry5/annotations/IncludeStylesheet.html}IncludeStylesheet}} annotation on your component class:
+---+
@IncludeStylesheet("context:css/myapp.css")
diff --git a/tapestry-core/src/site/apt/guide/dom.apt b/tapestry-core/src/site/apt/guide/dom.apt
index 0ac7a25..dc9a840 100644
--- a/tapestry-core/src/site/apt/guide/dom.apt
+++ b/tapestry-core/src/site/apt/guide/dom.apt
@@ -39,7 +39,7 @@
the serial (or buffered) approach used in Tapestry 4.
A new
- {{{../../apidocs/org/apache/tapestry/MarkupWriter.html}MarkupWriter}} interface
+ {{{../../apidocs/org/apache/tapestry5/MarkupWriter.html}MarkupWriter}} interface
allows the majority of code to treat the generation of output as a stream. In fact,
MarkupWriter is more like a cursor into the DOM tree.
@@ -59,7 +59,7 @@
DOM object includes methods that create new sub-objects. This primarily applies to the Element
class, which can be a container of text, comments and other elements.
-* {{{../../apidocs/org/apache/tapestry/dom/Document.html}Document}}
+* {{{../../apidocs/org/apache/tapestry5/dom/Document.html}Document}}
The Document object represents the an entire document, which is to say, an entire response to be
sent to the client.
@@ -69,7 +69,7 @@
<<TODO: Support for doctypes, content type, processing instructions, and top-level comments.>>
-* {{{../../apidocs/org/apache/tapestry/dom/Element.html}Element}}
+* {{{../../apidocs/org/apache/tapestry5/dom/Element.html}Element}}
An element of the document. Elements may have attributes, and they may themselves contain other
elements, as well as text and comments.
@@ -82,7 +82,7 @@
a few methods for re-parenting DOM nodes into new elements. In addition, some searching methods may be added.
-{{{../../apidocs/org/apache/tapestry/MarkupWriter.html}MarkupWriter}}
+{{{../../apidocs/org/apache/tapestry5/MarkupWriter.html}MarkupWriter}}
The MarkupWriter interface allows the structure of the document to be built while maintaining a streaming metaphor.
diff --git a/tapestry-core/src/site/apt/guide/env.apt b/tapestry-core/src/site/apt/guide/env.apt
index 8396a71..2f3c986 100644
--- a/tapestry-core/src/site/apt/guide/env.apt
+++ b/tapestry-core/src/site/apt/guide/env.apt
@@ -14,9 +14,9 @@
and the components it encloses.
An example of this is form support; the
- {{{../ref/org/apache/tapestry/corelib/components/Form.html}Form}}
+ {{{../ref/org/apache/tapestry5/corelib/components/Form.html}Form}}
component creates an environmental of type
- {{{../../apidocs/org/apache/tapestry/services/FormSupport.html}FormSupport}}. The FormSupport
+ {{{../../apidocs/org/apache/tapestry5/services/FormSupport.html}FormSupport}}. The FormSupport
interface allows enclosed components to participate in both the rendering of the Form
and the Form's eventual submission. This is how control names and client-side ids are determined, how fields
register callbacks so that they can process their part of the submission, and
@@ -24,11 +24,11 @@
Using the @Environmental annotation
- The {{{../../apidocs/org/apache/tapestry/annotation/Environmental.html}Environmental}} annotation
+ The {{{../../apidocs/org/apache/tapestry5/annotations/Environmental.html}Environmental}} annotation
is used to dynamically connect to a Environmental service provided by an enclosing component.
A very common Environmental is
- {{{../../apidocs/org/apache/tapestry/RenderSupport.html}RenderSupport}}, used
+ {{{../../apidocs/org/apache/tapestry5/RenderSupport.html}RenderSupport}}, used
when generating {{{ajax.html}client-side JavaScript}}.
+---+
@@ -49,7 +49,7 @@
Environmental services are, by their nature, per-thread (and therefore per-request).
Accessing an environmental field causes a lookup, by type, against
- the {{{../../apidocs/org/apache/tapestry/services/Environment.html}Environment}} service.
+ the {{{../../apidocs/org/apache/tapestry5/services/Environment.html}Environment}} service.
Normally, an environmental of the specified type must be available in the Environment, or an exception
is thrown when accessing the field.
@@ -113,9 +113,9 @@
A number of environmentals are initialized as part of page rendering, even before the first
component starts to render. This initialization is accomplished
with
- {{{../../apidocs/org/apache/tapestry/services/MarkupRendererFilter.html}MarkupRendererFilter}}
+ {{{../../apidocs/org/apache/tapestry5/services/MarkupRendererFilter.html}MarkupRendererFilter}}
contributions to the
- {{{../../apidocs/org/apache/tapestry/service/MarkupRenderer.html}MarkupRenderer}} service.
+ {{{../../apidocs/org/apache/tapestry5/service/MarkupRenderer.html}MarkupRenderer}} service.
Accessing Environmentals in Services
diff --git a/tapestry-core/src/site/apt/guide/event.apt b/tapestry-core/src/site/apt/guide/event.apt
index 647bbef..9e33928 100644
--- a/tapestry-core/src/site/apt/guide/event.apt
+++ b/tapestry-core/src/site/apt/guide/event.apt
@@ -33,7 +33,7 @@
Tapestry 5 introduces the concept of <event handler methods>, identified via a naming convention, or
via the
- {{{../../apidocs/org/apache/tapestry/annotation/OnEvent.html}OnEvent annotation}}. Event handler methods
+ {{{../../apidocs/org/apache/tapestry5/annotations/OnEvent.html}OnEvent annotation}}. Event handler methods
have any visibility, even private (normally they are given package private visibility, to support testing).
Rather than configure a component to invoke a particular method, you identify one or more
@@ -165,8 +165,8 @@
When an event handler method is invoked, the strings are converted back into
values, or even objects. A
- {{{../../apidocs/org/apache/tapestry/ValueEncoder.html}ValueEncoder}} is used to convert between client-side strings
- and server-side objects. The {{{../../apidocs/org/apache/tapestry/services/ValueEncoderSource.html}ValueEncoderSource}} service
+ {{{../../apidocs/org/apache/tapestry5/ValueEncoder.html}ValueEncoder}} is used to convert between client-side strings
+ and server-side objects. The {{{../../apidocs/org/apache/tapestry5/services/ValueEncoderSource.html}ValueEncoderSource}} service
provides the necessary value encoders.
* Method Matching
@@ -179,7 +179,7 @@
To designate that an event handler method should be invoked regardless of how many context parameters are available,
change the method to accept a <single> parameter of type Object[], type List, or
- {{{../../apidocs/org/apache/tapestry/EventContext.html}EventContext}}.
+ {{{../../apidocs/org/apache/tapestry5/EventContext.html}EventContext}}.
Event Bubbling
@@ -235,7 +235,7 @@
Tapestry fires a new event, of type "exception", passing the thrown exception as the context. In fact,
the exception is wrapped inside a
- {{{../../apidocs/org/apache/tapestry/runtime/ComponentEventException.html}ComponentEventException}}, from which
+ {{{../../apidocs/org/apache/tapestry5/runtime/ComponentEventException.html}ComponentEventException}}, from which
you may extract the event type and context.
Thus:
@@ -259,5 +259,5 @@
If there is no exception event handler, or the exception event handler returns null (or is void), then
then the exception will be passed to the
- {{{../../apidocs/org/apache/tapestry/services/RequestExceptionHandler.html}RequestExceptionHandler}} service,
+ {{{../../apidocs/org/apache/tapestry5/services/RequestExceptionHandler.html}RequestExceptionHandler}} service,
which (in default configuraton) will be render the exception page.
\ No newline at end of file
diff --git a/tapestry-core/src/site/apt/guide/inject.apt b/tapestry-core/src/site/apt/guide/inject.apt
index 007bd3e..3a5f983 100644
--- a/tapestry-core/src/site/apt/guide/inject.apt
+++ b/tapestry-core/src/site/apt/guide/inject.apt
@@ -13,7 +13,7 @@
Inject Annotation
- The {{{../../apidocs/org/apache/tapestry/ioc/annotation/Inject.html}Inject annotation}} is used to identify fields that will contain injected services and other resources.
+ The {{{../../apidocs/org/apache/tapestry5/ioc/annotations/Inject.html}Inject annotation}} is used to identify fields that will contain injected services and other resources.
Tapestry allows for two kinds of injection:
@@ -34,17 +34,17 @@
* Asset Injection
When the
- {{{../../apidocs/org/apache/tapestry/annotation/Path.html}Path}} annotation is also present, then the injected value
+ {{{../../apidocs/org/apache/tapestry5/annotations/Path.html}Path}} annotation is also present, then the injected value
(relative to the component) will be a localized {{{assets.html}asset}}.
Symbols in the annotation value are expanded.
* Block Injection
- For field type {{{../../apidocs/org/apache/tapestry/Block.html}Block}}, the value of the Inject annotation is the
+ For field type {{{../../apidocs/org/apache/tapestry5/Block.html}Block}}, the value of the Inject annotation is the
id of the {{{templates.apt}\<block\> element}} within the component's template. Normally, the id of the block is determined from the field name
(after stripping out leading "_" and "$" characters). Where that is not appropriate, an
- {{{../../apidocs/org/apache/tapestry/annotation/Id.html}Id}} annotation can be supplied:
+ {{{../../apidocs/org/apache/tapestry5/annotations/Id.html}Id}} annotation can be supplied:
+---+
@Inject
@@ -63,7 +63,7 @@
For a particular set of field types, Tapestry will inject a <resource> related to the component, such as its Locale.
A very common example occurs when a component needs access to its
- {{{../../apidocs/org/apache/tapestry/ComponentResources.html}resources}}. The component
+ {{{../../apidocs/org/apache/tapestry5/ComponentResources.html}resources}}. The component
can define a field of the appropriate type
and use the Inject annotation without a value:
@@ -86,17 +86,17 @@
[org.apache.commons.logging.Log]
A Log instance configured for the component, based on the component's class name.
- [org.apache.tapestry.ComponentResources]
+ [org.apache.tapestry5.ComponentResources]
The resources for the component, often used to generate links related to the component.
- [org.apache.tapestry.ioc.Messages]
+ [org.apache.tapestry5.ioc.Messages]
The component message catalog for the component, from which
{{{localization.html}localized}} messages can be generated.
Explicit Service Injection
- Here, a specific object is requested. A {{{../../apidocs/org/apache/tapestry/annotation/Service.html}Service}} annotation
+ Here, a specific object is requested. A {{{../../apidocs/org/apache/tapestry5/annotations/Service.html}Service}} annotation
is used to identify the service name.
Example:
@@ -128,7 +128,7 @@
Defining New Injection Logic
Annonymous injection is controlled by the
- {{{../../apidocs/org/apache/tapestry/services/InjectionProvider.html}InjectionProvider}}
+ {{{../../apidocs/org/apache/tapestry5/services/InjectionProvider.html}InjectionProvider}}
service. The configuration for this service is a
{{{http://tapestry.apache.org/tapestry5/tapestry-ioc/command.html}chain of command}} for handling component injections.
diff --git a/tapestry-core/src/site/apt/guide/layout.apt b/tapestry-core/src/site/apt/guide/layout.apt
index fc4c480..6ab8557 100644
--- a/tapestry-core/src/site/apt/guide/layout.apt
+++ b/tapestry-core/src/site/apt/guide/layout.apt
@@ -67,7 +67,7 @@
Components must always have a Java class. In this trivial example, the Layout component
does not have much logic. We can save ourselves some typing using the
- {{{../../apidocs/org/apache/tapestry/annotation/IncludeStylesheet.html}@IncludeStylesheet}}
+ {{{../../apidocs/org/apache/tapestry5/annotations/IncludeStylesheet.html}@IncludeStylesheet}}
annotation (as opposed to directly adding the
\<link\> element to the template.
diff --git a/tapestry-core/src/site/apt/guide/lifecycle.apt b/tapestry-core/src/site/apt/guide/lifecycle.apt
index 8646831..96df89f 100644
--- a/tapestry-core/src/site/apt/guide/lifecycle.apt
+++ b/tapestry-core/src/site/apt/guide/lifecycle.apt
@@ -136,11 +136,11 @@
The annotations / method names are:
- * {{{../../apidocs/org/apache/tapestry/annotation/PageLoaded.html}PageLoaded}} annotation, or method name "pageLoaded"
+ * {{{../../apidocs/org/apache/tapestry5/annotations/PageLoaded.html}PageLoaded}} annotation, or method name "pageLoaded"
- * {{{../../apidocs/org/apache/tapestry/annotation/PageAttached.html}PageAttached}} annotation, or method name "pageAttached"
+ * {{{../../apidocs/org/apache/tapestry5/annotations/PageAttached.html}PageAttached}} annotation, or method name "pageAttached"
- * {{{../../apidocs/org/apache/tapestry/annotation/PageDetached.html}PageDetached}} annotation, or method name "pageDetached"
+ * {{{../../apidocs/org/apache/tapestry5/annotations/PageDetached.html}PageDetached}} annotation, or method name "pageDetached"
\ No newline at end of file
diff --git a/tapestry-core/src/site/apt/guide/localization.apt b/tapestry-core/src/site/apt/guide/localization.apt
index 50ce069..fa212e7 100644
--- a/tapestry-core/src/site/apt/guide/localization.apt
+++ b/tapestry-core/src/site/apt/guide/localization.apt
@@ -159,7 +159,7 @@
When Tapestry renders a page, the very first step is to determine the output content type and charset.
This information is obtained from meta data on the page itself. Meta data is specified using the
- {{{../../apidocs/org/apache/tapestry/annotation/Meta.html}Meta}} annotation.
+ {{{../../apidocs/org/apache/tapestry5/annotations/Meta.html}Meta}} annotation.
First, the response content type is obtained via meta-data key "tapestry.response-content-type". This value defaults to "text/html".
diff --git a/tapestry-core/src/site/apt/guide/logging.apt b/tapestry-core/src/site/apt/guide/logging.apt
index 2d360aa..07a9be7 100644
--- a/tapestry-core/src/site/apt/guide/logging.apt
+++ b/tapestry-core/src/site/apt/guide/logging.apt
@@ -17,7 +17,7 @@
The logger name for a page or component matches the fully qualified class name. You can configure this in log4j.properties:
----
-log4j.category.org.apache.tapestry.integration.app1.pages.MerryChristmas=trace
+log4j.category.org.apache.tapestry5.integration.app1.pages.MerryChristmas=trace
----
Injecting Loggers
@@ -37,7 +37,7 @@
@Log annotation
- You may mark any component method with the {{{../../apidocs/org/apache/tapestry/annotation/Log.html}Log}} annotation.
+ You may mark any component method with the {{{../../apidocs/org/apache/tapestry5/annotations/Log.html}Log}} annotation.
Method entry, exit (and any thrown exceptions) will be logged at DEBUG level. This is very convienient for
debugging, especially when placed on event handler methods.
@@ -51,40 +51,40 @@
---
[DEBUG] MerryChristmas Finished class transformation: InternalClassTransformation[
-public org.apache.tapestry.integration.app1.pages.MerryChristmas extends java.lang.Object
- implements org.apache.tapestry.runtime.Component, org.apache.tapestry.runtime.RenderCommand
+public org.apache.tapestry5.integration.app1.pages.MerryChristmas extends java.lang.Object
+ implements org.apache.tapestry5.runtime.Component, org.apache.tapestry5.runtime.RenderCommand
add default method: public void postRenderCleanup()
<default>
-add default method: public void setupRender(org.apache.tapestry.MarkupWriter $1, org.apache.tapestry.runtime.Event $2)
+add default method: public void setupRender(org.apache.tapestry5.MarkupWriter $1, org.apache.tapestry5.runtime.Event $2)
<default>
-add default method: public void beginRender(org.apache.tapestry.MarkupWriter $1, org.apache.tapestry.runtime.Event $2)
+add default method: public void beginRender(org.apache.tapestry5.MarkupWriter $1, org.apache.tapestry5.runtime.Event $2)
<default>
-add default method: public void beforeRenderTemplate(org.apache.tapestry.MarkupWriter $1, org.apache.tapestry.runtime.Event $2)
+add default method: public void beforeRenderTemplate(org.apache.tapestry5.MarkupWriter $1, org.apache.tapestry5.runtime.Event $2)
<default>
-add default method: public void afterRenderTemplate(org.apache.tapestry.MarkupWriter $1, org.apache.tapestry.runtime.Event $2)
+add default method: public void afterRenderTemplate(org.apache.tapestry5.MarkupWriter $1, org.apache.tapestry5.runtime.Event $2)
<default>
-add default method: public void beforeRenderBody(org.apache.tapestry.MarkupWriter $1, org.apache.tapestry.runtime.Event $2)
+add default method: public void beforeRenderBody(org.apache.tapestry5.MarkupWriter $1, org.apache.tapestry5.runtime.Event $2)
<default>
-add default method: public void afterRenderBody(org.apache.tapestry.MarkupWriter $1, org.apache.tapestry.runtime.Event $2)
+add default method: public void afterRenderBody(org.apache.tapestry5.MarkupWriter $1, org.apache.tapestry5.runtime.Event $2)
<default>
-add default method: public void afterRender(org.apache.tapestry.MarkupWriter $1, org.apache.tapestry.runtime.Event $2)
+add default method: public void afterRender(org.apache.tapestry5.MarkupWriter $1, org.apache.tapestry5.runtime.Event $2)
<default>
-add default method: public void cleanupRender(org.apache.tapestry.MarkupWriter $1, org.apache.tapestry.runtime.Event $2)
+add default method: public void cleanupRender(org.apache.tapestry5.MarkupWriter $1, org.apache.tapestry5.runtime.Event $2)
<default>
-add default method: public boolean handleComponentEvent(org.apache.tapestry.runtime.ComponentEvent $1)
+add default method: public boolean handleComponentEvent(org.apache.tapestry5.runtime.ComponentEvent $1)
<default>
-add default method: public org.apache.tapestry.ComponentResources getComponentResources()
+add default method: public org.apache.tapestry5.ComponentResources getComponentResources()
<default>
add default method: public void containingPageDidLoad()
@@ -96,20 +96,20 @@
add default method: public void containingPageDidAttach()
<default>
-add field: protected final org.apache.tapestry.internal.InternalComponentResources _$resources;
+add field: protected final org.apache.tapestry5.internal.InternalComponentResources _$resources;
-replace method: public final org.apache.tapestry.ComponentResources getComponentResources()
+replace method: public final org.apache.tapestry5.ComponentResources getComponentResources()
return _$resources;
-add default method: public void render(org.apache.tapestry.MarkupWriter $1, org.apache.tapestry.runtime.RenderQueue $2)
+add default method: public void render(org.apache.tapestry5.MarkupWriter $1, org.apache.tapestry5.runtime.RenderQueue $2)
<default>
-replace method: public void render(org.apache.tapestry.MarkupWriter $1, org.apache.tapestry.runtime.RenderQueue $2)
+replace method: public void render(org.apache.tapestry5.MarkupWriter $1, org.apache.tapestry5.runtime.RenderQueue $2)
_$resources.queueRender($2);
convert default constructor: initializer();
-add constructor: org.apache.tapestry.integration.app1.pages.MerryChristmas(org.apache.tapestry.internal.InternalComponentResources $1)
+add constructor: org.apache.tapestry5.integration.app1.pages.MerryChristmas(org.apache.tapestry5.internal.InternalComponentResources $1)
{
_$resources = $1;
initializer();
diff --git a/tapestry-core/src/site/apt/guide/mixins.apt b/tapestry-core/src/site/apt/guide/mixins.apt
index dd5cc53..8390ab0 100644
--- a/tapestry-core/src/site/apt/guide/mixins.apt
+++ b/tapestry-core/src/site/apt/guide/mixins.apt
@@ -44,13 +44,13 @@
in the {{{templates.html}component template}} with the mixins attribute of the
\<comp\> element. This is a comma-separated list of mixin names.
- Alternately, when the {{{../../apidocs/org/apache/tapestry/annotation/Component.html}Component annotation}}
+ Alternately, when the {{{../../apidocs/org/apache/tapestry5/annotations/Component.html}Component annotation}}
is used to define the component type, you may specify the mixins in two ways:
- * The {{{../../apidocs/org/apache/tapestry/annotation/Mixins.html}Mixins annotation}} allows a list
+ * The {{{../../apidocs/org/apache/tapestry5/annotations/Mixins.html}Mixins annotation}} allows a list
of mixin names to be specified.
- * The {{{../../apidocs/org/apache/tapestry/annotation/MixinClasses.html}MixinClasses annotation}}
+ * The {{{../../apidocs/org/apache/tapestry5/annotations/MixinClasses.html}MixinClasses annotation}}
allows a set of mixin class to be specified directly.
[]
@@ -74,7 +74,7 @@
Implementation Mixins
Implementation mixins, mixins which apply to all isntances of a component, are added using the
- {{{../../apidocs/org/apache/tapestry/annotation/Mixin.html}Mixin annotation}}. This annotation
+ {{{../../apidocs/org/apache/tapestry5/annotations/Mixin.html}Mixin annotation}}. This annotation
defines a field that will containg the mixin instance.
+---+
@@ -131,6 +131,6 @@
is reversed.
Exception: Mixins whose class is annotated with
- {{{../../apidocs/org/apache/tapestry/annotation/MixinAfter.html}MixinAfter}} are ordered
+ {{{../../apidocs/org/apache/tapestry5/annotations/MixinAfter.html}MixinAfter}} are ordered
<after> the component, not before.
\ No newline at end of file
diff --git a/tapestry-core/src/site/apt/guide/pagenav.apt b/tapestry-core/src/site/apt/guide/pagenav.apt
index 07fd738..cb3976a 100644
--- a/tapestry-core/src/site/apt/guide/pagenav.apt
+++ b/tapestry-core/src/site/apt/guide/pagenav.apt
@@ -22,8 +22,8 @@
Action Requests
Action requests may take the form of hyperlinks
- ({{{../component-parameters.html#org.apache.tapestry.corelib.components.actionlink}ActionLink}}) or form submissions
- ({{{../component-parameters.html#org.apache.tapestry.corelib.components.form}Form}}).
+ ({{{../component-parameters.html#org.apache.tapestry5.corelib.components.actionlink}ActionLink}}) or form submissions
+ ({{{../component-parameters.html#org.apache.tapestry5.corelib.components.form}Form}}).
In both cases, the value returned from an {{{event.html}event handler method}} controls the response sent to the client web browser.
@@ -62,7 +62,7 @@
You may also return an instance of a page, rather than the name or class of a page.
- A page may be injected via the {{{../../apidocs/org/apache/tapestry/annotation/InjectPage.html}InjectPage}} annotation.
+ A page may be injected via the {{{../../apidocs/org/apache/tapestry5/annotations/InjectPage.html}InjectPage}} annotation.
Often, you will configure the page in some way before returning the page (examples below).
@@ -71,15 +71,15 @@
* Link response
An event handler method may return a
- {{{../../apidocs/org/apache/tapestry/Link.html}Link}} instance directly. The Link is converted into a URL and a client redirect to that URL is sent to the client.
+ {{{../../apidocs/org/apache/tapestry5/Link.html}Link}} instance directly. The Link is converted into a URL and a client redirect to that URL is sent to the client.
- The {{{../../apidocs/org/apache/tapestry/ComponentResources.html}ComponentResources}} object that is injected into your pages (and components) has methods
+ The {{{../../apidocs/org/apache/tapestry5/ComponentResources.html}ComponentResources}} object that is injected into your pages (and components) has methods
for creating action and page links (they are actually defined in
- {{{../../apidocs/org/apache/tapestry/ComponentResourcesCommon.html}ComponentResourcesCommon}}).
+ {{{../../apidocs/org/apache/tapestry5/ComponentResourcesCommon.html}ComponentResourcesCommon}}).
* Stream response
- An event handler can also return a {{{../../apidocs/org/apache/tapestry/StreamResponse.html}StreamResponse}} object, which encapsulates a stream to
+ An event handler can also return a {{{../../apidocs/org/apache/tapestry5/StreamResponse.html}StreamResponse}} object, which encapsulates a stream to
be sent directly to the client browser. This is useful for compnents that want to, say, generate an image or PDF and provide it to the client.
diff --git a/tapestry-core/src/site/apt/guide/parameters.apt b/tapestry-core/src/site/apt/guide/parameters.apt
index c809c4c..168a46b 100644
--- a/tapestry-core/src/site/apt/guide/parameters.apt
+++ b/tapestry-core/src/site/apt/guide/parameters.apt
@@ -12,7 +12,7 @@
a specific Java type (which may be a primitive value), and may be <optional> or <required>.
Parameters are defined by placing a
- {{{../../apidocs/org/apache/tapestry/annotation/Parameter.html}Parameter}} annotation
+ {{{../../apidocs/org/apache/tapestry5/annotations/Parameter.html}Parameter}} annotation
onto a private field.
The component listed below is a looping component; it renders its body
@@ -23,9 +23,9 @@
+---+
package org.example.app.components;
-import org.apache.tapestry.annotation.AfterRender;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.SetupRender;
+import org.apache.tapestry5.annotations.AfterRender;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.SetupRender;
public class Count
{
@@ -123,7 +123,7 @@
*------------+----------------------------------------------------------------------------------+
| literal | A literal string. |
*------------+----------------------------------------------------------------------------------+
-| nullfieldstrategy | Used to locate a pre-defined {{{../../apidocs/org/apache/tapestry/NullFieldStrategy.html}NullFieldStrategy}}|
+| nullfieldstrategy | Used to locate a pre-defined {{{../../apidocs/org/apache/tapestry5/NullFieldStrategy.html}NullFieldStrategy}}|
*------------+----------------------------------------------------------------------------------+
| message | Retrieves a value from the component's {{{localization.html}message catalog}}. |
*------------+----------------------------------------------------------------------------------+
@@ -242,30 +242,30 @@
Translate Bindings
The "translate:" binding prefix is also related to input validator. It is the name
- of a configured {{{../../apidocs/org/apache/tapestry/Translator.html}Translator}}, responsible
+ of a configured {{{../../apidocs/org/apache/tapestry5/Translator.html}Translator}}, responsible
for converting between server-side and client-side representations of data (for instance, between
client-side strings and server-side numeric values).
The list of available translators is configured by the
- {{{../../apidocs/org/apache/tapestry/services/TranslatorSource.html}TranslatorSource}} service.
+ {{{../../apidocs/org/apache/tapestry5/services/TranslatorSource.html}TranslatorSource}} service.
Informal Parameters
Some components support <informal parameters>, additional parameters beyond the formally defined parameters.
Informal parameters will be rendered into the output as additional attributes on the tag rendered by
the component. Generally speaking, components that have a 1:1 relationship with a particular HTML tag
- (such as {{{../ref/org/apache/tapestry/corelib/components/TextField.html}TextField}} and
+ (such as {{{../ref/org/apache/tapestry5/corelib/components/TextField.html}TextField}} and
\<input\> will support informal parameters.
Only components whose class is annotated with
- {{{../apidocs/org/apache/tapestry/annotation/SupportsInformalParameters.html}SupportsInformalParameters}}
+ {{{../apidocs/org/apache/tapestry5/annotations/SupportsInformalParameters.html}SupportsInformalParameters}}
will support informal parameters.
Informal parameters are often used to set the CSS class of an element, or to specify client-side event handlers.
The default binding prefix for informal parameters depends on <where> the parameter binding is specified.
If the parameter is bound inside a Java class, within the
- {{{../../apidocs/org/apache/tapestry/annotation/Component.html}Component}} annotation, then the default binding
+ {{{../../apidocs/org/apache/tapestry5/annotations/Component.html}Component}} annotation, then the default binding
prefix is "prop:". If the parameter is bound inside the component template, then the default binding
prefix is "literal:". This reflects the fact that a parameter specified in the Java class, using the annotation, is most likely
a computed value, whereas a value in the template should simply be copied, as is, into the result HTML stream.
@@ -273,12 +273,12 @@
Supporting Informal Parameters
<<Only>> components which area annotated with
- {{{../apidocs/org/apache/tapestry/annotation/SupportsInformalParameters.html}SupportsInformalParameters}}
+ {{{../apidocs/org/apache/tapestry5/annotations/SupportsInformalParameters.html}SupportsInformalParameters}}
may have informal parameters. Tapestry silently drops informal parameters that are specified for components
that do not have this annotation.
To render informal parameters, inject the
- {{{../apidocs/org/apache/tapestry/ComponentResources.html}ComponentResources}} for your component
+ {{{../apidocs/org/apache/tapestry5/ComponentResources.html}ComponentResources}} for your component
and invoke the <<<renderInformalParameters()>>> method.
@@ -369,7 +369,7 @@
In <rare> cases, you may want to compute the binding to be used as a parameter default. In this case, you will provide
a <default binding method>, a method that takes no parameters. The returned value is used to bind the parameter. The return value may
be a
- {{{../../apidocs/org/apache/tapestry/Binding.html}Binding}} instance, or it may be a simple value (which is more often the case).
+ {{{../../apidocs/org/apache/tapestry5/Binding.html}Binding}} instance, or it may be a simple value (which is more often the case).
The method name is "default" plus the capitalized name
of the parameter.
@@ -469,7 +469,7 @@
In rare cases, you may want to take different behaviors based on whether a parameter is bound
or not. This can be accomplished by querying the component's resources, which can be
{{{inject.html}injected}} into the component using the
- {{{../../apidocs/org/apache/tapestry/ioc/annotation/Inject.html}Inject}} annotation:
+ {{{../../apidocs/org/apache/tapestry5/ioc/annotations/Inject.html}Inject}} annotation:
+---+
public class MyComponent
@@ -495,7 +495,7 @@
it is hard to distinguish between no binding, and binding explicitly to the value 0.
The Inject annotation will inject the
- {{{../../apidocs/org/apache/tapestry/ComponentResources.html}ComponentResources}} for the component.
+ {{{../../apidocs/org/apache/tapestry5/ComponentResources.html}ComponentResources}} for the component.
These resources are the linkage between the Java class you provide, and the infrastructure Tapestry
builds around your class. In any case, once the resources are injected,
they can be queried.
diff --git a/tapestry-core/src/site/apt/guide/persist.apt b/tapestry-core/src/site/apt/guide/persist.apt
index 582a086..78ce7e6 100644
--- a/tapestry-core/src/site/apt/guide/persist.apt
+++ b/tapestry-core/src/site/apt/guide/persist.apt
@@ -13,7 +13,7 @@
to it in later requests.
This is accomplished with the
- {{{../../apidocs/org/apache/tapestry/annotation/Persist.html}Persist annotation}}.
+ {{{../../apidocs/org/apache/tapestry5/annotations/Persist.html}Persist annotation}}.
This annotation is applied to private instance fields.
@@ -76,7 +76,7 @@
For each component, the meta-data property <<<tapestry.persistence-strategy>>> is checked.
This can be specified using the
- {{{../../apidocs/org/apache/tapestry/annotation/Meta.html}Meta}} annotation.
+ {{{../../apidocs/org/apache/tapestry5/annotations/Meta.html}Meta}} annotation.
If the value is non-blank, then that strategy is used. This allows a component to control
the persistence strategy used inside any sub-components (that don't explicitly use a different
diff --git a/tapestry-core/src/site/apt/guide/rendering.apt b/tapestry-core/src/site/apt/guide/rendering.apt
index a5bb9f3..848cbe3 100644
--- a/tapestry-core/src/site/apt/guide/rendering.apt
+++ b/tapestry-core/src/site/apt/guide/rendering.apt
@@ -65,9 +65,9 @@
+---+
package org.example.app.components;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.AfterRender;
-import org.apache.tapestry.annotation.SetupRender;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.AfterRender;
+import org.apache.tapestry5.annotations.SetupRender;
public class Count
{
@@ -131,13 +131,13 @@
often contain ... more components! That means that many different components will
be in different phases of their own state machine.
-* {{{../../apidocs/org/apache/tapestry/annotation/SetupRender.html}SetupRender}}
+* {{{../../apidocs/org/apache/tapestry5/annotations/SetupRender.html}SetupRender}}
This is where you can perform any one-time per-render setup for your component.
This is a good place to read component parameters and use them to set temporary instance
variables.
-* {{{../../apidocs/org/apache/tapestry/annotation/BeginRender.html}BeginRender}}
+* {{{../../apidocs/org/apache/tapestry5/annotations/BeginRender.html}BeginRender}}
For components that render a tag, the start tag is should be rendered here (the close tag
should be rendered inside the AfterRender phase). The component
@@ -157,13 +157,13 @@
this phase, but the template (if present) or body (if no template is present, but
the component has a body) will be rendered.
-* {{{../../apidocs/org/apache/tapestry/annotation/BeforeRenderTemplate.html}BeforeRenderTemplate}}
+* {{{../../apidocs/org/apache/tapestry5/annotations/BeforeRenderTemplate.html}BeforeRenderTemplate}}
This phase exists to allow a component to decorate
its template (creating markup around the template generated markup), or to allow a component
to skip its template.
-* {{{../../apidocs/org/apache/tapestry/annotation/BeforeRenderBody.html}BeforeRenderBody}}
+* {{{../../apidocs/org/apache/tapestry5/annotations/BeforeRenderBody.html}BeforeRenderBody}}
Phase associated with a component's body (the portion of its container's template that
the component occupies). The BeforeRenderBody phase allows the component the ability
@@ -174,12 +174,12 @@
is reached, or automatically if the component has no template (but the component does
have a body).
-* {{{../../apidocs/org/apache/tapestry/annotation/AfterRenderBody.html}AfterRenderBody}}
+* {{{../../apidocs/org/apache/tapestry5/annotations/AfterRenderBody.html}AfterRenderBody}}
Phase that is executed after the body is rendered; this only occurs for components with a
body.
-* {{{../../apidocs/org/apache/tapestry/annotation/AfterRender.html}AfterRender}}
+* {{{../../apidocs/org/apache/tapestry5/annotations/AfterRender.html}AfterRender}}
This phase complements BeginRender, and is often used to render the close tag
that matches the start tag rendered in the BeginRender phase. In any case, the
@@ -189,7 +189,7 @@
If no methods are annotated with AfterRender, then no special output occurs, and the
CleanupRender phase is triggered.
-* {{{../../apidocs/org/apache/tapestry/annotation/CleanupRender.html}CleanupRender}}
+* {{{../../apidocs/org/apache/tapestry5/annotations/CleanupRender.html}CleanupRender}}
The counterpart to SetupRender, this allows final cleanups to occur.
@@ -204,7 +204,7 @@
+---+
package org.example.app.components;
-import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry5.annotations.Parameter;
public class Count
{
@@ -263,7 +263,7 @@
Rendering Components
Instead of returning true or false, a render phase method may return a component. The component may have been injected via the
- {{{.../apidocs/org/apache/tapestry/annotation/Component.html}Component}} annotation, or may have been passed to the
+ {{{.../apidocs/org/apache/tapestry5/annotations/Component.html}Component}} annotation, or may have been passed to the
as a parameter.
In any case, returning a component will queue that component to be rendered <<before>> the active component continues rendering.
@@ -292,7 +292,7 @@
The order in which the mixins execute is not defined at this time.
Exception: Mixins whose class is annotated with
- {{{../../apidocs/org/apache/tapestry/annotation/MixinAfter.html}MixinAfter}} are ordered
+ {{{../../apidocs/org/apache/tapestry5/annotations/MixinAfter.html}MixinAfter}} are ordered
<after> the component, not before.
* Parents before Child
diff --git a/tapestry-core/src/site/apt/guide/request.apt b/tapestry-core/src/site/apt/guide/request.apt
index d4a9adb..36724b2 100644
--- a/tapestry-core/src/site/apt/guide/request.apt
+++ b/tapestry-core/src/site/apt/guide/request.apt
@@ -19,14 +19,14 @@
functions.
When it receives a request, the TapestryFilter obtains the
- {{{../../apidocs/org/apache/tapestry/services/HttpServletRequestHandler.html}HttpServletRequestHandler}}
+ {{{../../apidocs/org/apache/tapestry5/services/HttpServletRequestHandler.html}HttpServletRequestHandler}}
service, and invokes its service() method.
HttpServletRequestHandler Pipeline
This pipeline performs initial processing of the request. It can be extended
by contributing a
- {{{../../apidocs/org/apache/tapestry/services/HttpServletRequestFilter.html}HttpServletRequestFilter}} into
+ {{{../../apidocs/org/apache/tapestry5/services/HttpServletRequestFilter.html}HttpServletRequestFilter}} into
the HttpServletRequestHandler service's configuration.'
Tapestry does not contribute any filters into this pipeline of its own
@@ -37,9 +37,9 @@
service. This is a threaded service that stores per-thread/per-request information.
* It wraps the request and response as a
- {{{../../apidocs/org/apache/tapestry/services/Request.html}Request}} and
- {{{../../apidocs/org/apache/tapestry/services/Response.html}Response}}, and passes them into the
- {{{../../apidocs/org/apache/tapestry/services/RequestHandler.html}RequestHandler}} pipeline.
+ {{{../../apidocs/org/apache/tapestry5/services/Request.html}Request}} and
+ {{{../../apidocs/org/apache/tapestry5/services/Response.html}Response}}, and passes them into the
+ {{{../../apidocs/org/apache/tapestry5/services/RequestHandler.html}RequestHandler}} pipeline.
[]
@@ -63,15 +63,15 @@
the request, so that the servlet container can handle the reuest normally.
* ErrorFilter catches uncaught exceptions from the lower levels of Tapestry and presents the exception report page.
- This involves the {{{../../apidocs/org/apache/tapestry/services/RequestExceptionHandler.html}RequestExceptionHandler}} service,
+ This involves the {{{../../apidocs/org/apache/tapestry5/services/RequestExceptionHandler.html}RequestExceptionHandler}} service,
which is responsible for initializing and rendering the
- {{{../../apidocs/org/apache/tapestry/corelib/pages/ExceptionReport.html}core/ExceptionReport}} page.
+ {{{../../apidocs/org/apache/tapestry5/corelib/pages/ExceptionReport.html}core/ExceptionReport}} page.
[]
The terminator for this pipeline stores the Request and the Response into RequestGlobals, then requests that the
- {{{../../apidocs/org/apache/tapestry/services/Dispatcher.html}MasterDispatcher}} service figure out how to
+ {{{../../apidocs/org/apache/tapestry5/services/Dispatcher.html}MasterDispatcher}} service figure out how to
handle the request (if it is, indeed, a Tapestry request).
Master Dispatcher Service
diff --git a/tapestry-core/src/site/apt/guide/secure.apt b/tapestry-core/src/site/apt/guide/secure.apt
index e91cdb6..bbe9ef7 100644
--- a/tapestry-core/src/site/apt/guide/secure.apt
+++ b/tapestry-core/src/site/apt/guide/secure.apt
@@ -11,7 +11,7 @@
This could be a login page, or a product ordering wizard, or administrative pages.
All that is necessary to mark a page as secure is to add
- the {{{../../apidocs/org/apache/tapestry/annotation/Secure.html}Secure}} annotation to the page class:
+ the {{{../../apidocs/org/apache/tapestry5/annotations/Secure.html}Secure}} annotation to the page class:
----
@Secure
@@ -41,7 +41,7 @@
enable security for folders of pages. All pages in or beneath the folder will be secured.
This is accomplished by making a contribution to the
- {{{../../apidocs/org/apache/tapestry/services/MetaDataLocator.html}MetaDataLocator}}
+ {{{../../apidocs/org/apache/tapestry5/services/MetaDataLocator.html}MetaDataLocator}}
service configuration. For example, to secure all pages in the "admin" folder:
----
@@ -84,7 +84,7 @@
Because of this, Tapestry includes a hook to allow you to override how these default
URLs are created: the
- {{{../../apidocs/org/apache/tapestry/services/BaseURLSource.html}BaseURLSource}} service.
+ {{{../../apidocs/org/apache/tapestry5/services/BaseURLSource.html}BaseURLSource}} service.
The default implementation is based on just the getServerName() method; it's often not the
correct choice even for development.
diff --git a/tapestry-core/src/site/apt/guide/templates.apt b/tapestry-core/src/site/apt/guide/templates.apt
index 4309859..c66ad80 100644
--- a/tapestry-core/src/site/apt/guide/templates.apt
+++ b/tapestry-core/src/site/apt/guide/templates.apt
@@ -319,7 +319,7 @@
element being instrumented.
A component <must> have a type, either via the t:type attribute in the template, or by the defining the component in the Java class using the
- {{{../../apidocs/org/apache/tapestry/annotation/Component.html}Component}} annotation (and using the t:id attribute on the element in the template).
+ {{{../../apidocs/org/apache/tapestry5/annotations/Component.html}Component}} annotation (and using the t:id attribute on the element in the template).
In <most> cases,it is an aesthetic choice between normal emebedded components, and embedded components via invisible instrumentation. In a few instances,
diff --git a/tapestry-core/src/site/apt/guide/unit-testing-pages.apt b/tapestry-core/src/site/apt/guide/unit-testing-pages.apt
index ff9b6f0..aa89768 100644
--- a/tapestry-core/src/site/apt/guide/unit-testing-pages.apt
+++ b/tapestry-core/src/site/apt/guide/unit-testing-pages.apt
@@ -10,7 +10,7 @@
* Setting up a driving environment
In order to unit test a page, you'll need to create an instance of
- {{{../../apidocs/org/apache/tapestry/test/pagelevel/PageTester.html}PageTester}}.
+ {{{../../apidocs/org/apache/tapestry5/test/pagelevel/PageTester.html}PageTester}}.
It acts as both the browser and the servlet container so that you can
use it to drive your page. As it is not a real servlet container, you need
to tell it the same information as you would in web.xml:
@@ -42,7 +42,7 @@
To test if a page renders properly (optionally with context), you can tell
the PageTester to render it and then assert against the
- {{{../../apidocs/org/apache/tapestry/dom/Document.html}DOM Document}} returned.
+ {{{../../apidocs/org/apache/tapestry5/dom/Document.html}DOM Document}} returned.
Here is an example. Let's assuming the page being tested is named "MyPage"
and it should return a page containing an HTML element whose id is "id1"
@@ -129,7 +129,7 @@
+---+
To submit a form by clicking a submit button, call the
- {{{../../apidocs/org/apache/tapestry/test/pagelevel/PageTester.html#clickSubmit(org.apache.tapestry.dom.Element, java.util.Map)}clickSubmit()}}
+ {{{../../apidocs/org/apache/tapestry5/test/pagelevel/PageTester.html#clickSubmit(org.apache.tapestry5.dom.Element, java.util.Map)}clickSubmit()}}
method instead.
* Unit testing a component
diff --git a/tapestry-core/src/site/apt/guide/validation.apt b/tapestry-core/src/site/apt/guide/validation.apt
index 3e63c48..7d9a217 100644
--- a/tapestry-core/src/site/apt/guide/validation.apt
+++ b/tapestry-core/src/site/apt/guide/validation.apt
@@ -17,11 +17,11 @@
Form component
The core of Tapestry's form support is the
- {{{../ref/org/apache/tapestry/corelib/components/Form.html}Form}} component. The Form component encloses (wraps around) all the
+ {{{../ref/org/apache/tapestry5/corelib/components/Form.html}Form}} component. The Form component encloses (wraps around) all the
other <field components> such as
- {{{../ref/org/apache/tapestry/corelib/components/TextField.html}TextField}},
- {{{../ref/org/apache/tapestry/corelib/components/TextArea.html}TextArea}},
- {{{../ref/org/apache/tapestry/corelib/components/Checkbox.html}Checkbox}}, etc.
+ {{{../ref/org/apache/tapestry5/corelib/components/TextField.html}TextField}},
+ {{{../ref/org/apache/tapestry5/corelib/components/TextArea.html}TextArea}},
+ {{{../ref/org/apache/tapestry5/corelib/components/Checkbox.html}Checkbox}}, etc.
The Form component generates a number of {{{event.html}component events}} that
you may provide event handler methods for.
@@ -57,7 +57,7 @@
Tracking Validation Errors
Associated with the Form is an
- {{{../../apidocs/org/apache/tapestry/ValidationTracker.html}ValidationTracker}}
+ {{{../../apidocs/org/apache/tapestry5/ValidationTracker.html}ValidationTracker}}
that tracks all the provided user input and validation errors for every field in the
form. The tracker can be provided to the Form via the Form's tracker parameter,
but this is rarely necessary.
@@ -67,7 +67,7 @@
In your own logic, it is possible to record your own errors. Form includes
two different versions of method <<<recordError()>>>, one of which specifies a
- {{{../../apidocs/org/apache/tapestry/Field.html}Field}} (an interface implemented by
+ {{{../../apidocs/org/apache/tapestry5/Field.html}Field}} (an interface implemented by
all form element components), and one of which is for "global" errors, unassociated
with any particular field.
@@ -135,7 +135,7 @@
Because of the the fact that a form submission is <two> requests (the submission itself, then a re-render of the page),
it is necessary to make the value stored in the _userName field persist between the two requests. This would be necessary
for the _password field as well, except that the
- {{{../ref/org/apache/tapestry/corelib/components/PasswordField.html}PasswordField}} component never renders a value.
+ {{{../ref/org/apache/tapestry5/corelib/components/PasswordField.html}PasswordField}} component never renders a value.
Note that the onSuccess() method is not public; event handler methods can have any visibility, even private. Package private
(that is, no modifier) is the typical use, as it allows the component to be tested, from a test case class in the same package.
@@ -180,11 +180,11 @@
responsibility, not yours).
The
- {{{../ref/org/apache/tapestry/corelib/components/Errors.html}Errors}} component must be placed inside a Form, it outputs
+ {{{../ref/org/apache/tapestry5/corelib/components/Errors.html}Errors}} component must be placed inside a Form, it outputs
all of the errors for all the fields within the Form as a single list. It uses some simple styling to make the result more presentable.
Each field component, such as the TextField, is paired with a
- {{{../ref/org/apache/tapestry/corelib/components/Label.html}Label}} component. The Label will render out
+ {{{../ref/org/apache/tapestry5/corelib/components/Label.html}Label}} component. The Label will render out
a \<label\> element connected to the field. This is very important for useability, especially for users with
visual disabilities. It also means you can click on the label text to move the cursor to the corresponding field.
@@ -242,7 +242,7 @@
Overriding the Translator with Events
The TextField, PasswordField and TextArea components all have a translate parameter, a
- {{{../../apidocs/org/apache/tapestry/Translator.html}Translator}} object that is used to convert values on the server
+ {{{../../apidocs/org/apache/tapestry5/Translator.html}Translator}} object that is used to convert values on the server
side to strings on the client side.
In most cases, the translate parameter is not set explicitly; Tapestry derives an appropriate value
@@ -293,7 +293,7 @@
Again, returning null lets the normal translator do its work.
The event handler may also throw
- {{{../../apidocs/org/apache/tapestry/ValidationException.html}ValidationException}} to indicate a value
+ {{{../../apidocs/org/apache/tapestry5/ValidationException.html}ValidationException}} to indicate a value
that can't be parsed.
Now, what if you want to perform your own custom validation? That's another event: "validateInput":
diff --git a/tapestry-core/src/site/apt/index.apt b/tapestry-core/src/site/apt/index.apt
index 3d71ce0..0f4105c 100644
--- a/tapestry-core/src/site/apt/index.apt
+++ b/tapestry-core/src/site/apt/index.apt
@@ -19,10 +19,10 @@
* The Exception Report page now identifies the version of the Tapestry framework, and lists
out System properties (including the Java classpath).
- * The {{{ref/org/apache/tapestry/corelib/components/Grid.html}Grid}} component can now update itself in place,
+ * The {{{ref/org/apache/tapestry5/corelib/components/Grid.html}Grid}} component can now update itself in place,
using Ajax, when paging or sorting links are clicked.
- * Added a zone parameter to the {{{ref/org/apache/tapestry/corelib/components/BeanEditForm.;html}BeanEditForm}}
+ * Added a zone parameter to the {{{ref/org/apache/tapestry5/corelib/components/BeanEditForm.;html}BeanEditForm}}
component, to support Ajax updates.
* The @Cached annotation has been added to allowing the caching of method results.
@@ -35,9 +35,9 @@
* Tapestry pages may now be {{{guide/secure.html}secured for access only via HTTPS}}.
- * Added the {{{ref/org/apache/tapestry/corelib/components/FormFragment.html}FormFragment}} component
+ * Added the {{{ref/org/apache/tapestry5/corelib/components/FormFragment.html}FormFragment}} component
to allow for forms that are mutable on the client-side. In addition, the
- {{{ref/org/apache/tapestry/corelib/components/Form.html}Form}} component may
+ {{{ref/org/apache/tapestry5/corelib/components/Form.html}Form}} component may
now update a Zone.
* Form components now trigger a "validateForm" event, not a "validate" event (so as to avoid conflict
@@ -60,7 +60,7 @@
* New Unless component (like an If component, but inverted).
* Support for "password" and "longtext" data types (for use with the BeanEditor), and a new
- {{{ref/org/apache/tapestry/corelib/components/TextOutput.html}TextOutput}} component.
+ {{{ref/org/apache/tapestry5/corelib/components/TextOutput.html}TextOutput}} component.
* The new "var:" binding prefix allows for temporary, untyped storage
of render-time values without having to define a new component property.
diff --git a/tapestry-core/src/site/apt/upgrade.apt b/tapestry-core/src/site/apt/upgrade.apt
index d50e81c..1946cd6 100644
--- a/tapestry-core/src/site/apt/upgrade.apt
+++ b/tapestry-core/src/site/apt/upgrade.apt
@@ -21,14 +21,14 @@
had to be renamed or refactored.
PageRenderSupport has been renamed to just
- {{{../apidocs/org/apache/tapestry/RenderSupport.html}RenderSupport}}.
+ {{{../apidocs/org/apache/tapestry5/RenderSupport.html}RenderSupport}}.
TapestryConstants has been removed, split into a number of new classes (by type), such as
- {{{../apidocs/org/apache/tapestry/SymbolConstants.html}SymbolConstants}}.
+ {{{../apidocs/org/apache/tapestry5/SymbolConstants.html}SymbolConstants}}.
Likewise, TapestryUtils has been split into
- {{{../apidocs/org/apache/tapestry/MarkupUtils.html}MarkupUtils}} and
- {{{../apidocs/org/apache/tapestry/VersionUtils.html}VersionUtils}}.
+ {{{../apidocs/org/apache/tapestry5/MarkupUtils.html}MarkupUtils}} and
+ {{{../apidocs/org/apache/tapestry5/VersionUtils.html}VersionUtils}}.
Because of naming conflicts, several classes and interfaces were moved under an
org.apache.tapestry5 package:
@@ -47,12 +47,12 @@
* TapestryModule
Many of the internal services of Tapestry have been split off into their own module,
- {{{../apidocs/org/apache/tapestry/internal/services/InternalModule.html}InternalModule}}.
+ {{{../apidocs/org/apache/tapestry5/internal/services/InternalModule.html}InternalModule}}.
This should not affect any user code.
* Form component
- The default {{{../apidocs/org/apache/tapestry/ValidationTracker.html}ValidationTracker}}
+ The default {{{../apidocs/org/apache/tapestry5/ValidationTracker.html}ValidationTracker}}
built into the Form component now has a persistence strategy of "flash". This means that
if you navigate away from a page with validation errors and return, you will lose the errors
To support this style of navigation, you will need to bind the Form's tracker parameter
@@ -62,7 +62,7 @@
* Resource.openStream()
The methods <<<exists()>>> and <<<openStream()>>> were added to the
- {{{../apidocs/org/apache/tapestry/ioc/Resource.html}Resource}} interface. The semantics
+ {{{../apidocs/org/apache/tapestry5/ioc/Resource.html}Resource}} interface. The semantics
of some of the other methods were slightly alterred.
* Loop element parameter
@@ -74,19 +74,19 @@
* Field.getElementName()
- The method <<<getElementName()>>> on interface {{{../apidocs/org/apache/tapestry/Field.html}Field}}
+ The method <<<getElementName()>>> on interface {{{../apidocs/org/apache/tapestry5/Field.html}Field}}
was renamed to <<<getControlName()>>>. This brings the property in alignment with W3C documentation
and terminology, and helps differentiate from the element name (i.e., the tag name used to represent
the element in a component template).
This affects a number of existing components that implement the interface.
- Method <<<allocateElementName()>>> on interface {{{../apidocs/org/apache/tapestry/services/FormSupport.html}FormSupport}}
+ Method <<<allocateElementName()>>> on interface {{{../apidocs/org/apache/tapestry5/services/FormSupport.html}FormSupport}}
was likewise renamed to <<<allocateControlName()>>>.
* Zone
- The show and hide parameters of the {{{ref/org/apache/tapestry/corelib/components/Zone.html}Zone}}
+ The show and hide parameters of the {{{ref/org/apache/tapestry5/corelib/components/Zone.html}Zone}}
component now have a default binding prefix of "literal".
In addition, the client-side Tapestry.ZoneEffect object was renamed to Tapestry.ElementEffect to reflect
@@ -94,25 +94,25 @@
* Validator.invokeIfBlank()
- The method <<<invokeIfBlank()>>> on interface {{{../apidocs/org/apache/tapestry/Validator.html}Validator}}
+ The method <<<invokeIfBlank()>>> on interface {{{../apidocs/org/apache/tapestry5/Validator.html}Validator}}
was renamed to <<<isRequired()>>>.
* MetaDataLocator
- The <<findMeta()>> method on interface {{{../apidocs/org/apache/tapestry/services/MetaDataLocator.html}MetaDataLocator}}
+ The <<findMeta()>> method on interface {{{../apidocs/org/apache/tapestry5/services/MetaDataLocator.html}MetaDataLocator}}
has changed significantly; it now expands symbols and performs type coercion.
* Grid Interfaces
- The {{{../apidocs/org/apache/tapestry/grid/GridModel.html}GridModel}} interface and
+ The {{{../apidocs/org/apache/tapestry5/grid/GridModel.html}GridModel}} interface and
the <<<prepare()>>> method of
- {{{../apidocs/org/apache/tapestry/grid/GridDataSource.html}GridDataSource}} have changed to accommodate
+ {{{../apidocs/org/apache/tapestry5/grid/GridDataSource.html}GridDataSource}} have changed to accommodate
the ability to sort using multiple columns.
* PropertyModel
The <<<getWidth()>>> method was removed from the
- {{{../apidocs/org/apache/tapestry/beaneditor/PropertyModel.java}PropertyModel}} interface; the logic
+ {{{../apidocs/org/apache/tapestry5/beaneditor/PropertyModel.java}PropertyModel}} interface; the logic
for deducing the desired field size from the @Width annotation has been moved into AbstractTextField.
* Grid, BeanEditForm, BeanEditor, BeanDisplay
@@ -120,12 +120,12 @@
The data type for boolean values has changed from "checkbox" (reflecting how it is rendered in an edit form) to "boolean"
(reflecting what it is). In addition, all numeric types are given the data type "number".
This will only affect your application if you provided an overriding contribution
- to the {{{../apidocs/org/apache/tapestry/services/BeanBlockSource.html}BeanBlockSource}} service.
+ to the {{{../apidocs/org/apache/tapestry5/services/BeanBlockSource.html}BeanBlockSource}} service.
* ExceptionInfo
The return type for <<<getStackTrace()>>> on
- {{{../apidocs/org/apache/tapestry/services/ExceptionInfo.html}ExceptionInfo}}
+ {{{../apidocs/org/apache/tapestry5/services/ExceptionInfo.html}ExceptionInfo}}
changed from List\<String\> to List\<StackTraceElement\>.
* ApplicationGlobals and RequestGlobals
@@ -135,7 +135,7 @@
* BeanModel
- The <<<remove()>>> method of {{{../apidocs/org/apache/tapestry/beaneditor/BeanModel.html}BeanModel}} was renamed
+ The <<<remove()>>> method of {{{../apidocs/org/apache/tapestry5/beaneditor/BeanModel.html}BeanModel}} was renamed
to <<<exclude()>>>, and a new method, <<<include()>>> was added. The <<remove>> parameter of BeanEditForm,
BeanEditor, BeanDisplay and Grid were all renamed to <<exclude>> as well (and a new <<include>> parameter was added
to each).
\ No newline at end of file
diff --git a/tapestry-core/src/test/app1/WEB-INF/app.properties b/tapestry-core/src/test/app1/WEB-INF/app.properties
index ac10fe8..97a356f 100644
--- a/tapestry-core/src/test/app1/WEB-INF/app.properties
+++ b/tapestry-core/src/test/app1/WEB-INF/app.properties
@@ -14,4 +14,4 @@
app-catalog-status=Application Catalog Working
-viewlink-label=View
\ No newline at end of file
+viewlink-label=View
diff --git a/tapestry-core/src/test/app1/WEB-INF/web.xml b/tapestry-core/src/test/app1/WEB-INF/web.xml
index ecaf9dd..e38e462 100644
--- a/tapestry-core/src/test/app1/WEB-INF/web.xml
+++ b/tapestry-core/src/test/app1/WEB-INF/web.xml
@@ -22,11 +22,11 @@
<display-name>Integration Test App 1</display-name>
<context-param>
<param-name>tapestry.app-package</param-name>
- <param-value>org.apache.tapestry.integration.app1</param-value>
+ <param-value>org.apache.tapestry5.integration.app1</param-value>
</context-param>
<filter>
<filter-name>app</filter-name>
- <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+ <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>app</filter-name>
diff --git a/tapestry-core/src/test/app3/WEB-INF/web.xml b/tapestry-core/src/test/app3/WEB-INF/web.xml
index b02474f..4bb39e2 100644
--- a/tapestry-core/src/test/app3/WEB-INF/web.xml
+++ b/tapestry-core/src/test/app3/WEB-INF/web.xml
@@ -22,11 +22,11 @@
<display-name>Integration Test App 3</display-name>
<context-param>
<param-name>tapestry.app-package</param-name>
- <param-value>org.apache.tapestry.integration.app3</param-value>
+ <param-value>org.apache.tapestry5.integration.app3</param-value>
</context-param>
<filter>
<filter-name>app</filter-name>
- <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+ <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>app</filter-name>
diff --git a/tapestry-core/src/test/app4/WEB-INF/web.xml b/tapestry-core/src/test/app4/WEB-INF/web.xml
index fbe58fa..bea3287 100644
--- a/tapestry-core/src/test/app4/WEB-INF/web.xml
+++ b/tapestry-core/src/test/app4/WEB-INF/web.xml
@@ -22,11 +22,11 @@
<display-name>Integration Test App 4</display-name>
<context-param>
<param-name>tapestry.app-package</param-name>
- <param-value>org.apache.tapestry.integration.app4</param-value>
+ <param-value>org.apache.tapestry5.integration.app4</param-value>
</context-param>
<filter>
<filter-name>app</filter-name>
- <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+ <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>app</filter-name>
diff --git a/tapestry-core/src/test/conf/testng.xml b/tapestry-core/src/test/conf/testng.xml
index ae33410..96f15b0 100644
--- a/tapestry-core/src/test/conf/testng.xml
+++ b/tapestry-core/src/test/conf/testng.xml
@@ -18,42 +18,42 @@
<suite name="Tapestry Core" thread-count="10" annotations="1.5" verbose="2" parallel="tests">
<test name="Integration Tests">
<packages>
- <package name="org.apache.tapestry.integration"/>
+ <package name="org.apache.tapestry5.integration"/>
</packages>
</test>
<test name="Components">
<packages>
- <package name="org.apache.tapestry.integration.pagelevel"/>
- <package name="org.apache.tapestry.corelib.base"/>
- <package name="org.apache.tapestry.corelib.components"/>
- <package name="org.apache.tapestry.corelib.internal"/>
+ <package name="org.apache.tapestry5.integration.pagelevel"/>
+ <package name="org.apache.tapestry5.corelib.base"/>
+ <package name="org.apache.tapestry5.corelib.components"/>
+ <package name="org.apache.tapestry5.corelib.internal"/>
</packages>
</test>
<test name="Public APIs">
<packages>
<package name="org.apache.tapestry"/>
- <package name="org.apache.tapestry.dom"/>
+ <package name="org.apache.tapestry5.dom"/>
<package name="org.apache.tapestry5.json"/>
- <package name="org.apache.tapestry.services"/>
- <package name="org.apache.tapestry.util"/>
- <package name="org.apache.tapestry.runtime"/>
- <package name="org.apache.tapestry.validator"/>
+ <package name="org.apache.tapestry5.services"/>
+ <package name="org.apache.tapestry5.util"/>
+ <package name="org.apache.tapestry5.runtime"/>
+ <package name="org.apache.tapestry5.validator"/>
</packages>
</test>
<test name="Internal APIs">
<packages>
<package name="org.apache.internal"/>
- <package name="org.apache.tapestry.internal"/>
- <package name="org.apache.tapestry.internal.beaneditor"/>
- <package name="org.apache.tapestry.internal.grid"/>
- <package name="org.apache.tapestry.internal.services"/>
- <package name="org.apache.tapestry.internal.structure"/>
- <package name="org.apache.tapestry.internal.util"/>
- <package name="org.apache.tapestry.internal.bindings"/>
- <package name="org.apache.tapestry.internal.model"/>
- <package name="org.apache.tapestry.internal.test"/>
- <package name="org.apache.tapestry.internal.transform"/>
- <package name="org.apache.tapestry.internal.translator"/>
+ <package name="org.apache.tapestry5.internal"/>
+ <package name="org.apache.tapestry5.internal.beaneditor"/>
+ <package name="org.apache.tapestry5.internal.grid"/>
+ <package name="org.apache.tapestry5.internal.services"/>
+ <package name="org.apache.tapestry5.internal.structure"/>
+ <package name="org.apache.tapestry5.internal.util"/>
+ <package name="org.apache.tapestry5.internal.bindings"/>
+ <package name="org.apache.tapestry5.internal.model"/>
+ <package name="org.apache.tapestry5.internal.test"/>
+ <package name="org.apache.tapestry5.internal.transform"/>
+ <package name="org.apache.tapestry5.internal.translator"/>
</packages>
</test>
</suite>
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/ContentTypeTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/ContentTypeTest.java
index f32797f..7b1c08f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/ContentTypeTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/ContentTypeTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/MarkupUtilsTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/MarkupUtilsTest.java
index 785b2c3..9c0e477 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/MarkupUtilsTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/MarkupUtilsTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/Stooge.java b/tapestry-core/src/test/java/org/apache/tapestry5/Stooge.java
index a137808..ef8207f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/Stooge.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/Stooge.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
public enum Stooge
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/ValidationTrackerImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/ValidationTrackerImplTest.java
index 4c82fd0..da57269 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/ValidationTrackerImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/ValidationTrackerImplTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry;
+package org.apache.tapestry5;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
import java.io.ByteArrayInputStream;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/VersionUtilsTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/VersionUtilsTest.java
index 2db2e8d..6fcd57e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/VersionUtilsTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/VersionUtilsTest.java
@@ -1,4 +1,4 @@
-package org.apache.tapestry;
+package org.apache.tapestry5;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -14,12 +14,12 @@
@Test
public void read_version_number()
{
- assertEquals(VersionUtils.readVersionNumber("org/apache/tapestry/version.properties"), "1.2.3.4");
+ assertEquals(VersionUtils.readVersionNumber("org/apache/tapestry5/version.properties"), "1.2.3.4");
}
@Test
public void read_version_number_no_version_key()
{
- assertEquals(VersionUtils.readVersionNumber("org/apache/tapestry/noversion.properties"), "UNKNOWN");
+ assertEquals(VersionUtils.readVersionNumber("org/apache/tapestry5/noversion.properties"), "UNKNOWN");
}
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/base/AbstractLinkTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/base/AbstractLinkTest.java
index a698379..130b885 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/base/AbstractLinkTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/base/AbstractLinkTest.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.base;
+package org.apache.tapestry5.corelib.base;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.internal.services.ComponentInvocation;
-import org.apache.tapestry.internal.services.ComponentInvocationMap;
-import org.apache.tapestry.internal.services.MarkupWriterImpl;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.test.PageTesterComponentInvocationMap;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.internal.services.ComponentInvocation;
+import org.apache.tapestry5.internal.services.ComponentInvocationMap;
+import org.apache.tapestry5.internal.services.MarkupWriterImpl;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.test.PageTesterComponentInvocationMap;
import org.testng.annotations.Test;
public class AbstractLinkTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutputTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutputTest.java
index 231fa34..d599511 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutputTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/base/AbstractPropertyOutputTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.base;
+package org.apache.tapestry5.corelib.base;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.PropertyConduit;
public class AbstractPropertyOutputTest extends InternalBaseTestCase
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/AnyTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/AnyTest.java
index 9c12540..db2bf16 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/AnyTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/AnyTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.dom.DefaultMarkupModel;
-import org.apache.tapestry.internal.services.MarkupWriterImpl;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.dom.DefaultMarkupModel;
+import org.apache.tapestry5.internal.services.MarkupWriterImpl;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
public class AnyTest extends TapestryTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/BeanEditorTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/BeanEditorTest.java
index 45cf164..ba71f6f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/BeanEditorTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/BeanEditorTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.integration.app1.data.RegistrationData;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.services.BeanModelSource;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.integration.app1.data.RegistrationData;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.services.BeanModelSource;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
public class BeanEditorTest extends TapestryTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/FormTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/FormTest.java
index 5cb3d69..b0026af 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/FormTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/FormTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.ValidationTracker;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.ValidationTracker;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
public class FormTest extends TapestryTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/IfTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/IfTest.java
index 88f0dd4..b1d07fa 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/IfTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/IfTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
public class IfTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/LoopTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/LoopTest.java
index 4ec6106..fdc5f0b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/LoopTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/LoopTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.Heartbeat;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.Heartbeat;
import org.testng.annotations.Test;
import java.util.Arrays;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/OutputRawTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/OutputRawTest.java
index c05c6af..61ef597 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/OutputRawTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/OutputRawTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
public class OutputRawTest extends TapestryTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/OutputTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/OutputTest.java
index 0e9e1a8..ca59b08 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/OutputTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/OutputTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/PropertyEditorTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/PropertyEditorTest.java
index 54a7fcf..b879650 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/PropertyEditorTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/PropertyEditorTest.java
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.services.BeanBlockSource;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.services.BeanBlockSource;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
/**
- * Tests an error case for the PropertyEditor component. The success cases are mixed into the
- * BeanEditForm component's integration tests.
+ * Tests an error case for the PropertyEditor component. The success cases are mixed into the BeanEditForm component's
+ * integration tests.
*/
public class PropertyEditorTest extends TapestryTestCase
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/SelectTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/SelectTest.java
index 74daead..224df14 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/SelectTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/SelectTest.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.corelib.data.BlankOption;
-import org.apache.tapestry.dom.XMLMarkupModel;
-import org.apache.tapestry.internal.OptionGroupModelImpl;
-import org.apache.tapestry.internal.OptionModelImpl;
-import org.apache.tapestry.internal.SelectModelImpl;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.internal.services.MarkupWriterImpl;
-import org.apache.tapestry.internal.services.StringValueEncoder;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.corelib.data.BlankOption;
+import org.apache.tapestry5.dom.XMLMarkupModel;
+import org.apache.tapestry5.internal.OptionGroupModelImpl;
+import org.apache.tapestry5.internal.OptionModelImpl;
+import org.apache.tapestry5.internal.SelectModelImpl;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.internal.services.MarkupWriterImpl;
+import org.apache.tapestry5.internal.services.StringValueEncoder;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import org.testng.annotations.Test;
import java.io.BufferedInputStream;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/SubmitTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/SubmitTest.java
index faa6bb4..33ca128 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/SubmitTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/SubmitTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.corelib.internal.FormSupportImpl;
-import org.apache.tapestry.internal.services.HeartbeatImpl;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.services.Heartbeat;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.corelib.internal.FormSupportImpl;
+import org.apache.tapestry5.internal.services.HeartbeatImpl;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.FormSupport;
+import org.apache.tapestry5.services.Heartbeat;
+import org.apache.tapestry5.services.Request;
import org.testng.annotations.Test;
public class SubmitTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/TextOutputTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/TextOutputTest.java
index 28920dd..c542b1d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/TextOutputTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/TextOutputTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.dom.XMLMarkupModel;
-import org.apache.tapestry.internal.services.MarkupWriterImpl;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.dom.XMLMarkupModel;
+import org.apache.tapestry5.internal.services.MarkupWriterImpl;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
public class TextOutputTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/UnlessTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/UnlessTest.java
index e7f490b..dcb6480 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/UnlessTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/UnlessTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.components;
+package org.apache.tapestry5.corelib.components;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
public class UnlessTest extends InternalBaseTestCase
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/internal/FormSupportImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/internal/FormSupportImplTest.java
index 0ad9a7c..c6b9b37 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/internal/FormSupportImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/internal/FormSupportImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.corelib.internal;
+package org.apache.tapestry5.corelib.internal;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.internal.services.ClientBehaviorSupport;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.internal.services.ClientBehaviorSupport;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
public class FormSupportImplTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java
index e81fedc..78699e1 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/dom/DOMTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.dom;
+package org.apache.tapestry5.dom;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
/**
- * Tests for a number of DOM node classes, including {@link org.apache.tapestry.dom.Element} and
- * {@link org.apache.tapestry.dom.Document}.
+ * Tests for a number of DOM node classes, including {@link org.apache.tapestry5.dom.Element} and {@link
+ * org.apache.tapestry5.dom.Document}.
*/
public class DOMTest extends InternalBaseTestCase
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/AdditionalIntegrationTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/AdditionalIntegrationTests.java
index 7b9bfbb..b77800a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/AdditionalIntegrationTests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/AdditionalIntegrationTests.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration;
+package org.apache.tapestry5.integration;
-import org.apache.tapestry.test.AbstractIntegrationTestSuite;
+import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
import org.testng.annotations.Test;
/**
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/ImmediateModeTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/ImmediateModeTests.java
index 7cb1544..d44897a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/ImmediateModeTests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/ImmediateModeTests.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration;
+package org.apache.tapestry5.integration;
-import org.apache.tapestry.test.AbstractIntegrationTestSuite;
+import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
import org.testng.annotations.Test;
/**
- * Tests for immediate mode (aka T4 mode, aka {@linkplain org.apache.tapestry.SymbolConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS
+ * Tests for immediate mode (aka T4 mode, aka {@linkplain org.apache.tapestry5.SymbolConstants#SUPPRESS_REDIRECT_FROM_ACTION_REQUESTS
* redirects suppressed} mode).
*/
@Test(timeOut = 50000, sequential = true, groups = { "integration" })
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java
index 1676594..1afd85e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/IntegrationTests.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration;
+package org.apache.tapestry5.integration;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.corelib.mixins.RenderDisabled;
-import org.apache.tapestry.integration.app1.pages.RenderErrorDemo;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import org.apache.tapestry.test.AbstractIntegrationTestSuite;
+import org.apache.tapestry5.corelib.components.Form;
+import org.apache.tapestry5.corelib.mixins.RenderDisabled;
+import org.apache.tapestry5.integration.app1.pages.RenderErrorDemo;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
import org.testng.annotations.Test;
import java.io.BufferedInputStream;
@@ -64,7 +64,7 @@
byte[] downloaded = readContent(url);
Resource classpathResource = new ClasspathResource(
- "org/apache/tapestry/integration/app1/pages/nested/tapestry-button.png");
+ "org/apache/tapestry5/integration/app1/pages/nested/tapestry-button.png");
byte[] actual = readContent(classpathResource.toURL());
@@ -111,7 +111,7 @@
assertTextPresent("regexp:\\s+5\\s+4\\s+3\\s+2\\s+1\\s+");
- assertTextPresent("Brought to you by the org.apache.tapestry.integration.app1.components.Count");
+ assertTextPresent("Brought to you by the org.apache.tapestry5.integration.app1.components.Count");
}
@Test
@@ -133,8 +133,8 @@
{
start("BadTemplate Page");
- assertTextPresent("org.apache.tapestry.ioc.internal.util.TapestryException",
- "Failure parsing template classpath:org/apache/tapestry/integration/app1/pages/BadTemplate.tml, line 7, column 15",
+ assertTextPresent("org.apache.tapestry5.ioc.internal.util.TapestryException",
+ "Failure parsing template classpath:org/apache/tapestry5/integration/app1/pages/BadTemplate.tml, line 7, column 15",
"<t:foobar>content from template</t:foobar>",
"Element <t:foobar> is in the Tapestry namespace, but is not a recognized Tapestry template element.");
}
@@ -148,9 +148,9 @@
}
/**
- * {@link org.apache.tapestry.internal.transform.InjectContainerWorker} is largely tested by the forms tests ({@link
- * RenderDisabled} is built on it). test is for the failure case, where a mixin class is used with the wrong type of
- * component.
+ * {@link org.apache.tapestry5.internal.transform.InjectContainerWorker} is largely tested by the forms tests
+ * ({@link RenderDisabled} is built on it). test is for the failure case, where a mixin class is used with the wrong
+ * type of component.
*/
@Test
public void inject_container_failure() throws Exception
@@ -160,7 +160,7 @@
// And exception message:
assertTextPresent(
- "Component InjectContainerMismatch is not assignable to field org.apache.tapestry.corelib.mixins.RenderDisabled.field (of type org.apache.tapestry.Field).");
+ "Component InjectContainerMismatch is not assignable to field org.apache.tapestry5.corelib.mixins.RenderDisabled.field (of type org.apache.tapestry5.Field).");
}
@Test
@@ -169,7 +169,7 @@
start("InjectComponentMismatch");
assertTextPresent(
- "Unable to inject component 'form' into field form of component InjectComponentMismatch. Class org.apache.tapestry.corelib.components.BeanEditForm is not assignable to a field of type org.apache.tapestry.corelib.components.Form.",
+ "Unable to inject component 'form' into field form of component InjectComponentMismatch. Class org.apache.tapestry5.corelib.components.BeanEditForm is not assignable to a field of type org.apache.tapestry5.corelib.components.Form.",
"ClassCastException");
}
@@ -179,13 +179,13 @@
start("Inject Demo");
// is a test for a named @Inject:
- assertTextPresent("<Proxy for Request(org.apache.tapestry.services.Request)>");
+ assertTextPresent("<Proxy for Request(org.apache.tapestry5.services.Request)>");
// is a test for an anonymous @Inject and ComponentResourcesInjectionProvider
assertTextPresent("ComponentResources[InjectDemo]");
// Another test, DefaultInjectionProvider
- assertTextPresent("<Proxy for BindingSource(org.apache.tapestry.services.BindingSource)>");
+ assertTextPresent("<Proxy for BindingSource(org.apache.tapestry5.services.BindingSource)>");
// Prove that injection using a marker annotation (to match against a marked service) works.
@@ -863,7 +863,7 @@
start("Recursive Demo");
assertTextPresent("An unexpected application exception has occurred.",
- "The template for component org.apache.tapestry.integration.app1.components.Recursive is recursive (contains another direct or indirect reference to component org.apache.tapestry.integration.app1.components.Recursive). is not supported (components may not contain themselves).",
+ "The template for component org.apache.tapestry5.integration.app1.components.Recursive is recursive (contains another direct or indirect reference to component org.apache.tapestry5.integration.app1.components.Recursive). is not supported (components may not contain themselves).",
"component is <t:recursive>recursive</t:recursive>, so we\'ll see a failure.");
}
@@ -1038,7 +1038,7 @@
clickAndWait("link=bad");
assertTextPresent("An unexpected application exception has occurred.",
- "An event handler for component org.apache.tapestry.integration.app1.pages.Start returned the value 20 (from method org.apache.tapestry.integration.app1.pages.Start.onActionFromBadReturnType() (at Start.java:34)). Return type java.lang.Integer can not be handled.");
+ "An event handler for component org.apache.tapestry5.integration.app1.pages.Start returned the value 20 (from method org.apache.tapestry5.integration.app1.pages.Start.onActionFromBadReturnType() (at Start.java:34)). Return type java.lang.Integer can not be handled.");
}
@@ -1293,7 +1293,7 @@
open(BASE_URL + "invalidsuperclass");
assertTextPresent(
- "Base class org.apache.tapestry.integration.app1.WrongPackageForBaseClass (super class of org.apache.tapestry.integration.app1.pages.InvalidSuperClass) is not in a controlled package and is therefore not valid. You should try moving the class to package org.apache.tapestry.integration.app1.base.");
+ "Base class org.apache.tapestry5.integration.app1.WrongPackageForBaseClass (super class of org.apache.tapestry5.integration.app1.pages.InvalidSuperClass) is not in a controlled package and is therefore not valid. You should try moving the class to package org.apache.tapestry5.integration.app1.base.");
}
@Test
@@ -1535,12 +1535,12 @@
start("Exception Event Demo", "enable", "force invalid activation context");
assertTextPresent(
- "Exception: Exception in method org.apache.tapestry.integration.app1.pages.ExceptionEventDemo.onActivate(float)");
+ "Exception: Exception in method org.apache.tapestry5.integration.app1.pages.ExceptionEventDemo.onActivate(float)");
clickAndWait("link=force invalid event context");
assertTextPresent(
- "Exception: Exception in method org.apache.tapestry.integration.app1.pages.ExceptionEventDemo.onActionFromFail(float)");
+ "Exception: Exception in method org.apache.tapestry5.integration.app1.pages.ExceptionEventDemo.onActionFromFail(float)");
// Revert to normal handling: return null from the onException() event handler method.
@@ -1549,7 +1549,8 @@
clickAndWait("link=force invalid event context");
assertTextPresent("An unexpected application exception has occurred.",
- "org.apache.tapestry.ioc.internal.util.TapestryException", "java.lang.NumberFormatException");
+ "org.apache.tapestry5.ioc.internal.util.TapestryException",
+ "java.lang.NumberFormatException");
}
@@ -1576,7 +1577,7 @@
{
start("Generic Page Class Demo");
- assertTextPresent("Editor for org.apache.tapestry.integration.app1.data.Track");
+ assertTextPresent("Editor for org.apache.tapestry5.integration.app1.data.Track");
assertSourcePresent("<label for=\"title\" id=\"title:label\">Title</label>");
}
@@ -1883,7 +1884,7 @@
start("Protected Fields Demo", "Trigger the Exception");
assertTextPresent("An unexpected application exception has occurred.",
- "Class org.apache.tapestry.integration.app1.pages.ProtectedFields contains field(s) (_field) that are not private. You should change these fields to private, and add accessor methods if needed.");
+ "Class org.apache.tapestry5.integration.app1.pages.ProtectedFields contains field(s) (_field) that are not private. You should change these fields to private, and add accessor methods if needed.");
}
@@ -1896,7 +1897,7 @@
start("Class Transformation Exception Demo");
assertTextPresent(
- "Class org.apache.tapestry.integration.app1.pages.Datum contains field(s) (_value) that are not private. You should change these fields to private, and add accessor methods if needed.");
+ "Class org.apache.tapestry5.integration.app1.pages.Datum contains field(s) (_value) that are not private. You should change these fields to private, and add accessor methods if needed.");
}
/**
@@ -2020,7 +2021,7 @@
// @ReverseStrings filtered the checked exception to a string result
assertText("cranky",
- "Invocation of method getCranky() failed with org.apache.tapestry.integration.app1.services.DearGodWhyMeException.");
+ "Invocation of method getCranky() failed with org.apache.tapestry5.integration.app1.services.DearGodWhyMeException.");
// Now to check advice on a setter that manipulates parameters
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/RunJetty.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/RunJetty.java
index 41cef5c..ad46372 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/RunJetty.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/RunJetty.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration;
+package org.apache.tapestry5.integration;
-import org.apache.tapestry.test.JettyRunner;
+import org.apache.tapestry5.test.JettyRunner;
import java.io.File;
/**
- * A "shim" to run Demo App #1 inside IntelliJ. I still haven't found a way to get IntelliJ to
- * export test classes and resources into a web facet.
+ * A "shim" to run Demo App #1 inside IntelliJ. I still haven't found a way to get IntelliJ to export test classes and
+ * resources into a web facet.
*/
public class RunJetty
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app0/services/FooModule.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app0/services/FooModule.java
index e53e956..c3c771c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app0/services/FooModule.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app0/services/FooModule.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app0.services;
+package org.apache.tapestry5.integration.app0.services;
-import org.apache.tapestry.util.Transformer;
-import org.apache.tapestry.util.UppercaseTransformer;
+import org.apache.tapestry5.util.Transformer;
+import org.apache.tapestry5.util.UppercaseTransformer;
public class FooModule
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ChattyValidationDecorator.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ChattyValidationDecorator.java
index 09a778b..8960eab 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ChattyValidationDecorator.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ChattyValidationDecorator.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1;
+package org.apache.tapestry5.integration.app1;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationDecorator;
-import org.apache.tapestry.dom.Element;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationDecorator;
+import org.apache.tapestry5.dom.Element;
public class ChattyValidationDecorator implements ValidationDecorator
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/WrongPackageForBaseClass.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/WrongPackageForBaseClass.java
index 215cd57..3bbdbc4 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/WrongPackageForBaseClass.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/WrongPackageForBaseClass.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1;
+package org.apache.tapestry5.integration.app1;
/**
* Used in a test for TAPESTRY-1934; base classes should be in the .base package.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/base/BaseComponent.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/base/BaseComponent.java
index 92dc49d..6e1da0c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/base/BaseComponent.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/base/BaseComponent.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.base;
+package org.apache.tapestry5.integration.app1.base;
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.integration.app1.data.IncidentData;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.integration.app1.data.IncidentData;
public class BaseComponent
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/base/BaseEventHandlerDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/base/BaseEventHandlerDemo.java
index 85eeb21..3ebe5ee 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/base/BaseEventHandlerDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/base/BaseEventHandlerDemo.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.base;
+package org.apache.tapestry5.integration.app1.base;
-import org.apache.tapestry.annotation.OnEvent;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.annotations.OnEvent;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/base/GenericEditor.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/base/GenericEditor.java
index ef09ed8..19eeee7 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/base/GenericEditor.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/base/GenericEditor.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.base;
+package org.apache.tapestry5.integration.app1.base;
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.Retain;
-import org.apache.tapestry.corelib.components.BeanEditForm;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.PropertyConduitSource;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Retain;
+import org.apache.tapestry5.corelib.components.BeanEditForm;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.PropertyConduitSource;
/**
* For testing TAPESTRY-1518.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/AbstractTracer.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/AbstractTracer.java
index da30b9c..b340e07 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/AbstractTracer.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/AbstractTracer.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.AfterRender;
-import org.apache.tapestry.annotation.BeginRender;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.AfterRender;
+import org.apache.tapestry5.annotations.BeginRender;
public abstract class AbstractTracer
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/ActionLinkIndirect.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/ActionLinkIndirect.java
index d3fe0b8..67a844e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/ActionLinkIndirect.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/ActionLinkIndirect.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.corelib.components.ActionLink;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.corelib.components.ActionLink;
public class ActionLinkIndirect
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Border.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Border.java
index 6d11ab3..0769838 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Border.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Border.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.annotation.IncludeStylesheet;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.services.Builtin;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.services.ComponentLayer;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.annotations.IncludeStylesheet;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.services.Builtin;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.services.ComponentLayer;
+import org.apache.tapestry5.services.Request;
/**
* Here's a component with a template, including a t:body element. Really should rename this to "Layout" as that's the
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Count.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Count.java
index 62d6325..e337d1b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Count.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Count.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.annotation.AfterRender;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.annotation.SetupRender;
-import org.apache.tapestry.internal.util.IntegerRange;
+import org.apache.tapestry5.annotations.AfterRender;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.annotations.SetupRender;
+import org.apache.tapestry5.internal.util.IntegerRange;
/**
* A component that can count up or count down.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Echo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Echo.java
index 460333b..a650e0b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Echo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Echo.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.BeginRender;
-import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.BeginRender;
+import org.apache.tapestry5.annotations.Parameter;
/**
* Echos out its value parameter. Uused to test parameter overrides between component annoation and template. Also, used
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/HelloWorld.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/HelloWorld.java
index e7318d3..e6c0128 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/HelloWorld.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/HelloWorld.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.BeginRender;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.BeginRender;
public class HelloWorld
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Inner.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Inner.java
index 1b0de16..dc49a03 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Inner.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Inner.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.ioc.annotations.Inject;
public class Inner
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/IntArrayWriter.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/IntArrayWriter.java
index ebe6e21..fa5a73a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/IntArrayWriter.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/IntArrayWriter.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.Parameter;
public class IntArrayWriter
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Outer.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Outer.java
index 324a562..532b996 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Outer.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Outer.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.annotations.Parameter;
public class Outer
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/OuterAny.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/OuterAny.java
index 48c87f5..ecf310f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/OuterAny.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/OuterAny.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.SupportsInformalParameters;
-import org.apache.tapestry.corelib.components.Any;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.SupportsInformalParameters;
+import org.apache.tapestry5.corelib.components.Any;
@SupportsInformalParameters
public class OuterAny
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Output.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Output.java
index 4edc1f3..a4d7d2c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Output.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Output.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.Parameter;
import java.text.Format;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/OutputRating.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/OutputRating.java
index 9e4d021..56f2d6e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/OutputRating.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/OutputRating.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.Parameter;
public class OutputRating
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Recursive.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Recursive.java
index be6e451..9df84ca 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Recursive.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Recursive.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
public class Recursive
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Render.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Render.java
index b9d5787..6733120 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Render.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Render.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry5.annotations.Parameter;
public class Render
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/RenderableProvider.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/RenderableProvider.java
index 0f5da2f..aa4422f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/RenderableProvider.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/RenderableProvider.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.Renderable;
-import org.apache.tapestry.annotation.CleanupRender;
-import org.apache.tapestry.annotation.SetupRender;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.Environment;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.Renderable;
+import org.apache.tapestry5.annotations.CleanupRender;
+import org.apache.tapestry5.annotations.SetupRender;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.Environment;
public class RenderableProvider
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/RenderableUser.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/RenderableUser.java
index 4f90d6f..650910c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/RenderableUser.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/RenderableUser.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.Renderable;
-import org.apache.tapestry.annotation.BeginRender;
-import org.apache.tapestry.annotation.Environmental;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.Renderable;
+import org.apache.tapestry5.annotations.BeginRender;
+import org.apache.tapestry5.annotations.Environmental;
/**
* Used, with {@link RenderableProvider}, to test the {@link Environmental} annotation.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Strong.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Strong.java
index f3333da..68576da 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Strong.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Strong.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.MarkupWriter;
+import org.apache.tapestry5.MarkupWriter;
public class Strong
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Tracer.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Tracer.java
index 3a056fd..be6fdfc 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Tracer.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/components/Tracer.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.components;
+package org.apache.tapestry5.integration.app1.components;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.AfterRender;
-import org.apache.tapestry.annotation.BeginRender;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.AfterRender;
+import org.apache.tapestry5.annotations.BeginRender;
public class Tracer extends AbstractTracer
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/BirthdayReminder.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/BirthdayReminder.java
index 947eb4f..cd7f618 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/BirthdayReminder.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/BirthdayReminder.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
-import org.apache.tapestry.beaneditor.Validate;
+import org.apache.tapestry5.beaneditor.Validate;
import java.util.Date;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Department.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Department.java
index 27b5d67..ac0a703 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Department.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Department.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
public enum Department
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/IncidentData.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/IncidentData.java
index bb46ee8..33feee6 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/IncidentData.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/IncidentData.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
-import org.apache.tapestry.beaneditor.Validate;
+import org.apache.tapestry5.beaneditor.Validate;
import java.io.Serializable;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/IntegerHolder.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/IntegerHolder.java
index c12f78a..5b75432 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/IntegerHolder.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/IntegerHolder.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
public class IntegerHolder
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/ProgrammingLanguage.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/ProgrammingLanguage.java
index 49bb1f3..4c485a2 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/ProgrammingLanguage.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/ProgrammingLanguage.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
public enum ProgrammingLanguage
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/RegistrationData.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/RegistrationData.java
index 5303e84..7243cd0 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/RegistrationData.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/RegistrationData.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
-import org.apache.tapestry.beaneditor.*;
+import org.apache.tapestry5.beaneditor.*;
public class RegistrationData
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/RoleAccess.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/RoleAccess.java
index 6394213..c53721d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/RoleAccess.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/RoleAccess.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
public enum RoleAccess
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/RolePath.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/RolePath.java
index 3f3ec76..5bd993d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/RolePath.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/RolePath.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
-import org.apache.tapestry.beaneditor.Validate;
+import org.apache.tapestry5.beaneditor.Validate;
public class RolePath
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Sex.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Sex.java
index 77ed539..52a743c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Sex.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Sex.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
public enum Sex
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/SimpleTrack.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/SimpleTrack.java
index 273eb4e..9dd9958 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/SimpleTrack.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/SimpleTrack.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
-import org.apache.tapestry.beaneditor.OrderBefore;
+import org.apache.tapestry5.beaneditor.OrderBefore;
public interface SimpleTrack
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/SubscribeData.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/SubscribeData.java
index d3cd7c5..f241263 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/SubscribeData.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/SubscribeData.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
-import org.apache.tapestry.beaneditor.Validate;
+import org.apache.tapestry5.beaneditor.Validate;
public class SubscribeData
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/ToDoItem.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/ToDoItem.java
index c63c41d..91e9d9a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/ToDoItem.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/ToDoItem.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
-import org.apache.tapestry.beaneditor.NonVisual;
-import org.apache.tapestry.beaneditor.Validate;
+import org.apache.tapestry5.beaneditor.NonVisual;
+import org.apache.tapestry5.beaneditor.Validate;
import java.io.Serializable;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Track.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Track.java
index f846f50..49d00de 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Track.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Track.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
-import org.apache.tapestry.beaneditor.NonVisual;
+import org.apache.tapestry5.beaneditor.NonVisual;
/**
* One track from a music library.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Urgency.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Urgency.java
index 810dadb..2199eab 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Urgency.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/Urgency.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
public enum Urgency
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/UserCredentials.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/UserCredentials.java
index caa2724..93a6648 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/UserCredentials.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/data/UserCredentials.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.data;
+package org.apache.tapestry5.integration.app1.data;
-import org.apache.tapestry.beaneditor.Validate;
+import org.apache.tapestry5.beaneditor.Validate;
public class UserCredentials
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/Emphasis.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/Emphasis.java
index 8878070..24b0b2f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/Emphasis.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/Emphasis.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.mixins;
+package org.apache.tapestry5.integration.app1.mixins;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.AfterRender;
-import org.apache.tapestry.annotation.BeginRender;
-import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.AfterRender;
+import org.apache.tapestry5.annotations.BeginRender;
+import org.apache.tapestry5.annotations.Parameter;
/**
* Mixin that adds emphasis to a component if a test is true.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/TracerMixin.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/TracerMixin.java
index 1af7ea1..0a6052f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/TracerMixin.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/mixins/TracerMixin.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.mixins;
+package org.apache.tapestry5.integration.app1.mixins;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.AfterRender;
-import org.apache.tapestry.annotation.BeginRender;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.AfterRender;
+import org.apache.tapestry5.annotations.BeginRender;
public class TracerMixin
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionPage.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionPage.java
index 026c6c6..b5992b5 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionPage.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionPage.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry5.annotations.Persist;
public class ActionPage
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java
index 2eaf15c..d01f32c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ActionViaLinkDemo.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.ioc.annotations.Inject;
public class ActionViaLinkDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AddedGridColumnsDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AddedGridColumnsDemo.java
index 5dd6e5a..d058de3 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AddedGridColumnsDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AddedGridColumnsDemo.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.corelib.components.Grid;
-import org.apache.tapestry.integration.app1.data.Track;
-import org.apache.tapestry.integration.app1.services.MusicLibrary;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.BeanModelSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.corelib.components.Grid;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.BeanModelSource;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AttributeExpansionsDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AttributeExpansionsDemo.java
index 94edb77..47e8d8c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AttributeExpansionsDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AttributeExpansionsDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class AttributeExpansionsDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AutocompleteDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AutocompleteDemo.java
index bac5a08..83bf9e4 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AutocompleteDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/AutocompleteDemo.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.integration.app1.data.Track;
-import org.apache.tapestry.integration.app1.services.MusicLibrary;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.Collections;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BadTemplate.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BadTemplate.java
index d1141f1..7c9d2f8 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BadTemplate.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BadTemplate.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class BadTemplate
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Barney.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Barney.java
index 25220f8..5c9ffbd 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Barney.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Barney.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class Barney implements Runnable
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditDateDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditDateDemo.java
index 76e9a53..419a820 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditDateDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditDateDemo.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.integration.app1.data.BirthdayReminder;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.integration.app1.data.BirthdayReminder;
public class BeanEditDateDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditRemoveReorder.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditRemoveReorder.java
index e7fbe71..6bfc80b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditRemoveReorder.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditRemoveReorder.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class BeanEditRemoveReorder extends BeanEditorDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorDemo.java
index a0a188c..b3174b8 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorDemo.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.corelib.components.BeanEditForm;
-import org.apache.tapestry.integration.app1.data.RegistrationData;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.corelib.components.BeanEditForm;
+import org.apache.tapestry5.integration.app1.data.RegistrationData;
public class BeanEditorDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorOverride.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorOverride.java
index 4613bf9..f56a422 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorOverride.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BeanEditorOverride.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.corelib.components.BeanEditor;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.integration.app1.data.RegistrationData;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.corelib.components.BeanEditor;
+import org.apache.tapestry5.corelib.components.Form;
+import org.apache.tapestry5.integration.app1.data.RegistrationData;
public class BeanEditorOverride
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockCaller.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockCaller.java
index 4b44700..67ad15c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockCaller.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockCaller.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.annotation.InjectPage;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.InjectPage;
/**
* Part of testing for TAPESTRY-2044
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockDemo.java
index deff507..28cea71 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockDemo.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.Retain;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Retain;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.Map;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockHolder.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockHolder.java
index 3170a23..5717eb8 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockHolder.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BlockHolder.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.ioc.annotations.Inject;
public class BlockHolder
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BooleanDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BooleanDemo.java
index 5105a52..9374e7b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BooleanDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/BooleanDemo.java
@@ -13,9 +13,9 @@
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry5.annotations.Persist;
public class BooleanDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage.java
index 46a5a1e..6c8aa29 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage.java
@@ -1,6 +1,6 @@
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Cached;
+import org.apache.tapestry5.annotations.Cached;
import java.util.ArrayList;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage2.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage2.java
index 402c2c4..cce5aed 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage2.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CachedPage2.java
@@ -12,13 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-public class CachedPage2 extends CachedPage {
+public class CachedPage2 extends CachedPage
+{
- @Override
- public int getValue() {
- return super.getValue()+1;
- }
-
+ @Override
+ public int getValue()
+ {
+ return super.getValue() + 1;
+ }
+
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClassLoaderInspect.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClassLoaderInspect.java
index b03c28c..97c5f8a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClassLoaderInspect.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClassLoaderInspect.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.corelib.components.Form;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import java.io.IOException;
import java.io.InputStream;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CleanCacheDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CleanCacheDemo.java
index d12de6a..0bc3b42 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CleanCacheDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/CleanCacheDemo.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Cached;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.corelib.components.Zone;
+import org.apache.tapestry5.annotations.Cached;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.corelib.components.Zone;
public class CleanCacheDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClientPersistenceDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClientPersistenceDemo.java
index 80cbe78..c130b89 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClientPersistenceDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ClientPersistenceDemo.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.Request;
public class ClientPersistenceDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ComponentParameter.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ComponentParameter.java
index 64efd14..b7d3d76 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ComponentParameter.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ComponentParameter.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry5.annotations.Persist;
public class ComponentParameter
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Countdown.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Countdown.java
index fda9a05..2f555a2 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Countdown.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Countdown.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.integration.app1.components.Count;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.integration.app1.components.Count;
public class Countdown
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DateFieldDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DateFieldDemo.java
index d999382..2a71f74 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DateFieldDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DateFieldDemo.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.beaneditor.Validate;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.beaneditor.Validate;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Datum.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Datum.java
index c0d963b..904512a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Datum.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Datum.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
/**
* This isn't a page class and doesn't belong here.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DatumEditor.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DatumEditor.java
index 7aefb01..85d48b7 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DatumEditor.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DatumEditor.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.annotation.Retain;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.annotations.Retain;
public class DatumEditor
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DeleteFromGridDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DeleteFromGridDemo.java
index 41a145a..4caee22 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DeleteFromGridDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DeleteFromGridDemo.java
@@ -13,11 +13,11 @@
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.integration.app1.data.ToDoItem;
-import org.apache.tapestry.integration.app1.services.ToDoDatabase;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.integration.app1.data.ToDoItem;
+import org.apache.tapestry5.integration.app1.services.ToDoDatabase;
+import org.apache.tapestry5.ioc.annotations.Inject;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DisabledFields.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DisabledFields.java
index aa435f6..e1775b3 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DisabledFields.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DisabledFields.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.ValueEncoder;
-import org.apache.tapestry.beaneditor.Validate;
-import org.apache.tapestry.internal.services.StringValueEncoder;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.beaneditor.Validate;
+import org.apache.tapestry5.internal.services.StringValueEncoder;
import java.util.Date;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EnvironmentalDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EnvironmentalDemo.java
index eb68bcc..71c76d7 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EnvironmentalDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EnvironmentalDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class EnvironmentalDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EventHandlerDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EventHandlerDemo.java
index 52f393f..ddb86c5 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EventHandlerDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EventHandlerDemo.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.OnEvent;
-import org.apache.tapestry.integration.app1.base.BaseEventHandlerDemo;
+import org.apache.tapestry5.annotations.OnEvent;
+import org.apache.tapestry5.integration.app1.base.BaseEventHandlerDemo;
public class EventHandlerDemo extends BaseEventHandlerDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EventMethodTranslate.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EventMethodTranslate.java
index 7df6f69..21894e4 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EventMethodTranslate.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/EventMethodTranslate.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.annotations.Persist;
public class EventMethodTranslate
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ExceptionEventDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ExceptionEventDemo.java
index e7515a6..e0184b8 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ExceptionEventDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ExceptionEventDemo.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry5.annotations.Persist;
public class ExceptionEventDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Expansion.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Expansion.java
index 69d8130..47e3176 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Expansion.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Expansion.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class Expansion
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ExpansionSubclass.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ExpansionSubclass.java
index a1623cc..aee5145 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ExpansionSubclass.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ExpansionSubclass.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class ExpansionSubclass extends Expansion
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FlashDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FlashDemo.java
index 04f7d63..a39990c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FlashDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FlashDemo.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Meta;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.integration.app1.base.BaseComponent;
+import org.apache.tapestry5.annotations.Meta;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.integration.app1.base.BaseComponent;
@Meta("tapestry.persistence-strategy=flash")
public class FlashDemo extends BaseComponent
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormEncodingType.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormEncodingType.java
index 4c0b478..1f4ec49 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormEncodingType.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormEncodingType.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.Renderable;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.services.FormSupport;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.Renderable;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.services.FormSupport;
public class FormEncodingType
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentDemo.java
index dbc4a1b..b57bab1 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentDemo.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.integration.app1.data.SubscribeData;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.corelib.components.Form;
+import org.apache.tapestry5.integration.app1.data.SubscribeData;
public class FormFragmentDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentOutput.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentOutput.java
index 313f6bb..d9ae92c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentOutput.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormFragmentOutput.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.integration.app1.data.SubscribeData;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.integration.app1.data.SubscribeData;
public class FormFragmentOutput
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormInjectorDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormInjectorDemo.java
index 6c87eb9..2caf15d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormInjectorDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/FormInjectorDemo.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.corelib.components.FormInjector;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.corelib.components.FormInjector;
+import org.apache.tapestry5.ioc.annotations.Inject;
public class FormInjectorDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Fred.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Fred.java
index b2c12b2..cdc7236 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Fred.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Fred.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class Fred
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridDemo.java
index 371baad..00f6e48 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridDemo.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.corelib.components.Grid;
-import org.apache.tapestry.integration.app1.data.Track;
-import org.apache.tapestry.integration.app1.services.MusicLibrary;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.corelib.components.Grid;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.annotations.Inject;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridEnumDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridEnumDemo.java
index 6abbf1a..72875b1 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridEnumDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridEnumDemo.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.integration.app1.services.ToDoDatabase;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.integration.app1.services.ToDoDatabase;
+import org.apache.tapestry5.ioc.annotations.Inject;
/**
* Used to demonstrate the built-in support for enum types.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridFormDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridFormDemo.java
index b00c839..0bd402c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridFormDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridFormDemo.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.integration.app1.data.ToDoItem;
-import org.apache.tapestry.integration.app1.services.ToDoDatabase;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.integration.app1.data.ToDoItem;
+import org.apache.tapestry5.integration.app1.services.ToDoDatabase;
+import org.apache.tapestry5.ioc.annotations.Inject;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridRemoveReorderDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridRemoveReorderDemo.java
index 5c3899a..3a82b1f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridRemoveReorderDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridRemoveReorderDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class GridRemoveReorderDemo extends GridDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridSetDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridSetDemo.java
index 9646e1c..9b924a6 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridSetDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/GridSetDemo.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.integration.app1.data.Track;
-import org.apache.tapestry.integration.app1.services.MusicLibrary;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.Set;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/IndirectProtectedFields.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/IndirectProtectedFields.java
index 29a2051..2282d60 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/IndirectProtectedFields.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/IndirectProtectedFields.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.InjectPage;
+import org.apache.tapestry5.annotations.InjectPage;
public class IndirectProtectedFields
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InheritInformalsDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InheritInformalsDemo.java
index 41962c3..2b0e217 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InheritInformalsDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InheritInformalsDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class InheritInformalsDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InheritedBindingsDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InheritedBindingsDemo.java
index 89f82b4..33ba2da 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InheritedBindingsDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InheritedBindingsDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class InheritedBindingsDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentDemo.java
index 81a3d2d..9df247e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentDemo.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.InjectComponent;
-import org.apache.tapestry.corelib.components.Form;
+import org.apache.tapestry5.annotations.InjectComponent;
+import org.apache.tapestry5.corelib.components.Form;
public class InjectComponentDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentMismatch.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentMismatch.java
index 4e665a2..93cc014 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentMismatch.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectComponentMismatch.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.InjectComponent;
-import org.apache.tapestry.corelib.components.Form;
+import org.apache.tapestry5.annotations.InjectComponent;
+import org.apache.tapestry5.corelib.components.Form;
public class InjectComponentMismatch
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectContainerMismatch.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectContainerMismatch.java
index b691d3d..b3bc15b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectContainerMismatch.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectContainerMismatch.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.annotation.Mixin;
-import org.apache.tapestry.corelib.mixins.RenderDisabled;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.annotations.Mixin;
+import org.apache.tapestry5.corelib.mixins.RenderDisabled;
public class InjectContainerMismatch
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectDemo.java
index 50b49b8..7a0796b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InjectDemo.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.annotation.OnEvent;
-import org.apache.tapestry.integration.app1.services.French;
-import org.apache.tapestry.integration.app1.services.Greeter;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.services.BindingSource;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.annotations.OnEvent;
+import org.apache.tapestry5.integration.app1.services.French;
+import org.apache.tapestry5.integration.app1.services.Greeter;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.services.BindingSource;
+import org.apache.tapestry5.services.Request;
public class InjectDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InplaceGridDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InplaceGridDemo.java
index 165cf7d..b702492 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InplaceGridDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InplaceGridDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
import java.util.Date;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InstanceMixin.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InstanceMixin.java
index ee1346f..9e2d247 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InstanceMixin.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InstanceMixin.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.*;
-import org.apache.tapestry.integration.app1.components.Output;
-import org.apache.tapestry.integration.app1.mixins.Emphasis;
+import org.apache.tapestry5.annotations.*;
+import org.apache.tapestry5.integration.app1.components.Output;
+import org.apache.tapestry5.integration.app1.mixins.Emphasis;
import java.sql.Date;
import java.text.DateFormat;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InvalidSuperClass.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InvalidSuperClass.java
index c167ce7..d0f7207 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InvalidSuperClass.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/InvalidSuperClass.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.integration.app1.WrongPackageForBaseClass;
+import org.apache.tapestry5.integration.app1.WrongPackageForBaseClass;
/**
* TAPESTRY-1934: Check for invalid base classes.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Kicker.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Kicker.java
index b6dedef..8545b33 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Kicker.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Kicker.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.InjectPage;
+import org.apache.tapestry5.annotations.InjectPage;
public class Kicker
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LeanGridDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LeanGridDemo.java
index 048cd2d..ab113c1 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LeanGridDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/LeanGridDemo.java
@@ -11,9 +11,9 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
-// package org.apache.tapestry.integration.app1.pages;
+// package org.apache.tapestry5.integration.app1.pages;
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class LeanGridDemo extends GridDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ListEventContextDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ListEventContextDemo.java
index b6666be..b3c80c2 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ListEventContextDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ListEventContextDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Localization.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Localization.java
index 1164750..94754b0 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Localization.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Localization.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.PersistentLocale;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.PersistentLocale;
+import org.apache.tapestry5.services.Request;
import java.util.Locale;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MagicValueEncoder.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MagicValueEncoder.java
index f9faedf..ca02ef5 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MagicValueEncoder.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MagicValueEncoder.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry5.annotations.Persist;
public class MagicValueEncoder
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MethodAdviceDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MethodAdviceDemo.java
index 3e3ea9a..9c88d7a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MethodAdviceDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MethodAdviceDemo.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.beaneditor.Validate;
-import org.apache.tapestry.integration.app1.services.DearGodWhyMeException;
-import org.apache.tapestry.integration.app1.services.ReverseStrings;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.beaneditor.Validate;
+import org.apache.tapestry5.integration.app1.services.DearGodWhyMeException;
+import org.apache.tapestry5.integration.app1.services.ReverseStrings;
public class MethodAdviceDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MissingTemplate.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MissingTemplate.java
index 76dbac8..53772f1 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MissingTemplate.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MissingTemplate.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
/**
* A page that simple doesn't have a template.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiBeanDemoResult.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiBeanDemoResult.java
index 18ecdf5..186bda2 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiBeanDemoResult.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiBeanDemoResult.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.integration.app1.data.RolePath;
-import org.apache.tapestry.integration.app1.data.UserCredentials;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.integration.app1.data.RolePath;
+import org.apache.tapestry5.integration.app1.data.UserCredentials;
public class MultiBeanDemoResult
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiBeanEditDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiBeanEditDemo.java
index 66a8da5..3968d09 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiBeanEditDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/MultiBeanEditDemo.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.integration.app1.data.RolePath;
-import org.apache.tapestry.integration.app1.data.UserCredentials;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.corelib.components.Form;
+import org.apache.tapestry5.integration.app1.data.RolePath;
+import org.apache.tapestry5.integration.app1.data.UserCredentials;
public class MultiBeanEditDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Music.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Music.java
index d93865a..3904c43 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Music.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Music.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.integration.app1.data.Track;
-import org.apache.tapestry.integration.app1.services.MusicLibrary;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.annotations.Inject;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NullGrid.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NullGrid.java
index e5eac07..cb70277 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NullGrid.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NullGrid.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class NullGrid
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NullStrategyDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NullStrategyDemo.java
index c901a85..2f6577a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NullStrategyDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NullStrategyDemo.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry5.annotations.Persist;
public class NullStrategyDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NumberBeanDisplayDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NumberBeanDisplayDemo.java
index 4deebda..ddb09bc 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NumberBeanDisplayDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NumberBeanDisplayDemo.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.integration.app1.data.IntegerHolder;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.integration.app1.data.IntegerHolder;
public class NumberBeanDisplayDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NumberBeanEditorDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NumberBeanEditorDemo.java
index 1091539..889b869 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NumberBeanEditorDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NumberBeanEditorDemo.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.integration.app1.data.IntegerHolder;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.integration.app1.data.IntegerHolder;
public class NumberBeanEditorDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NumberSelect.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NumberSelect.java
index d14eebe..b63d930 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NumberSelect.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/NumberSelect.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.InjectPage;
+import org.apache.tapestry5.annotations.InjectPage;
public class NumberSelect
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/OverrideValidationDecorator.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/OverrideValidationDecorator.java
index e3472ac..c0aa233 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/OverrideValidationDecorator.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/OverrideValidationDecorator.java
@@ -13,13 +13,13 @@
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationDecorator;
-import org.apache.tapestry.integration.app1.ChattyValidationDecorator;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.Environment;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationDecorator;
+import org.apache.tapestry5.integration.app1.ChattyValidationDecorator;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.Environment;
public class OverrideValidationDecorator
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java
index b3d1976..b42f14a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageContextInForm.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class PageContextInForm
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageLinkContext.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageLinkContext.java
index d84a732..0147329 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageLinkContext.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageLinkContext.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ioc.annotations.Inject;
public class PageLinkContext
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageLoadedDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageLoadedDemo.java
index f781471..345c250 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageLoadedDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PageLoadedDemo.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Retain;
+import org.apache.tapestry5.annotations.Retain;
public class PageLoadedDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PaletteDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PaletteDemo.java
index 787c2aa..686483e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PaletteDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PaletteDemo.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.SelectModel;
-import org.apache.tapestry.ValueEncoder;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.integration.app1.data.ProgrammingLanguage;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.util.EnumSelectModel;
-import org.apache.tapestry.util.EnumValueEncoder;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.SelectModel;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.integration.app1.data.ProgrammingLanguage;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.util.EnumSelectModel;
+import org.apache.tapestry5.util.EnumValueEncoder;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ParameterConflict.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ParameterConflict.java
index 542940f..7927514 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ParameterConflict.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ParameterConflict.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.integration.app1.components.Echo;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.integration.app1.components.Echo;
public class ParameterConflict
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ParameterDefault.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ParameterDefault.java
index c535264..2ca3725 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ParameterDefault.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ParameterDefault.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class ParameterDefault
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PasswordFieldDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PasswordFieldDemo.java
index 853d44e..165e9f3 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PasswordFieldDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PasswordFieldDemo.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.Retain;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.corelib.components.PasswordField;
-import org.apache.tapestry.integration.app1.services.UserAuthenticator;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Retain;
+import org.apache.tapestry5.corelib.components.Form;
+import org.apache.tapestry5.corelib.components.PasswordField;
+import org.apache.tapestry5.integration.app1.services.UserAuthenticator;
+import org.apache.tapestry5.ioc.annotations.Inject;
public class PasswordFieldDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PersistentDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PersistentDemo.java
index bdf1bfd..0c6fc9e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PersistentDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PersistentDemo.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.ioc.annotations.Inject;
public class PersistentDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PostLogin.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PostLogin.java
index 501b1f0..63740b8 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PostLogin.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PostLogin.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class PostLogin
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PrimitiveArrayParameterDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PrimitiveArrayParameterDemo.java
index c548624..b85a5ce 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PrimitiveArrayParameterDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/PrimitiveArrayParameterDemo.java
@@ -10,15 +10,15 @@
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
-// limitations under the License.package org.apache.tapestry.integration.app1.pages;
+// limitations under the License.package org.apache.tapestry5.integration.app1.pages;
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class PrimitiveArrayParameterDemo
{
public int[] getValues()
{
- return new int[]{1, 3, 5, 7, 9};
+ return new int[] { 1, 3, 5, 7, 9 };
}
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Protected.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Protected.java
index 0283e8c..0434693 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Protected.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Protected.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.InjectPage;
+import org.apache.tapestry5.annotations.InjectPage;
public class Protected
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ProtectedFields.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ProtectedFields.java
index f5aed8e..dc9a756 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ProtectedFields.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ProtectedFields.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
/**
* TAPESTRY-2196
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RadioDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RadioDemo.java
index e1e31cb..e833435 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RadioDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RadioDemo.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.integration.app1.data.Department;
-import org.apache.tapestry.internal.TapestryInternalUtils;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.integration.app1.data.Department;
+import org.apache.tapestry5.internal.TapestryInternalUtils;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.annotations.Inject;
public class RadioDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RecursiveDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RecursiveDemo.java
index 90f2ee5..30232a7 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RecursiveDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RecursiveDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class RecursiveDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RegexpDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RegexpDemo.java
index 93bcb70..435221c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RegexpDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RegexpDemo.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.beaneditor.Validate;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.beaneditor.Validate;
public class RegexpDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderComponentDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderComponentDemo.java
index d4b4cd1..e568b5f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderComponentDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderComponentDemo.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.ioc.annotations.Inject;
public class RenderComponentDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderErrorDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderErrorDemo.java
index 5e91ef7..89ff703 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderErrorDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderErrorDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class RenderErrorDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderPhaseMethodExceptionDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderPhaseMethodExceptionDemo.java
index 26bbd58..e074f29 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderPhaseMethodExceptionDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderPhaseMethodExceptionDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
import java.sql.SQLException;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderPhaseOrder.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderPhaseOrder.java
index 3c393e3..58140c1 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderPhaseOrder.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderPhaseOrder.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class RenderPhaseOrder
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderableDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderableDemo.java
index 60da376..2d7f2bd 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderableDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/RenderableDemo.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.Renderable;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.Renderable;
public class RenderableDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ReturnTypes.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ReturnTypes.java
index cbab7bd..0c1d074 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ReturnTypes.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ReturnTypes.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
-import org.apache.tapestry.util.TextStreamResponse;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.util.TextStreamResponse;
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SecurePage.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SecurePage.java
index 7530ab3..9c94a67 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SecurePage.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SecurePage.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.annotation.Path;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.Secure;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.annotations.Path;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Secure;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.Request;
@Secure
public class SecurePage
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SecurityAlert.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SecurityAlert.java
index c367bb6..2d26291 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SecurityAlert.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SecurityAlert.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry5.annotations.Persist;
public class SecurityAlert
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ShowBirthdayReminder.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ShowBirthdayReminder.java
index 38a1fe1..9d00bf8 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ShowBirthdayReminder.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ShowBirthdayReminder.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.integration.app1.data.BirthdayReminder;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.integration.app1.data.BirthdayReminder;
public class ShowBirthdayReminder
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ShowSelection.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ShowSelection.java
index 3ebe6f0..9084004 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ShowSelection.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ShowSelection.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.OnEvent;
+import org.apache.tapestry5.annotations.OnEvent;
public class ShowSelection
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SimpleForm.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SimpleForm.java
index b082405..05a136f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SimpleForm.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SimpleForm.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.integration.app1.data.IncidentData;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.integration.app1.data.IncidentData;
public class SimpleForm
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SimpleTrackGridDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SimpleTrackGridDemo.java
index 6618f18..4a40d66 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SimpleTrackGridDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/SimpleTrackGridDemo.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.integration.app1.data.SimpleTrack;
-import org.apache.tapestry.integration.app1.data.Track;
-import org.apache.tapestry.integration.app1.services.MusicLibrary;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.BeanModelSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.integration.app1.data.SimpleTrack;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.services.MusicLibrary;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.BeanModelSource;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Start.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Start.java
index 79462fb..4f1efe2 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Start.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Start.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.Arrays;
import java.util.Collections;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Target.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Target.java
index 7d19899..b46693f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Target.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Target.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.OnEvent;
-import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry5.annotations.OnEvent;
+import org.apache.tapestry5.annotations.Persist;
public class Target
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/TextFieldWrapperTypeDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/TextFieldWrapperTypeDemo.java
index a25299f..8fe5c30 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/TextFieldWrapperTypeDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/TextFieldWrapperTypeDemo.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry5.annotations.Persist;
public class TextFieldWrapperTypeDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ToDoList.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ToDoList.java
index ace2c10..3cede35 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ToDoList.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ToDoList.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.PrimaryKeyEncoder;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.integration.app1.data.ToDoItem;
-import org.apache.tapestry.integration.app1.services.ToDoDatabase;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.util.DefaultPrimaryKeyEncoder;
+import org.apache.tapestry5.PrimaryKeyEncoder;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.corelib.components.Form;
+import org.apache.tapestry5.integration.app1.data.ToDoItem;
+import org.apache.tapestry5.integration.app1.services.ToDoDatabase;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.util.DefaultPrimaryKeyEncoder;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ToDoListVolatile.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ToDoListVolatile.java
index eeea805..52472f4 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ToDoListVolatile.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ToDoListVolatile.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.integration.app1.data.ToDoItem;
-import org.apache.tapestry.integration.app1.services.ToDoDatabase;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.corelib.components.Form;
+import org.apache.tapestry5.integration.app1.data.ToDoItem;
+import org.apache.tapestry5.integration.app1.services.ToDoDatabase;
+import org.apache.tapestry5.ioc.annotations.Inject;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/TrackEditor.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/TrackEditor.java
index 7cd8038..6abff93 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/TrackEditor.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/TrackEditor.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.integration.app1.base.GenericEditor;
-import org.apache.tapestry.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.base.GenericEditor;
+import org.apache.tapestry5.integration.app1.data.Track;
public class TrackEditor extends GenericEditor<Track>
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/UnlessDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/UnlessDemo.java
index 13dfadd..f0307c6 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/UnlessDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/UnlessDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class UnlessDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Unreachable.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Unreachable.java
index 43a0635..698ac23 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Unreachable.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Unreachable.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class Unreachable
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ValidBeanEditorDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ValidBeanEditorDemo.java
index 9c226ca..d2084f2 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ValidBeanEditorDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ValidBeanEditorDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class ValidBeanEditorDemo extends BeanEditorDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ValidForm.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ValidForm.java
index 1692eba..de9c3aa 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ValidForm.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ValidForm.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.integration.app1.data.IncidentData;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.integration.app1.data.IncidentData;
public class ValidForm
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/VarBindingDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/VarBindingDemo.java
index bbfff11..75617c4 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/VarBindingDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/VarBindingDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class VarBindingDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ViewRegistration.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ViewRegistration.java
index 5820e6a..fa78816 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ViewRegistration.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ViewRegistration.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.integration.app1.data.RegistrationData;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.integration.app1.data.RegistrationData;
public class ViewRegistration
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Wilma.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Wilma.java
index de99abe..d3aad35 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Wilma.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Wilma.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
public class Wilma
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/XMLContent.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/XMLContent.java
index 3f4fa71..e9fbfdf 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/XMLContent.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/XMLContent.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.annotation.Meta;
+import org.apache.tapestry5.annotations.Meta;
@Meta("tapestry.response-content-type=text/xml")
public class XMLContent
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ZoneDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ZoneDemo.java
index d0c900b..4615e56 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ZoneDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/ZoneDemo.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages;
+package org.apache.tapestry5.integration.app1.pages;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.Log;
-import org.apache.tapestry.corelib.components.BeanEditForm;
-import org.apache.tapestry.integration.app1.data.RegistrationData;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Log;
+import org.apache.tapestry5.corelib.components.BeanEditForm;
+import org.apache.tapestry5.integration.app1.data.RegistrationData;
+import org.apache.tapestry5.ioc.annotations.Inject;
import org.apache.tapestry5.json.JSONObject;
public class ZoneDemo
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/music/MusicDetails.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/music/MusicDetails.java
index 970adb6..c89ba9a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/music/MusicDetails.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/music/MusicDetails.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages.music;
+package org.apache.tapestry5.integration.app1.pages.music;
-import org.apache.tapestry.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.data.Track;
public class MusicDetails
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/ActionDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/ActionDemo.java
index 9ea6f56..410cfb2 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/ActionDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/ActionDemo.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages.nested;
+package org.apache.tapestry5.integration.app1.pages.nested;
-import org.apache.tapestry.annotation.OnEvent;
-import org.apache.tapestry.annotation.Property;
+import org.apache.tapestry5.annotations.OnEvent;
+import org.apache.tapestry5.annotations.Property;
public class ActionDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/AssetDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/AssetDemo.java
index b944218..f5a955e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/AssetDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/AssetDemo.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.pages.nested;
+package org.apache.tapestry5.integration.app1.pages.nested;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.annotation.Path;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.annotations.Path;
+import org.apache.tapestry5.ioc.annotations.Inject;
public class AssetDemo
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/AppModule.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/AppModule.java
index 4b9c356..296d7de 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/AppModule.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/AppModule.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.services;
+package org.apache.tapestry5.integration.app1.services;
-import org.apache.tapestry.SymbolConstants;
-import org.apache.tapestry.ValueEncoder;
-import org.apache.tapestry.integration.app1.data.Track;
-import org.apache.tapestry.internal.services.GenericValueEncoderFactory;
-import org.apache.tapestry.ioc.Configuration;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.ioc.annotation.Marker;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.*;
-import org.apache.tapestry.test.JettyRunner;
+import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.internal.services.GenericValueEncoderFactory;
+import org.apache.tapestry5.ioc.Configuration;
+import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
+import org.apache.tapestry5.ioc.annotations.Marker;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.*;
+import org.apache.tapestry5.test.JettyRunner;
import org.slf4j.Logger;
import java.io.IOException;
@@ -107,7 +107,7 @@
public void contributeClasspathAssetAliasManager(MappedConfiguration<String, String> configuration)
{
- configuration.add("app1/", "org/apache/tapestry/integration/app1/");
+ configuration.add("app1/", "org/apache/tapestry5/integration/app1/");
}
public UserAuthenticator buildUserAuthenticator()
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/DearGodWhyMeException.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/DearGodWhyMeException.java
index 433d1d5..57d3d8a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/DearGodWhyMeException.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/DearGodWhyMeException.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.services;
+package org.apache.tapestry5.integration.app1.services;
public class DearGodWhyMeException extends Exception
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/French.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/French.java
index ea3fa46..44504f9 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/French.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/French.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.services;
+package org.apache.tapestry5.integration.app1.services;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -25,7 +25,7 @@
* Marker interface.
*/
@Target(
- {PARAMETER, FIELD})
+ { PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
public @interface French
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/Greeter.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/Greeter.java
index 2033519..308708a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/Greeter.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/Greeter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.services;
+package org.apache.tapestry5.integration.app1.services;
public interface Greeter
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/MusicLibrary.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/MusicLibrary.java
index 69333e3..08f3024 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/MusicLibrary.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/MusicLibrary.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.services;
+package org.apache.tapestry5.integration.app1.services;
-import org.apache.tapestry.integration.app1.data.Track;
+import org.apache.tapestry5.integration.app1.data.Track;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/MusicLibraryParser.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/MusicLibraryParser.java
index e3d78a8..504b0ba 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/MusicLibraryParser.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/MusicLibraryParser.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.services;
+package org.apache.tapestry5.integration.app1.services;
-import org.apache.tapestry.integration.app1.data.Track;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.util.Stack;
+import org.apache.tapestry5.integration.app1.data.Track;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.util.Stack;
import org.slf4j.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
@@ -32,7 +32,7 @@
import java.util.List;
/**
- * Reads an iTunes music library file into a list of {@link org.apache.tapestry.integration.app1.data.Track} elements.
+ * Reads an iTunes music library file into a list of {@link org.apache.tapestry5.integration.app1.data.Track} elements.
*/
public class MusicLibraryParser
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ReverseStrings.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ReverseStrings.java
index 2917b40..04f7412 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ReverseStrings.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ReverseStrings.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.services;
+package org.apache.tapestry5.integration.app1.services;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -21,7 +21,7 @@
import java.lang.annotation.Target;
/**
- * Marker annotation used with {@link org.apache.tapestry.integration.app1.services.StringReversalAdvice}.
+ * Marker annotation used with {@link org.apache.tapestry5.integration.app1.services.StringReversalAdvice}.
*/
@Target(METHOD)
@Retention(RetentionPolicy.RUNTIME)
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ReverseStringsWorker.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ReverseStringsWorker.java
index f17a77d..f674356 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ReverseStringsWorker.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ReverseStringsWorker.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.services;
+package org.apache.tapestry5.integration.app1.services;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.*;
public class ReverseStringsWorker implements ComponentClassTransformWorker
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ToDoDatabase.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ToDoDatabase.java
index 7cd8d92..037489c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ToDoDatabase.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ToDoDatabase.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.services;
+package org.apache.tapestry5.integration.app1.services;
-import org.apache.tapestry.integration.app1.data.ToDoItem;
+import org.apache.tapestry5.integration.app1.data.ToDoItem;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ToDoDatabaseImpl.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ToDoDatabaseImpl.java
index b2117dc..3ce91ab 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ToDoDatabaseImpl.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/ToDoDatabaseImpl.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.services;
+package org.apache.tapestry5.integration.app1.services;
-import org.apache.tapestry.integration.app1.data.ToDoItem;
-import org.apache.tapestry.integration.app1.data.Urgency;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.integration.app1.data.ToDoItem;
+import org.apache.tapestry5.integration.app1.data.Urgency;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
import java.util.Collections;
import java.util.Comparator;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/UserAuthenticator.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/UserAuthenticator.java
index 94ffc3a..40129f4 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/UserAuthenticator.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/services/UserAuthenticator.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app1.services;
+package org.apache.tapestry5.integration.app1.services;
public interface UserAuthenticator
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/FortyTwo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/FortyTwo.java
index e534d5e..d0a5667 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/FortyTwo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/FortyTwo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2;
+package org.apache.tapestry5.integration.app2;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
@@ -21,8 +21,7 @@
import java.lang.annotation.Target;
/**
- * Indicates that a method should return the answer to life, the universe, and everything.
- * Used for testing.
+ * Indicates that a method should return the answer to life, the universe, and everything. Used for testing.
*/
@Target(ElementType.METHOD)
@Retention(RUNTIME)
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/PlusOne.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/PlusOne.java
index 4b41ea9..0307eec 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/PlusOne.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/PlusOne.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2;
+package org.apache.tapestry5.integration.app2;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/SimpleASO.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/SimpleASO.java
index 4075fb2..6833bf3 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/SimpleASO.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/SimpleASO.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2;
+package org.apache.tapestry5.integration.app2;
public class SimpleASO
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/components/SimpleLayout.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/components/SimpleLayout.java
index 62ce416..40a7cf1 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/components/SimpleLayout.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/components/SimpleLayout.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.components;
+package org.apache.tapestry5.integration.app2.components;
public class SimpleLayout
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/mixins/ForceId.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/mixins/ForceId.java
index 0a0d7dd..da59bf3 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/mixins/ForceId.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/mixins/ForceId.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.mixins;
+package org.apache.tapestry5.integration.app2.mixins;
-import org.apache.tapestry.ClientElement;
-import org.apache.tapestry.annotation.InjectContainer;
+import org.apache.tapestry5.ClientElement;
+import org.apache.tapestry5.annotations.InjectContainer;
public class ForceId
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/DTDFromComponent.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/DTDFromComponent.java
index 749a34a..d82564d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/DTDFromComponent.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/DTDFromComponent.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
public class DTDFromComponent
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/DTDFromPage.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/DTDFromPage.java
index c85a84b..dcafc2b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/DTDFromPage.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/DTDFromPage.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
public class DTDFromPage
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/MultipleDTD.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/MultipleDTD.java
index 4851566..f314fbb 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/MultipleDTD.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/MultipleDTD.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
public class MultipleDTD
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/NoDTD.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/NoDTD.java
index 2a698a0..f978d1b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/NoDTD.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/NoDTD.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
public class NoDTD
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/ResultPageForActionLink.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/ResultPageForActionLink.java
index 2ebc849..2c0b67e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/ResultPageForActionLink.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/ResultPageForActionLink.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
-import org.apache.tapestry.annotation.OnEvent;
+import org.apache.tapestry5.annotations.OnEvent;
public class ResultPageForActionLink
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForASO.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForASO.java
index d35743d..b75ceea 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForASO.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForASO.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
-import org.apache.tapestry.annotation.ApplicationState;
-import org.apache.tapestry.integration.app2.SimpleASO;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.integration.app2.SimpleASO;
public class TestPageForASO
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForActionLink.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForActionLink.java
index ea3d8c3..84f343e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForActionLink.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForActionLink.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.annotation.OnEvent;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.annotations.OnEvent;
public class TestPageForActionLink
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForAsset.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForAsset.java
index 389f21b..1722fb1 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForAsset.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForAsset.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.annotation.Path;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.annotations.Path;
+import org.apache.tapestry5.ioc.annotations.Inject;
public class TestPageForAsset
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForForm.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForForm.java
index 7845fd1..be2741f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForForm.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForForm.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
-import org.apache.tapestry.annotation.Persist;
+import org.apache.tapestry5.annotations.Persist;
public class TestPageForForm
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForHead.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForHead.java
index 634a580..a7ffc3c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForHead.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForHead.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
public class TestPageForHead
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForIf.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForIf.java
index e904fea..f493051 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForIf.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForIf.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
public class TestPageForIf
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForLocale.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForLocale.java
index 520fa8e..ac8d7c8 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForLocale.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForLocale.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
-import org.apache.tapestry.annotation.OnEvent;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.PersistentLocale;
+import org.apache.tapestry5.annotations.OnEvent;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.PersistentLocale;
import java.util.Locale;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForLoop.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForLoop.java
index 1a3009c..85d854f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForLoop.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForLoop.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
public class TestPageForLoop
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForSubmit.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForSubmit.java
index 8365269..2bf83bd 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForSubmit.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForSubmit.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
-import org.apache.tapestry.annotation.Component;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.corelib.components.Form;
-import org.apache.tapestry.corelib.components.Submit;
-import org.apache.tapestry.corelib.components.TextField;
+import org.apache.tapestry5.annotations.Component;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.corelib.components.Form;
+import org.apache.tapestry5.corelib.components.Submit;
+import org.apache.tapestry5.corelib.components.TextField;
public class TestPageForSubmit
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForTemplateInContext.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForTemplateInContext.java
index f4c2252..6ae0709 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForTemplateInContext.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForTemplateInContext.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
public class TestPageForTemplateInContext
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForUnless.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForUnless.java
index 495b5f7..79e7923 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForUnless.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForUnless.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
public class TestPageForUnless
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPrefixMethod.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPrefixMethod.java
index b348456..236475d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPrefixMethod.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPrefixMethod.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.integration.app2.FortyTwo;
-import org.apache.tapestry.integration.app2.PlusOne;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.BeanModelSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.integration.app2.FortyTwo;
+import org.apache.tapestry5.integration.app2.PlusOne;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.BeanModelSource;
public class TestPrefixMethod
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPrefixMethod2.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPrefixMethod2.java
index 21fc56d..991168c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPrefixMethod2.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPrefixMethod2.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.pages;
+package org.apache.tapestry5.integration.app2.pages;
public class TestPrefixMethod2 extends TestPrefixMethod
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/services/LocaleAppModule.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/services/LocaleAppModule.java
index 1c830eb..860fbed 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/services/LocaleAppModule.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/services/LocaleAppModule.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app2.services;
+package org.apache.tapestry5.integration.app2.services;
-import org.apache.tapestry.integration.app2.FortyTwo;
-import org.apache.tapestry.integration.app2.PlusOne;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.integration.app2.FortyTwo;
+import org.apache.tapestry5.integration.app2.PlusOne;
+import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.TransformMethodSignature;
public class LocaleAppModule
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/BeanDisplayOverrideDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/BeanDisplayOverrideDemo.java
index 8ad6c3e..7523348 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/BeanDisplayOverrideDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/BeanDisplayOverrideDemo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app3.pages;
+package org.apache.tapestry5.integration.app3.pages;
public class BeanDisplayOverrideDemo
{
@@ -25,5 +25,5 @@
{
return false;
}
-
+
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/Index.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/Index.java
index 6c30d32..b1cb4a9 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/Index.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/Index.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app3.pages;
+package org.apache.tapestry5.integration.app3.pages;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.Property;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
public class Index
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/Login.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/Login.java
index 27885da..b29b26c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/Login.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/Login.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app3.pages;
+package org.apache.tapestry5.integration.app3.pages;
public class Login
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/PropertyDisplayBlockOverrides.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/PropertyDisplayBlockOverrides.java
index cd51a0c..53d6e39 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/PropertyDisplayBlockOverrides.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/pages/PropertyDisplayBlockOverrides.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app3.pages;
+package org.apache.tapestry5.integration.app3.pages;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.services.PropertyOutputContext;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.services.PropertyOutputContext;
public class PropertyDisplayBlockOverrides
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/services/AppModule.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/services/AppModule.java
index 5a009e3..3a9e720 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/services/AppModule.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app3/services/AppModule.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app3.services;
+package org.apache.tapestry5.integration.app3.services;
-import org.apache.tapestry.ioc.Configuration;
-import org.apache.tapestry.services.BeanBlockContribution;
+import org.apache.tapestry5.ioc.Configuration;
+import org.apache.tapestry5.services.BeanBlockContribution;
public class AppModule
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/pages/Destination.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/pages/Destination.java
index 817980a..7bed131 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/pages/Destination.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/pages/Destination.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app4.pages;
+package org.apache.tapestry5.integration.app4.pages;
public class Destination
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/pages/Start.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/pages/Start.java
index 127043c..9cf88ec 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/pages/Start.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/pages/Start.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app4.pages;
+package org.apache.tapestry5.integration.app4.pages;
-import org.apache.tapestry.annotation.InjectPage;
+import org.apache.tapestry5.annotations.InjectPage;
public class Start
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/services/AppModule.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/services/AppModule.java
index f2dc304..943e450 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/services/AppModule.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app4/services/AppModule.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.app4.services;
+package org.apache.tapestry5.integration.app4.services;
-import org.apache.tapestry.SymbolConstants;
-import org.apache.tapestry.ioc.MappedConfiguration;
+import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.ioc.MappedConfiguration;
/**
* A module that exists for testing the immediate response mode: sending markup in response to action requests, rather
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ASOTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ASOTest.java
index 9a30579..b3ef4b9 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ASOTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ASOTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
@Test
public void submit_aso()
{
- String appPackage = "org.apache.tapestry.integration.app2";
+ String appPackage = "org.apache.tapestry5.integration.app2";
String appName = "";
tester = new PageTester(appPackage, appName);
Document doc = tester.renderPage("TestPageForASO");
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ActionLinkTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ActionLinkTest.java
index d7d9b98..ebab770 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ActionLinkTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/ActionLinkTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -28,7 +28,7 @@
@Test
public void click_link()
{
- String appPackage = "org.apache.tapestry.integration.app2";
+ String appPackage = "org.apache.tapestry5.integration.app2";
String appName = "";
tester = new PageTester(appPackage, appName);
Document doc = tester.renderPage("TestPageForActionLink");
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/AssetTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/AssetTest.java
index 2fd9506..dd79a90 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/AssetTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/AssetTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
@Test
public void submit_context_asset()
{
- String appPackage = "org.apache.tapestry.integration.app2";
+ String appPackage = "org.apache.tapestry5.integration.app2";
String appName = "";
tester = new PageTester(appPackage, appName, "src/test/app2");
Document doc = tester.renderPage("TestPageForAsset");
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/DTDTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/DTDTest.java
index fbad8ba..06241fe 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/DTDTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/DTDTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -33,16 +33,16 @@
{
return new Object[][]
{
- {"DTDFromPage", FRAMESET, "slagheap",},
- {"DTDFromComponent", TRANSITIONAL, "flubber",},
- {"MultipleDTD", STRICT, "blubber",},
- {"NoDTD", "", "no_dtd_loser",}};
+ { "DTDFromPage", FRAMESET, "slagheap", },
+ { "DTDFromComponent", TRANSITIONAL, "flubber", },
+ { "MultipleDTD", STRICT, "blubber", },
+ { "NoDTD", "", "no_dtd_loser", } };
}
@Test(dataProvider = "dtd_page_provider")
public void verify_correct_dtds(String pageName, String expectedDTD, String checkText)
{
- String appPackage = "org.apache.tapestry.integration.app2";
+ String appPackage = "org.apache.tapestry5.integration.app2";
String appName = "";
PageTester tester = new PageTester(appPackage, appName);
Document doc = tester.renderPage(pageName);
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/FormTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/FormTest.java
index 88bca2e..96b7476 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/FormTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/FormTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -31,7 +31,7 @@
@Test
public void submit_form()
{
- String appPackage = "org.apache.tapestry.integration.app2";
+ String appPackage = "org.apache.tapestry5.integration.app2";
String appName = "";
tester = new PageTester(appPackage, appName);
Document doc = tester.renderPage("TestPageForForm");
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/HeadTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/HeadTest.java
index 6f7a9ba..8e75018 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/HeadTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/HeadTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
@Test
public void display()
{
- String appPackage = "org.apache.tapestry.integration.app2";
+ String appPackage = "org.apache.tapestry5.integration.app2";
String appName = "";
tester = new PageTester(appPackage, appName);
Document doc = tester.renderPage("TestPageForHead");
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/IfTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/IfTest.java
index 6195802..312941a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/IfTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/IfTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
@Test
public void render()
{
- String appPackage = "org.apache.tapestry.integration.app2";
+ String appPackage = "org.apache.tapestry5.integration.app2";
String appName = "";
tester = new PageTester(appPackage, appName);
Document doc = tester.renderPage("TestPageForIf");
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LocaleTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LocaleTest.java
index 580055a..5b543ac 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LocaleTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LocaleTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -63,7 +63,7 @@
@BeforeMethod
public void before()
{
- String appPackage = "org.apache.tapestry.integration.app2";
+ String appPackage = "org.apache.tapestry5.integration.app2";
// LocaleAppModule.java has configured support for a certain locales.
String appName = "LocaleApp";
tester = new PageTester(appPackage, appName);
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LoopTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LoopTest.java
index a3f734d..748dd43 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LoopTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/LoopTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
@Test
public void render()
{
- String appPackage = "org.apache.tapestry.integration.app2";
+ String appPackage = "org.apache.tapestry5.integration.app2";
String appName = "";
tester = new PageTester(appPackage, appName);
Document doc = tester.renderPage("TestPageForLoop");
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/PrefixMethodTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/PrefixMethodTest.java
index 94ebb07..7d7248e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/PrefixMethodTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/PrefixMethodTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.integration.app2.services.LocaleAppModule;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.integration.app2.services.LocaleAppModule;
+import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -28,7 +28,7 @@
public void prefix_method() throws Exception
{
// REFACTOR this happens in a bunch of places
- String appPackage = "org.apache.tapestry.integration.app2";
+ String appPackage = "org.apache.tapestry5.integration.app2";
String appName = "";
tester = new PageTester(appPackage, appName, PageTester.DEFAULT_CONTEXT_PATH, LocaleAppModule.class);
Document doc = tester.renderPage("TestPrefixMethod");
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/SubmitTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/SubmitTest.java
index fd3ff69..116f939 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/SubmitTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/SubmitTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
@@ -68,7 +68,7 @@
@BeforeMethod
public void before()
{
- String appPackage = "org.apache.tapestry.integration.app2";
+ String appPackage = "org.apache.tapestry5.integration.app2";
String appName = "";
tester = new PageTester(appPackage, appName);
doc = tester.renderPage("TestPageForSubmit");
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/TemplateInContextTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/TemplateInContextTest.java
index 3546b54..dae4d6a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/TemplateInContextTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/TemplateInContextTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
@Test
public void template_in_web_context()
{
- String appPackage = "org.apache.tapestry.integration.app2";
+ String appPackage = "org.apache.tapestry5.integration.app2";
String appName = "";
tester = new PageTester(appPackage, appName, "src/test/app2");
Document doc = tester.renderPage("TestPageForTemplateInContext");
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/UnlessTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/UnlessTest.java
index 7574a61..ad29222 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/UnlessTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/UnlessTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.integration.pagelevel;
+package org.apache.tapestry5.integration.pagelevel;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.test.PageTester;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -27,7 +27,7 @@
@Test
public void render()
{
- String appPackage = "org.apache.tapestry.integration.app2";
+ String appPackage = "org.apache.tapestry5.integration.app2";
String appName = "";
tester = new PageTester(appPackage, appName);
Document doc = tester.renderPage("TestPageForUnless");
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/DataBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/DataBean.java
index 99e4a81..e279da7 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/DataBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/DataBean.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.ClassFactory;
/**
- * Used as test when setting the order of properties via {@link TapestryInternalUtils#orderProperties(org.apache.tapestry.ioc.services.ClassPropertyAdapter,
+ * Used as test when setting the order of properties via {@link TapestryInternalUtils#orderProperties(org.apache.tapestry5.ioc.services.ClassPropertyAdapter,
* ClassFactory, java.util.List)}.
*/
public class DataBean
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/DataBeanSubclass.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/DataBeanSubclass.java
index 1da44a0..9495e20 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/DataBeanSubclass.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/DataBeanSubclass.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
public class DataBeanSubclass extends DataBean
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/DefaultValidationDecoratorTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/DefaultValidationDecoratorTest.java
index bdac862..3dc664f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/DefaultValidationDecoratorTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/DefaultValidationDecoratorTest.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.ValidationDecorator;
-import org.apache.tapestry.ValidationTracker;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.dom.XMLMarkupModel;
-import org.apache.tapestry.internal.services.MarkupWriterImpl;
-import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.ValidationDecorator;
+import org.apache.tapestry5.ValidationTracker;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.dom.XMLMarkupModel;
+import org.apache.tapestry5.internal.services.MarkupWriterImpl;
+import org.apache.tapestry5.services.Environment;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
public class DefaultValidationDecoratorTest extends TapestryTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/OptionGroupModelImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/OptionGroupModelImplTest.java
index cec9f5a..01cfe1d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/OptionGroupModelImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/OptionGroupModelImplTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.OptionGroupModel;
-import org.apache.tapestry.OptionModel;
+import org.apache.tapestry5.OptionGroupModel;
+import org.apache.tapestry5.OptionModel;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/OptionModelImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/OptionModelImplTest.java
index da8200c..3148809 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/OptionModelImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/OptionModelImplTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.OptionModel;
+import org.apache.tapestry5.OptionModel;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/PropertyOrderBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/PropertyOrderBean.java
index 12a6c3d..5e7225b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/PropertyOrderBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/PropertyOrderBean.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.beaneditor.OrderBefore;
+import org.apache.tapestry5.beaneditor.OrderBefore;
public class PropertyOrderBean
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/ServletContextSymbolProviderTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/ServletContextSymbolProviderTest.java
index cd871ab..ef5d94a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/ServletContextSymbolProviderTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/ServletContextSymbolProviderTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.ioc.services.SymbolProvider;
-import org.apache.tapestry.ioc.test.TestBase;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
+import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.Test;
import javax.servlet.ServletContext;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/SingleKeySymbolProviderTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/SingleKeySymbolProviderTest.java
index 454908c..8de4967 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/SingleKeySymbolProviderTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/SingleKeySymbolProviderTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.ioc.services.SymbolProvider;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryAppInitializerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryAppInitializerTest.java
index 8ad2e58..8582c50 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryAppInitializerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryAppInitializerTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.util.Transformer;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.util.Transformer;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -26,7 +26,7 @@
@Test
public void testLoadAppModule()
{
- Registry registry = new TapestryAppInitializer("org.apache.tapestry.integration.app0",
+ Registry registry = new TapestryAppInitializer("org.apache.tapestry5.integration.app0",
"foo", "").getRegistry();
Transformer<String> s1 = registry.getService("Service1", Transformer.class);
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java
index 4691052..8c3e8b6 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/TapestryInternalUtilsTest.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal;
+package org.apache.tapestry5.internal;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.OptionModel;
-import org.apache.tapestry.SelectModel;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.runtime.ComponentResourcesAware;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.OptionModel;
+import org.apache.tapestry5.SelectModel;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.ClassPropertyAdapter;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.runtime.ComponentResourcesAware;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/beaneditor/BeanModelUtilsTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/beaneditor/BeanModelUtilsTest.java
index c5c1da9..70f1523 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/beaneditor/BeanModelUtilsTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/beaneditor/BeanModelUtilsTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.beaneditor;
+package org.apache.tapestry5.internal.beaneditor;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGeneratorTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGeneratorTest.java
index 8e44b82..fd00504 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGeneratorTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/beaneditor/ValidateAnnotationConstraintGeneratorTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.beaneditor;
+package org.apache.tapestry5.internal.beaneditor;
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.beaneditor.Validate;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.ValidationConstraintGenerator;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.beaneditor.Validate;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.ValidationConstraintGenerator;
import org.testng.annotations.Test;
import java.util.Arrays;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/BindingFactoryTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/BindingFactoryTest.java
index ff0346a..b246e29 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/BindingFactoryTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/BindingFactoryTest.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.bindings;
+package org.apache.tapestry5.internal.bindings;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Translator;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.services.BindingFactory;
-import org.apache.tapestry.services.TranslatorSource;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Translator;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.services.BindingFactory;
+import org.apache.tapestry5.services.TranslatorSource;
import org.testng.annotations.Test;
/**
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/DefaultComponent.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/DefaultComponent.java
index 8e6bdcd..520caea 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/DefaultComponent.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/DefaultComponent.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.bindings;
+package org.apache.tapestry5.internal.bindings;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.ComponentEvent;
-import org.apache.tapestry.runtime.Event;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.ComponentEvent;
+import org.apache.tapestry5.runtime.Event;
/**
* For use in places where we don't want to have to transform a class just for testing purposes.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/PropBindingFactoryTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/PropBindingFactoryTest.java
index 12e017a..9342e0e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/PropBindingFactoryTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/PropBindingFactoryTest.java
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.bindings;
+package org.apache.tapestry5.internal.bindings;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotation.BeforeRenderBody;
-import org.apache.tapestry.beaneditor.OrderAfter;
-import org.apache.tapestry.beaneditor.OrderBefore;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.util.IntegerRange;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.BindingFactory;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.annotations.BeforeRenderBody;
+import org.apache.tapestry5.beaneditor.OrderAfter;
+import org.apache.tapestry5.beaneditor.OrderBefore;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.util.IntegerRange;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.BindingFactory;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
@@ -265,7 +265,7 @@
{
assertEquals(
ex.getMessage(),
- "Expression stringHolderMethod().stringValue() for class org.apache.tapestry.internal.bindings.TargetBean is read-only.");
+ "Expression stringHolderMethod().stringValue() for class org.apache.tapestry5.internal.bindings.TargetBean is read-only.");
assertSame(ex.getLocation(), l);
}
@@ -293,7 +293,7 @@
{
assertEquals(
ex.getMessage(),
- "No public method \'isThatRealBlood()\' in class org.apache.tapestry.internal.bindings.TargetBean (within property expression \'isThatRealBlood().value\').");
+ "No public method \'isThatRealBlood()\' in class org.apache.tapestry5.internal.bindings.TargetBean (within property expression \'isThatRealBlood().value\').");
}
verify();
@@ -324,7 +324,7 @@
{
assertEquals(
ex.getMessage(),
- "No public method \'isThatRealBlood()\' in class org.apache.tapestry.internal.bindings.StringHolder (within property expression \'stringHolder.isThatRealBlood()\').");
+ "No public method \'isThatRealBlood()\' in class org.apache.tapestry5.internal.bindings.StringHolder (within property expression \'stringHolder.isThatRealBlood()\').");
}
verify();
@@ -350,7 +350,7 @@
{
assertEquals(
ex.getMessage(),
- "Method \'voidMethod()\' returns void (in class org.apache.tapestry.internal.bindings.TargetBean, within property expression \'voidMethod().value\').");
+ "Method \'voidMethod()\' returns void (in class org.apache.tapestry5.internal.bindings.TargetBean, within property expression \'voidMethod().value\').");
}
verify();
@@ -376,7 +376,7 @@
{
assertEquals(
ex.getMessage(),
- "Method \'voidMethod()\' returns void (in class org.apache.tapestry.internal.bindings.StringHolder, within property expression \'stringHolder.voidMethod()\').");
+ "Method \'voidMethod()\' returns void (in class org.apache.tapestry5.internal.bindings.StringHolder, within property expression \'stringHolder.voidMethod()\').");
}
verify();
@@ -404,7 +404,7 @@
{
assertEquals(
ex.getMessage(),
- "Class org.apache.tapestry.internal.bindings.StringHolder does not contain a property named \'missingProperty\' "
+ "Class org.apache.tapestry5.internal.bindings.StringHolder does not contain a property named \'missingProperty\' "
+ "(within property expression \'stringHolder.missingProperty.terminalProperty\'). Available properties: value.");
assertSame(ex.getLocation(), l);
}
@@ -434,7 +434,7 @@
{
assertEquals(
ex.getMessage(),
- "Property \'writeOnly\' of class org.apache.tapestry.internal.bindings.TargetBean (within property expression \'writeOnly.terminalProperty\') is not readable (it has no read accessor method).");
+ "Property \'writeOnly\' of class org.apache.tapestry5.internal.bindings.TargetBean (within property expression \'writeOnly.terminalProperty\') is not readable (it has no read accessor method).");
assertSame(ex.getLocation(), l);
}
@@ -488,7 +488,7 @@
{
assertEquals(
ex.getMessage(),
- "Expression readOnly for class org.apache.tapestry.internal.bindings.TargetBean is read-only.");
+ "Expression readOnly for class org.apache.tapestry5.internal.bindings.TargetBean is read-only.");
assertEquals(ex.getLocation(), l);
}
@@ -519,7 +519,7 @@
{
assertEquals(
ex.getMessage(),
- "Expression writeOnly for class org.apache.tapestry.internal.bindings.TargetBean is write-only.");
+ "Expression writeOnly for class org.apache.tapestry5.internal.bindings.TargetBean is write-only.");
assertEquals(ex.getLocation(), l);
}
@@ -546,7 +546,7 @@
{
assertEquals(
ex.getMessage(),
- "Class org.apache.tapestry.internal.bindings.TargetBean does not contain a property named \'missingProperty\' "
+ "Class org.apache.tapestry5.internal.bindings.TargetBean does not contain a property named \'missingProperty\' "
+ "(within property expression \'missingProperty\'). "
+ "Available properties: class, componentResources, intValue, objectValue, readOnly, stringHolder, writeOnly.");
assertSame(ex.getLocation(), l);
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/StringHolder.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/StringHolder.java
index 19e1d93..5e1f6f2 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/StringHolder.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/StringHolder.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.bindings;
+package org.apache.tapestry5.internal.bindings;
public interface StringHolder
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/StringHolderImpl.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/StringHolderImpl.java
index dc11445..839d9a7 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/StringHolderImpl.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/StringHolderImpl.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.bindings;
+package org.apache.tapestry5.internal.bindings;
public class StringHolderImpl implements StringHolder
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/TargetBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/TargetBean.java
index 42f468e..05dd8c2 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/TargetBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/TargetBean.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.bindings;
+package org.apache.tapestry5.internal.bindings;
-import org.apache.tapestry.annotation.BeforeRenderBody;
-import org.apache.tapestry.beaneditor.OrderAfter;
-import org.apache.tapestry.beaneditor.OrderBefore;
+import org.apache.tapestry5.annotations.BeforeRenderBody;
+import org.apache.tapestry5.beaneditor.OrderAfter;
+import org.apache.tapestry5.beaneditor.OrderBefore;
public class TargetBean extends DefaultComponent
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactoryTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactoryTest.java
index 2f8b4eb..b173c13 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactoryTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/bindings/ValidateBindingFactoryTest.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.bindings;
+package org.apache.tapestry5.internal.bindings;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.BindingFactory;
-import org.apache.tapestry.services.FieldValidatorSource;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.BindingFactory;
+import org.apache.tapestry5.services.FieldValidatorSource;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
public class ValidateBindingFactoryTest extends TapestryTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/CollectionGridDataSourceTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/CollectionGridDataSourceTest.java
index 93abaef..c9be250 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/CollectionGridDataSourceTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/CollectionGridDataSourceTest.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.grid;
+package org.apache.tapestry5.internal.grid;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.grid.ColumnSort;
-import org.apache.tapestry.grid.SortConstraint;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.services.BeanModelSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.grid.ColumnSort;
+import org.apache.tapestry5.grid.SortConstraint;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.services.BeanModelSource;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/Datum.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/Datum.java
index f6fb5af..44d6181 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/Datum.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/grid/Datum.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.grid;
+package org.apache.tapestry5.internal.grid;
public class Datum
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/model/MutableComponentModelImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/model/MutableComponentModelImplTest.java
index 166fdf4..09714aa 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/model/MutableComponentModelImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/model/MutableComponentModelImplTest.java
@@ -12,24 +12,24 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.model;
+package org.apache.tapestry5.internal.model;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.model.MutableEmbeddedComponentModel;
-import org.apache.tapestry.model.ParameterModel;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.model.MutableEmbeddedComponentModel;
+import org.apache.tapestry5.model.ParameterModel;
import org.slf4j.Logger;
import org.testng.annotations.Test;
import java.util.Arrays;
/**
- * Tests {@link org.apache.tapestry.internal.model.MutableComponentModelImpl} and {@link
- * org.apache.tapestry.internal.model.MutableEmbeddedComponentModelImpl}.
+ * Tests {@link org.apache.tapestry5.internal.model.MutableComponentModelImpl} and {@link
+ * org.apache.tapestry5.internal.model.MutableEmbeddedComponentModelImpl}.
*/
public class MutableComponentModelImplTest extends InternalBaseTestCase
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AjaxComponentInstanceEventResultProcessorTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AjaxComponentInstanceEventResultProcessorTest.java
index 8082e20..47c1614 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AjaxComponentInstanceEventResultProcessorTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AjaxComponentInstanceEventResultProcessorTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
import org.testng.annotations.Test;
import java.io.IOException;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasImplTest.java
index 10621c6..10500af 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasImplTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.services.Alias;
-import org.apache.tapestry.services.AliasManager;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.services.Alias;
+import org.apache.tapestry5.services.AliasManager;
import org.testng.annotations.Test;
import java.util.Collections;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasManagerImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasManagerImplTest.java
index d9cdf5e..57aaec5 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasManagerImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AliasManagerImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.AliasContribution;
-import org.apache.tapestry.services.AliasManager;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.AliasContribution;
+import org.apache.tapestry5.services.AliasManager;
import org.slf4j.Logger;
import org.testng.annotations.Test;
@@ -35,8 +35,8 @@
replay();
AliasContribution[] contributions =
- {AliasContribution.create(String.class, "FRED"),
- AliasContribution.create(Runnable.class, r)};
+ { AliasContribution.create(String.class, "FRED"),
+ AliasContribution.create(Runnable.class, r) };
Collection<AliasContribution> configuration = Arrays.asList(contributions);
AliasManager manager = new AliasManagerImpl(logger, configuration);
@@ -62,9 +62,9 @@
replay();
AliasContribution[] contributions =
- {AliasContribution.create(String.class, "FRED"),
- AliasContribution.create(String.class, "FRED-CONFLICT"),
- AliasContribution.create(Runnable.class, r)};
+ { AliasContribution.create(String.class, "FRED"),
+ AliasContribution.create(String.class, "FRED-CONFLICT"),
+ AliasContribution.create(Runnable.class, r) };
Collection<AliasContribution> configuration = Arrays.asList(contributions);
AliasManager manager = new AliasManagerImpl(logger, configuration);
@@ -87,9 +87,9 @@
replay();
AliasContribution[] contributions =
- {AliasContribution.create(String.class, "FRED"),
- AliasContribution.create(String.class, "bar", "FRED-NON-CONFLICT"),
- AliasContribution.create(Runnable.class, r)};
+ { AliasContribution.create(String.class, "FRED"),
+ AliasContribution.create(String.class, "bar", "FRED-NON-CONFLICT"),
+ AliasContribution.create(Runnable.class, r) };
Collection<AliasContribution> configuration = Arrays.asList(contributions);
AliasManager manager = new AliasManagerImpl(logger, configuration);
@@ -112,9 +112,9 @@
replay();
AliasContribution[] contributions =
- {AliasContribution.create(String.class, "FRED"),
- AliasContribution.create(String.class, "bar", "FRED-NON-CONFLICT"),
- AliasContribution.create(Runnable.class, r)};
+ { AliasContribution.create(String.class, "FRED"),
+ AliasContribution.create(String.class, "bar", "FRED-NON-CONFLICT"),
+ AliasContribution.create(Runnable.class, r) };
Collection<AliasContribution> configuration = Arrays.asList(contributions);
AliasManager manager = new AliasManagerImpl(logger, configuration);
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AnnotatedPage.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AnnotatedPage.java
index b4bf62a..85c45a5 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AnnotatedPage.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AnnotatedPage.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotation.SetupRender;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.annotations.SetupRender;
public class AnnotatedPage
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AnnotationDataTypeAnalyzerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AnnotationDataTypeAnalyzerTest.java
index 05f930e..8f17dc5 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AnnotationDataTypeAnalyzerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AnnotationDataTypeAnalyzerTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.beaneditor.DataType;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
-import org.apache.tapestry.services.DataTypeAnalyzer;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.beaneditor.DataType;
+import org.apache.tapestry5.ioc.services.PropertyAdapter;
+import org.apache.tapestry5.services.DataTypeAnalyzer;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
public class AnnotationDataTypeAnalyzerTest extends TapestryTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImplTest.java
index 28264d0..016feaf 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStateManagerImplTest.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.transform.pages.ReadOnlyBean;
-import org.apache.tapestry.internal.util.Holder;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.transform.pages.ReadOnlyBean;
+import org.apache.tapestry5.internal.util.Holder;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.services.*;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.isA;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStatePersistenceStrategySourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStatePersistenceStrategySourceImplTest.java
index cdcf304..6556790 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStatePersistenceStrategySourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ApplicationStatePersistenceStrategySourceImplTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.services.ApplicationStatePersistenceStrategy;
-import org.apache.tapestry.services.ApplicationStatePersistenceStrategySource;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.services.ApplicationStatePersistenceStrategy;
+import org.apache.tapestry5.services.ApplicationStatePersistenceStrategySource;
import org.testng.annotations.Test;
import java.util.Collections;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetDispatcherTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetDispatcherTest.java
index 5501e10..a14e138 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetDispatcherTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetDispatcherTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import org.apache.tapestry.services.ClasspathAssetAliasManager;
-import org.apache.tapestry.services.Dispatcher;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.services.ClasspathAssetAliasManager;
+import org.apache.tapestry5.services.Dispatcher;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Response;
import static org.easymock.EasyMock.contains;
import static org.easymock.EasyMock.eq;
import org.testng.annotations.Test;
@@ -31,7 +31,7 @@
{
private static final String SMILEY_CLIENT_URL = "/assets/app1/pages/smiley.png";
- private static final String SMILEY_PATH = "org/apache/tapestry/integration/app1/pages/smiley.png";
+ private static final String SMILEY_PATH = "org/apache/tapestry5/integration/app1/pages/smiley.png";
private static final Resource SMILEY = new ClasspathResource(SMILEY_PATH);
@@ -89,7 +89,7 @@
ResourceStreamer streamer = mockResourceStreamer();
String clientURL = "/assets/app1/pages/smiley_png";
- String resourcePath = "org/apache/tapestry/integration/app1/pages/smiley_png";
+ String resourcePath = "org/apache/tapestry5/integration/app1/pages/smiley_png";
train_getPath(request, clientURL);
@@ -118,7 +118,7 @@
ResourceStreamer streamer = mockResourceStreamer();
String clientURL = "/assets/app1/pages/smiley.WRONG.png";
- String resourcePath = "org/apache/tapestry/integration/app1/pages/smiley.WRONG.png";
+ String resourcePath = "org/apache/tapestry5/integration/app1/pages/smiley.WRONG.png";
train_getPath(request, clientURL);
@@ -149,7 +149,7 @@
ResourceStreamer streamer = mockResourceStreamer();
String clientURL = RequestConstants.ASSET_PATH_PREFIX + "app1/pages/smiley.RIGHT.png";
- String resourcePath = "org/apache/tapestry/integration/app1/pages/smiley.RIGHT.png";
+ String resourcePath = "org/apache/tapestry5/integration/app1/pages/smiley.RIGHT.png";
train_getPath(request, clientURL);
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetInjectionProviderTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetInjectionProviderTest.java
index 21ada84..50f4fe4 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetInjectionProviderTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetInjectionProviderTest.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.annotation.Path;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.AssetSource;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.InjectionProvider;
+import org.apache.tapestry5.annotations.Path;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.AssetSource;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.InjectionProvider;
import org.testng.annotations.Test;
public class AssetInjectionProviderTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetObjectProviderTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetObjectProviderTest.java
index 4cccefa..9ed0d6a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetObjectProviderTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetObjectProviderTest.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.annotation.Path;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.services.AssetSource;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.annotations.Path;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.services.AssetSource;
import org.testng.annotations.Test;
public class AssetObjectProviderTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetSourceImplTest.java
index d5e5073..211adbd 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/AssetSourceImplTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import org.apache.tapestry.ioc.services.ThreadLocale;
-import org.apache.tapestry.services.AssetFactory;
-import org.apache.tapestry.services.AssetSource;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.ioc.services.ThreadLocale;
+import org.apache.tapestry5.services.AssetFactory;
+import org.apache.tapestry5.services.AssetSource;
import org.testng.annotations.Test;
import java.util.Collections;
@@ -30,7 +30,7 @@
public class AssetSourceImplTest extends InternalBaseTestCase
{
private final Resource baseResource = new ClasspathResource(
- "org/apache/tapestry/internal/services/SimpleComponent.class");
+ "org/apache/tapestry5/internal/services/SimpleComponent.class");
private final Resource rootResource = new ClasspathResource("/");
@@ -86,7 +86,7 @@
// First try creates it:
assertSame(source.getClasspathAsset(
- "org/apache/tapestry/internal/services/SimpleComponent.properties",
+ "org/apache/tapestry5/internal/services/SimpleComponent.properties",
Locale.UK), asset);
verify();
@@ -116,7 +116,7 @@
assertSame(
source
- .getClasspathAsset("org/apache/tapestry/internal/services/SimpleComponent.properties"),
+ .getClasspathAsset("org/apache/tapestry5/internal/services/SimpleComponent.properties"),
asset);
verify();
@@ -130,7 +130,7 @@
Asset asset = mockAsset();
Resource expectedResource = rootResource
- .forFile("org/apache/tapestry/internal/services/SimpleComponent_en_GB.properties");
+ .forFile("org/apache/tapestry5/internal/services/SimpleComponent_en_GB.properties");
train_getRootResource(factory, rootResource);
@@ -144,14 +144,14 @@
assertSame(source.getAsset(
baseResource,
- "classpath:org/apache/tapestry/internal/services/SimpleComponent.properties",
+ "classpath:org/apache/tapestry5/internal/services/SimpleComponent.properties",
Locale.UK), asset);
// Check that a leading slash is not a problem:
assertSame(source.getAsset(
baseResource,
- "classpath:/org/apache/tapestry/internal/services/SimpleComponent.properties",
+ "classpath:/org/apache/tapestry5/internal/services/SimpleComponent.properties",
Locale.UK), asset);
verify();
@@ -172,7 +172,7 @@
{
source.getAsset(
baseResource,
- "classpath:org/apache/tapestry/internal/services/SimpleComponent.properties",
+ "classpath:org/apache/tapestry5/internal/services/SimpleComponent.properties",
Locale.UK);
unreachable();
}
@@ -180,7 +180,7 @@
{
assertEquals(
ex.getMessage(),
- "Unknown prefix for asset path 'classpath:org/apache/tapestry/internal/services/SimpleComponent.properties'.");
+ "Unknown prefix for asset path 'classpath:org/apache/tapestry5/internal/services/SimpleComponent.properties'.");
}
verify();
@@ -206,7 +206,7 @@
{
assertEquals(
ex.getMessage(),
- "Unable to locate asset 'classpath:org/apache/tapestry/internal/services/DoesNotExist.properties' (the file does not exist).");
+ "Unable to locate asset 'classpath:org/apache/tapestry5/internal/services/DoesNotExist.properties' (the file does not exist).");
}
verify();
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BarInterface.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BarInterface.java
index 6105d35..e073489 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BarInterface.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BarInterface.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
public interface BarInterface
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanBlockSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanBlockSourceImplTest.java
index 755632f..e865662 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanBlockSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanBlockSourceImplTest.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.services.BeanBlockContribution;
-import org.apache.tapestry.services.BeanBlockOverrideSource;
-import org.apache.tapestry.services.BeanBlockSource;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.services.BeanBlockContribution;
+import org.apache.tapestry5.services.BeanBlockOverrideSource;
+import org.apache.tapestry5.services.BeanBlockSource;
import org.testng.annotations.Test;
import java.util.Collection;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanModelSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanModelSourceImplTest.java
index c5e4aac..93b1387 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanModelSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BeanModelSourceImplTest.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.beaneditor.BeanModel;
-import org.apache.tapestry.beaneditor.PropertyModel;
-import org.apache.tapestry.beaneditor.RelativePosition;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.transform.pages.ReadOnlyBean;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.services.BeanModelSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.beaneditor.BeanModel;
+import org.apache.tapestry5.beaneditor.PropertyModel;
+import org.apache.tapestry5.beaneditor.RelativePosition;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.transform.pages.ReadOnlyBean;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.services.BeanModelSource;
import org.easymock.EasyMock;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -66,7 +66,7 @@
assertEquals(model.getPropertyNames(), Arrays.asList("firstName", "lastName", "age"));
assertEquals(model.toString(),
- "BeanModel[org.apache.tapestry.internal.services.SimpleBean properties:firstName, lastName, age]");
+ "BeanModel[org.apache.tapestry5.internal.services.SimpleBean properties:firstName, lastName, age]");
PropertyModel age = model.get("age");
@@ -314,7 +314,7 @@
catch (RuntimeException ex)
{
assertEquals(ex.getMessage(),
- "Bean editor model for org.apache.tapestry.internal.services.SimpleBean already contains a property model for property \'age\'.");
+ "Bean editor model for org.apache.tapestry5.internal.services.SimpleBean already contains a property model for property \'age\'.");
}
verify();
@@ -341,7 +341,7 @@
catch (RuntimeException ex)
{
assertEquals(ex.getMessage(),
- "Bean editor model for org.apache.tapestry.internal.services.SimpleBean does not contain a property named \'frobozz\'. " + "Available properties: age, firstName, lastName.");
+ "Bean editor model for org.apache.tapestry5.internal.services.SimpleBean does not contain a property named \'frobozz\'. " + "Available properties: age, firstName, lastName.");
}
verify();
@@ -370,7 +370,7 @@
catch (RuntimeException ex)
{
assertEquals(ex.getMessage(),
- "Bean editor model for org.apache.tapestry.internal.services.SimpleBean does not contain a property with id \'frobozz\'. "
+ "Bean editor model for org.apache.tapestry5.internal.services.SimpleBean does not contain a property with id \'frobozz\'. "
+ "Available property ids: age, firstName, lastName, shrubfoo.");
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BindingSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BindingSourceImplTest.java
index 1a0c174..d660050 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BindingSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BindingSourceImplTest.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Location;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.services.BindingFactory;
-import org.apache.tapestry.services.BindingSource;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Location;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.services.BindingFactory;
+import org.apache.tapestry5.services.BindingSource;
import org.testng.annotations.Test;
import java.util.Map;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BlockInjectionProviderTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BlockInjectionProviderTest.java
index fa94369..226e0ca 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BlockInjectionProviderTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/BlockInjectionProviderTest.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Block;
-import org.apache.tapestry.annotation.Id;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.InjectionProvider;
-import org.apache.tapestry.services.TransformConstants;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.Block;
+import org.apache.tapestry5.annotations.Id;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.InjectionProvider;
+import org.apache.tapestry5.services.TransformConstants;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
public class BlockInjectionProviderTest extends TapestryTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CheckFieldType.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CheckFieldType.java
index 57a4aef..e9371a7 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CheckFieldType.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CheckFieldType.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import java.util.Map;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java
index 970df30..34ea8fd 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetAliasManagerImplTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.services.ClasspathAssetAliasManager;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.services.ClasspathAssetAliasManager;
+import org.apache.tapestry5.services.Request;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -30,8 +30,8 @@
{
Map<String, String> configuration = newMap();
- configuration.put("tapestry/", "org/apache/tapestry/");
- configuration.put("tapestry-internal/", "org/apache/tapestry/internal/");
+ configuration.put("tapestry/", "org/apache/tapestry5/");
+ configuration.put("tapestry-internal/", "org/apache/tapestry5/internal/");
configuration.put("mylib/", "com/example/mylib/");
return configuration;
@@ -65,8 +65,8 @@
return new Object[][] { { "foo/bar/Baz.txt", "foo/bar/Baz.txt" },
{ "com/example/mylib/Foo.bar", "mylib/Foo.bar" },
{ "com/example/mylib/nested/Foo.bar", "mylib/nested/Foo.bar" },
- { "org/apache/tapestry/internal/Foo.bar", "tapestry-internal/Foo.bar" },
- { "org/apache/tapestry/Foo.bar", "tapestry/Foo.bar" }, };
+ { "org/apache/tapestry5/internal/Foo.bar", "tapestry-internal/Foo.bar" },
+ { "org/apache/tapestry5/Foo.bar", "tapestry/Foo.bar" }, };
}
@Test(dataProvider = "to_resource_path_data")
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetFactoryTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetFactoryTest.java
index bd9403b..2e71088 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetFactoryTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClasspathAssetFactoryTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import org.apache.tapestry.services.AssetFactory;
-import org.apache.tapestry.services.ClasspathAssetAliasManager;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.services.AssetFactory;
+import org.apache.tapestry5.services.ClasspathAssetAliasManager;
import org.testng.annotations.Test;
public class ClasspathAssetFactoryTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImplTest.java
index e50bb2a..4851c0e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImplTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.RenderSupport;
import org.apache.tapestry5.json.JSONArray;
import org.apache.tapestry5.json.JSONObject;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
public class ClientBehaviorSupportImplTest extends TapestryTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java
index 4a46bb0..c1efc25 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.internal.util.Holder;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.internal.util.Holder;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.services.PersistentFieldChange;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.isA;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentClassResolverImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentClassResolverImplTest.java
index e076975..c2e4621 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentClassResolverImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentClassResolverImplTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.services.ClassNameLocator;
-import org.apache.tapestry.services.ComponentClassResolver;
-import org.apache.tapestry.services.LibraryMapping;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.services.ClassNameLocator;
+import org.apache.tapestry5.services.ComponentClassResolver;
+import org.apache.tapestry5.services.LibraryMapping;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.isA;
import org.slf4j.Logger;
@@ -34,7 +34,7 @@
private static final String CORE_PREFIX = "core";
- private static final String CORE_ROOT_PACKAGE = "org.apache.tapestry.corelib";
+ private static final String CORE_ROOT_PACKAGE = "org.apache.tapestry5.corelib";
private static final String LIB_PREFIX = "lib";
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDefaultProviderImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDefaultProviderImplTest.java
index 74a51ea..d941a1d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDefaultProviderImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentDefaultProviderImplTest.java
@@ -12,21 +12,21 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Binding;
-import org.apache.tapestry.BindingConstants;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.Translator;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.BindingSource;
-import org.apache.tapestry.services.ComponentDefaultProvider;
-import org.apache.tapestry.services.TranslatorSource;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.BindingConstants;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Translator;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.services.ClassPropertyAdapter;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.services.PropertyAdapter;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.BindingSource;
+import org.apache.tapestry5.services.ComponentDefaultProvider;
+import org.apache.tapestry5.services.TranslatorSource;
import org.testng.annotations.Test;
public class ComponentDefaultProviderImplTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java
index 1572a6c..36322ae 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventDispatcherTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.EventConstants;
-import org.apache.tapestry.internal.EmptyEventContext;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.URLEventContext;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.internal.EmptyEventContext;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.URLEventContext;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.*;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
index 3e45245..2fd9f8f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentEventImplTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentEventCallback;
-import org.apache.tapestry.EventContext;
-import org.apache.tapestry.internal.structure.PageResources;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.runtime.ComponentEvent;
+import org.apache.tapestry5.ComponentEventCallback;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.internal.structure.PageResources;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.runtime.ComponentEvent;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessorTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessorTest.java
index b068bed..803df21 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessorTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstanceResultProcessorTest.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
import org.slf4j.Logger;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java
index 50b4abc..bd6f536 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java
@@ -12,21 +12,21 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import javassist.*;
-import org.apache.tapestry.internal.*;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.transform.pages.BasicComponent;
-import org.apache.tapestry.internal.transform.pages.BasicSubComponent;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.RegistryBuilder;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.services.SymbolProvider;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.TapestryModule;
+import org.apache.tapestry5.internal.*;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.transform.pages.BasicComponent;
+import org.apache.tapestry5.internal.transform.pages.BasicSubComponent;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.RegistryBuilder;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.TapestryModule;
import org.slf4j.Logger;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -40,14 +40,14 @@
import java.util.UUID;
/**
- * Tests for {@link org.apache.tapestry.internal.services.ComponentInstantiatorSourceImpl}. Several of these tests are
+ * Tests for {@link org.apache.tapestry5.internal.services.ComponentInstantiatorSourceImpl}. Several of these tests are
* more of the form of integration tests that instantiate the Tapestry IoC Registry.
*/
public class ComponentInstantiatorSourceImplTest extends InternalBaseTestCase
{
private static final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader();
- private static final String SYNTH_COMPONENT_CLASSNAME = "org.apache.tapestry.internal.transform.pages.SynthComponent";
+ private static final String SYNTH_COMPONENT_CLASSNAME = "org.apache.tapestry5.internal.transform.pages.SynthComponent";
private File extraClasspath;
@@ -279,7 +279,7 @@
source = registry.getService(ComponentInstantiatorSource.class);
access = registry.getService(PropertyAccess.class);
- source.addPackage("org.apache.tapestry.internal.transform.pages");
+ source.addPackage("org.apache.tapestry5.internal.transform.pages");
}
@AfterClass
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationTest.java
index 77c8fb0..ddc71e3 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInvocationTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -32,7 +32,7 @@
public void context()
{
ComponentInvocation invocation = new ComponentInvocationImpl(new OpaqueConstantTarget("abc"),
- new String[]{"x", "123"}, null);
+ new String[] { "x", "123" }, null);
assertEquals(invocation.buildURI(false), "abc/x/123");
assertEquals(invocation.buildURI(true), "abc/x/123");
}
@@ -41,7 +41,7 @@
public void parameters()
{
ComponentInvocation invocation = new ComponentInvocationImpl(new OpaqueConstantTarget("abc"),
- new String[]{"x", "123"}, null);
+ new String[] { "x", "123" }, null);
invocation.addParameter("p1", "foo");
invocation.addParameter("p2", "bar");
assertEquals(invocation.buildURI(false), "abc/x/123?p1=foo&p2=bar");
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImplTest.java
index 9e797e3..2ee9ea5 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentMessagesSourceImplTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.util.URLChangeTracker;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import org.apache.tapestry.model.ComponentModel;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.util.URLChangeTracker;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.model.ComponentModel;
import org.apache.tapestry5.services.ComponentMessagesSource;
import org.testng.annotations.Test;
@@ -34,12 +34,12 @@
{
// With control of the tracker, we can force changes as if underlying files were changed.
- private static final String SIMPLE_COMPONENT_CLASS_NAME = "org.apache.tapestry.internal.services.SimpleComponent";
+ private static final String SIMPLE_COMPONENT_CLASS_NAME = "org.apache.tapestry5.internal.services.SimpleComponent";
private final URLChangeTracker tracker = new URLChangeTracker();
private final Resource simpleComponentResource = new ClasspathResource(
- "org/apache/tapestry/internal/services/SimpleComponent.class");
+ "org/apache/tapestry5/internal/services/SimpleComponent.class");
private final ComponentMessagesSourceImpl source = new ComponentMessagesSourceImpl(
simpleComponentResource, "AppCatalog.properties", tracker);
@@ -144,10 +144,10 @@
train_getComponentClassName(
model,
- "org.apache.tapestry.internal.services.SubclassComponent");
+ "org.apache.tapestry5.internal.services.SubclassComponent");
train_getBaseResource(model, new ClasspathResource(
- "org/apache/tapestry/internal/services/SubclassComponent.class"));
+ "org/apache/tapestry5/internal/services/SubclassComponent.class"));
train_getParentModel(model, parent);
@@ -188,10 +188,10 @@
train_getComponentClassName(
model,
- "org.apache.tapestry.internal.services.SubclassComponent");
+ "org.apache.tapestry5.internal.services.SubclassComponent");
train_getBaseResource(model, new ClasspathResource(
- "org/apache/tapestry/internal/services/SubclassComponent.class"));
+ "org/apache/tapestry5/internal/services/SubclassComponent.class"));
train_getParentModel(model, parent);
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentSourceImplTest.java
index abdbf43..8d9c085 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentSourceImplTest.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ComponentSource;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.ComponentSource;
import org.testng.annotations.Test;
public class ComponentSourceImplTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImplTest.java
index 6872a9f..561ec9d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentTemplateSourceImplTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.events.InvalidationListener;
-import org.apache.tapestry.internal.parser.ComponentTemplate;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import org.apache.tapestry.model.ComponentModel;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.internal.parser.ComponentTemplate;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.model.ComponentModel;
import org.testng.annotations.Test;
import java.io.File;
@@ -32,9 +32,9 @@
public class ComponentTemplateSourceImplTest extends InternalBaseTestCase
{
- private static final String PACKAGE = "org.apache.tapestry.internal.pageload";
+ private static final String PACKAGE = "org.apache.tapestry5.internal.pageload";
- static public final String PATH = "org/apache/tapestry/internal/pageload";
+ static public final String PATH = "org/apache/tapestry5/internal/pageload";
private final ClassLoader loader = Thread.currentThread().getContextClassLoader();
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CompositeBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CompositeBean.java
index b2d6e49..22112fd 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CompositeBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CompositeBean.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
public class CompositeBean
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextAssetFactoryTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextAssetFactoryTest.java
index 57e0f07..fd3bbdd 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextAssetFactoryTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextAssetFactoryTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.services.AssetFactory;
-import org.apache.tapestry.services.Context;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.services.AssetFactory;
+import org.apache.tapestry5.services.Context;
+import org.apache.tapestry5.services.Request;
import org.testng.annotations.Test;
public class ContextAssetFactoryTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextImplTest.java
index 5a6be29..15d4750 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.Context;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.Context;
import org.testng.annotations.Test;
import javax.servlet.ServletContext;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextResourceTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextResourceTest.java
index d6ee715..08a032b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextResourceTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextResourceTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.services.Context;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.services.Context;
import org.testng.annotations.Test;
import java.io.File;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextValueEncoderImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextValueEncoderImplTest.java
index 8152777..e51ce69 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextValueEncoderImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ContextValueEncoderImplTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ValueEncoder;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.ContextValueEncoder;
-import org.apache.tapestry.services.ValueEncoderSource;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.ContextValueEncoder;
+import org.apache.tapestry5.services.ValueEncoderSource;
import org.testng.annotations.Test;
public class ContextValueEncoderImplTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CookiesImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CookiesImplTest.java
index 50e3750..fec4165 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CookiesImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/CookiesImplTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.TestableRequestImpl;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.internal.test.TestableRequestImpl;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -24,7 +24,7 @@
import java.util.List;
/**
- * Tests for {@link org.apache.tapestry.services.impl.CookiesImpl}.
+ * Tests for {@link org.apache.tapestry5.services.impl.CookiesImpl}.
*/
@Test
public class CookiesImplTest extends Assert
@@ -99,12 +99,12 @@
public void test_Match()
{
- attempt("fred", "flintstone", new String[]{"barney", "rubble", "fred", "flintstone"});
+ attempt("fred", "flintstone", new String[] { "barney", "rubble", "fred", "flintstone" });
}
public void test_No_Match()
{
- attempt("foo", null, new String[]{"bar", "baz"});
+ attempt("foo", null, new String[] { "bar", "baz" });
}
public void test_Write_Cookie_Domain()
@@ -167,4 +167,4 @@
assertEquals(cookies.size(), 1);
assertEquals(cookies.get(0), expectedCookie);
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultInjectionProviderTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultInjectionProviderTest.java
index cd9e8a4..30e877d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultInjectionProviderTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DefaultInjectionProviderTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.services.MasterObjectProvider;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.services.MasterObjectProvider;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.Request;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.isA;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.java
index e6126ea..51c8909 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.dom.Document;
-import org.apache.tapestry.dom.XMLMarkupModel;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.dom.Document;
+import org.apache.tapestry5.dom.XMLMarkupModel;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
public class DocumentLinkerImplTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnumBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnumBean.java
index 526c8df..655e417 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnumBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnumBean.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.parser.TokenType;
+import org.apache.tapestry5.internal.parser.TokenType;
public class EnumBean
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnvironmentImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnvironmentImplTest.java
index 3d68f15..81b8a717 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnvironmentImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnvironmentImplTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.Environment;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
import java.util.List;
@@ -128,7 +128,7 @@
{
assertEquals(
ex.getMessage(),
- "No object of type java.util.List is available from the Environment. Available types are org.apache.tapestry.ioc.Location, org.apache.tapestry.runtime.Component.");
+ "No object of type java.util.List is available from the Environment. Available types are org.apache.tapestry5.ioc.Location, org.apache.tapestry5.runtime.Component.");
}
verify();
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnvironmentalShadowBuilderImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnvironmentalShadowBuilderImplTest.java
index e4b5191..ea41dea 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnvironmentalShadowBuilderImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/EnvironmentalShadowBuilderImplTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.services.EnvironmentalShadowBuilder;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryImpl;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.services.Environment;
+import org.apache.tapestry5.services.EnvironmentalShadowBuilder;
import org.testng.annotations.Test;
public class EnvironmentalShadowBuilderImplTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidationSupportImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidationSupportImplTest.java
index 2471871..67e3ec9 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidationSupportImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidationSupportImplTest.java
@@ -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.*;
-import org.apache.tapestry.corelib.internal.InternalMessages;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.services.ValidationMessagesSource;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.corelib.internal.InternalMessages;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.services.ValidationMessagesSource;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
import org.testng.annotations.BeforeClass;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorDefaultSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorDefaultSourceImplTest.java
index ea29550..09a253b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorDefaultSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorDefaultSourceImplTest.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.services.FieldValidatorDefaultSource;
-import org.apache.tapestry.services.FieldValidatorSource;
-import org.apache.tapestry.services.ValidationConstraintGenerator;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.services.FieldValidatorDefaultSource;
+import org.apache.tapestry5.services.FieldValidatorSource;
+import org.apache.tapestry5.services.ValidationConstraintGenerator;
import org.testng.annotations.Test;
import java.util.Locale;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorImplTest.java
index 57220e6..b6c4cdc 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorImplTest.java
@@ -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.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.Validator;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.MessageFormatter;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.Validator;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.MessageFormatter;
import org.testng.annotations.Test;
/**
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImplTest.java
index d8c338e..92a7e7c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FieldValidatorSourceImplTest.java
@@ -12,20 +12,20 @@
// 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.Field;
-import org.apache.tapestry.FieldValidator;
-import org.apache.tapestry.Validator;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.ioc.Messages;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.FieldValidatorSource;
-import org.apache.tapestry.services.ValidationMessagesSource;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.FieldValidator;
+import org.apache.tapestry5.Validator;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.ioc.Messages;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.FieldValidatorSource;
+import org.apache.tapestry5.services.ValidationMessagesSource;
import org.testng.annotations.Test;
import java.util.Arrays;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FlashPersistentFieldStrategyTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FlashPersistentFieldStrategyTest.java
index 0779588..1bf4377 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FlashPersistentFieldStrategyTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FlashPersistentFieldStrategyTest.java
@@ -12,21 +12,20 @@
// 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.PersistentFieldStrategy;
-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.PersistentFieldStrategy;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Session;
import org.testng.annotations.Test;
import java.util.Collection;
import java.util.Iterator;
/**
- * A more minimal test, since common behavior is already tested by
- * {@link SessionPersistentFieldStrategyTest}.
+ * A more minimal test, since common behavior is already tested by {@link SessionPersistentFieldStrategyTest}.
*/
public class FlashPersistentFieldStrategyTest extends InternalBaseTestCase
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooBarInterface.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooBarInterface.java
index 0fb5014..f2e10e6 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooBarInterface.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooBarInterface.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
public interface FooBarInterface extends FooInterface, BarInterface
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooInterface.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooInterface.java
index 9f1ea66..fdabaec 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooInterface.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/FooInterface.java
@@ -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;
/**
*
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GenericBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GenericBean.java
index 4070b91..efeec94 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GenericBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GenericBean.java
@@ -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 GenericBean<T>
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GetterMethodsInterface.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GetterMethodsInterface.java
index af5d046..7462d93 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GetterMethodsInterface.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/GetterMethodsInterface.java
@@ -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;
/**
*
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/HeartbeatImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/HeartbeatImplTest.java
index 821af08..f8f03c2 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/HeartbeatImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/HeartbeatImplTest.java
@@ -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.Heartbeat;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.Heartbeat;
import org.testng.annotations.Test;
public class HeartbeatImplTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/IgnoredPathsFilterTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/IgnoredPathsFilterTest.java
index 49b481b..ae16daf 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/IgnoredPathsFilterTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/IgnoredPathsFilterTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.HttpServletRequestFilter;
-import org.apache.tapestry.services.HttpServletRequestHandler;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.HttpServletRequestFilter;
+import org.apache.tapestry5.services.HttpServletRequestHandler;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
import javax.servlet.http.HttpServletRequest;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InheritedBindingTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InheritedBindingTest.java
index 0b0754c..9abd173 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InheritedBindingTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InheritedBindingTest.java
@@ -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.Binding;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.Binding;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
public class InheritedBindingTest extends TapestryTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InternalClassTransformationImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InternalClassTransformationImplTest.java
index 9d24228..1454a0c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InternalClassTransformationImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/InternalClassTransformationImplTest.java
@@ -12,31 +12,31 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import javassist.*;
-import org.apache.tapestry.annotation.Meta;
-import org.apache.tapestry.annotation.OnEvent;
-import org.apache.tapestry.annotation.Retain;
-import org.apache.tapestry.annotation.SetupRender;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.model.MutableComponentModelImpl;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.transform.FieldRemoval;
-import org.apache.tapestry.internal.transform.InheritedAnnotation;
-import org.apache.tapestry.internal.transform.TestPackageAwareLoader;
-import org.apache.tapestry.internal.transform.pages.*;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryClassPool;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.runtime.ComponentResourcesAware;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.MethodFilter;
-import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry5.annotations.Meta;
+import org.apache.tapestry5.annotations.OnEvent;
+import org.apache.tapestry5.annotations.Retain;
+import org.apache.tapestry5.annotations.SetupRender;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.model.MutableComponentModelImpl;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.transform.FieldRemoval;
+import org.apache.tapestry5.internal.transform.InheritedAnnotation;
+import org.apache.tapestry5.internal.transform.TestPackageAwareLoader;
+import org.apache.tapestry5.internal.transform.pages.*;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryClassPool;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryImpl;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.runtime.ComponentResourcesAware;
+import org.apache.tapestry5.services.ClassTransformation;
+import org.apache.tapestry5.services.MethodFilter;
+import org.apache.tapestry5.services.TransformMethodSignature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.AfterClass;
@@ -193,7 +193,7 @@
catch (RuntimeException ex)
{
assertEquals(ex.getMessage(),
- "Class org.apache.tapestry.internal.transform.pages.ParentClass does not contain a field named 'unknownField'.");
+ "Class org.apache.tapestry5.internal.transform.pages.ParentClass does not contain a field named 'unknownField'.");
}
verify();
@@ -339,7 +339,7 @@
catch (RuntimeException ex)
{
assertEquals(ex.getMessage(),
- "Field _field4 of class org.apache.tapestry.internal.transform.pages.ClaimedFields is already claimed by Fred and can not be claimed by Barney.");
+ "Field _field4 of class org.apache.tapestry5.internal.transform.pages.ClaimedFields is already claimed by Fred and can not be claimed by Barney.");
}
verify();
@@ -635,7 +635,7 @@
// The PropertyAccess layer adds a wrapper exception around the real one.
assertEquals(ex.getCause().getMessage(),
- "Field org.apache.tapestry.internal.transform.pages.ReadOnlyBean._value is read-only.");
+ "Field org.apache.tapestry5.internal.transform.pages.ReadOnlyBean._value is read-only.");
}
verify();
@@ -720,7 +720,7 @@
// The PropertyAccess layer adds a wrapper exception around the real one.
assertEquals(ex.getCause().getMessage(),
- "Field org.apache.tapestry.internal.transform.pages.ReadOnlyBean._value is read-only.");
+ "Field org.apache.tapestry5.internal.transform.pages.ReadOnlyBean._value is read-only.");
}
verify();
@@ -827,7 +827,7 @@
assertEquals(l.size(), 2);
assertEquals(l.get(0).toString(), "void beforeRender()");
- assertEquals(l.get(1).toString(), "boolean earlyRender(org.apache.tapestry.MarkupWriter)");
+ assertEquals(l.get(1).toString(), "boolean earlyRender(org.apache.tapestry5.MarkupWriter)");
// Check up on cacheing
@@ -865,7 +865,7 @@
assertEquals(l.size(), 2);
assertEquals(l.get(0).toString(), "void beforeRender()");
- assertEquals(l.get(1).toString(), "boolean earlyRender(org.apache.tapestry.MarkupWriter)");
+ assertEquals(l.get(1).toString(), "boolean earlyRender(org.apache.tapestry5.MarkupWriter)");
// Check up on cacheing
@@ -968,7 +968,7 @@
catch (IllegalArgumentException ex)
{
assertEquals(ex.getMessage(),
- "Class org.apache.tapestry.internal.transform.pages.ParentClass does not declare method 'public void foo()'.");
+ "Class org.apache.tapestry5.internal.transform.pages.ParentClass does not declare method 'public void foo()'.");
}
verify();
@@ -1164,7 +1164,7 @@
TransformMethodSignature sig = sigs.get(0);
assertEquals(ct.getMethodIdentifier(sig),
- "org.apache.tapestry.internal.transform.pages.MethodIdentifier.makeWaves(java.lang.String, int[]) (at MethodIdentifier.java:24)");
+ "org.apache.tapestry5.internal.transform.pages.MethodIdentifier.makeWaves(java.lang.String, int[]) (at MethodIdentifier.java:24)");
verify();
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java
index 212dde9..1cbecba 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkFactoryImplTest.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentEventCallback;
-import org.apache.tapestry.EventConstants;
-import org.apache.tapestry.Link;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.util.Holder;
-import org.apache.tapestry.services.ContextValueEncoder;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.ComponentEventCallback;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.util.Holder;
+import org.apache.tapestry5.services.ContextValueEncoder;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Response;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.*;
import org.easymock.IAnswer;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkImplTest.java
index 2a1e1c2..1b917ee 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LinkImplTest.java
@@ -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.Link;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.Response;
import org.testng.annotations.Test;
import java.util.Arrays;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationFilterTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationFilterTest.java
index 75ddd32..a53b36a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationFilterTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationFilterTest.java
@@ -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.services.Request;
-import org.apache.tapestry.services.RequestFilter;
-import org.apache.tapestry.services.RequestHandler;
-import org.apache.tapestry.services.Response;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.RequestFilter;
+import org.apache.tapestry5.services.RequestHandler;
+import org.apache.tapestry5.services.Response;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
import java.io.IOException;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.java
index 9a32ed8..c707192 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/LocalizationSetterImplTest.java
@@ -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.ioc.services.ThreadLocale;
-import org.apache.tapestry.services.PersistentLocale;
+import org.apache.tapestry5.ioc.services.ThreadLocale;
+import org.apache.tapestry5.services.PersistentLocale;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MarkupWriterImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MarkupWriterImplTest.java
index 2ee7fd0..b445d6f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MarkupWriterImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MarkupWriterImplTest.java
@@ -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.MarkupWriter;
-import org.apache.tapestry.MarkupWriterListener;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.dom.XMLMarkupModel;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.MarkupWriterListener;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.dom.XMLMarkupModel;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
public class MarkupWriterImplTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MetaDataLocatorImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MetaDataLocatorImplTest.java
index eb80725..a9a47d8 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MetaDataLocatorImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/MetaDataLocatorImplTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.MetaDataLocator;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.services.MetaDataLocator;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/Named.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/Named.java
index 2ba746e..f5bd5fd 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/Named.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/Named.java
@@ -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;
/**
- * Used by {@link org.apache.tapestry.internal.services.ComponentInstantiatorSourceImplTest}.
+ * Used by {@link org.apache.tapestry5.internal.services.ComponentInstantiatorSourceImplTest}.
*/
public interface Named
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NoOpCookieSource.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NoOpCookieSource.java
index 82c3952..86e2c13 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NoOpCookieSource.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NoOpCookieSource.java
@@ -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.services.Cookies;
+import org.apache.tapestry5.services.Cookies;
public class NoOpCookieSource implements Cookies
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NonVisualBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NonVisualBean.java
index 60d34e5..e7df970 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NonVisualBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NonVisualBean.java
@@ -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.NonVisual;
+import org.apache.tapestry5.beaneditor.NonVisual;
public class NonVisualBean
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NullFieldStrategySourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NullFieldStrategySourceImplTest.java
index 159ab74..fd50310 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NullFieldStrategySourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/NullFieldStrategySourceImplTest.java
@@ -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.NullFieldStrategy;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.NullFieldStrategySource;
+import org.apache.tapestry5.NullFieldStrategy;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.NullFieldStrategySource;
import org.testng.annotations.Test;
import java.util.Collections;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ObjectComponentEventResultProcessorTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ObjectComponentEventResultProcessorTest.java
index 85d4294..0e18f04 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ObjectComponentEventResultProcessorTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ObjectComponentEventResultProcessorTest.java
@@ -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.ComponentResources;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.ComponentEventResultProcessor;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
import java.util.Arrays;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageElementFactoryImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageElementFactoryImplTest.java
index a449ff7..be6d5cb 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageElementFactoryImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageElementFactoryImplTest.java
@@ -12,21 +12,21 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.dom.MarkupModel;
-import org.apache.tapestry.dom.XMLMarkupModel;
-import org.apache.tapestry.internal.parser.AttributeToken;
-import org.apache.tapestry.internal.structure.PageElement;
-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.runtime.RenderQueue;
-import org.apache.tapestry.services.BindingSource;
-import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.dom.MarkupModel;
+import org.apache.tapestry5.dom.XMLMarkupModel;
+import org.apache.tapestry5.internal.parser.AttributeToken;
+import org.apache.tapestry5.internal.structure.PageElement;
+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.runtime.RenderQueue;
+import org.apache.tapestry5.services.BindingSource;
+import org.apache.tapestry5.services.ComponentClassResolver;
import org.apache.tapestry5.services.ComponentMessagesSource;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLoaderImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLoaderImplTest.java
index a0f03fc..92cbb9f 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLoaderImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLoaderImplTest.java
@@ -12,20 +12,20 @@
// 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.InternalComponentResources;
-import org.apache.tapestry.internal.parser.ComponentTemplate;
-import org.apache.tapestry.internal.parser.EndElementToken;
-import org.apache.tapestry.internal.parser.StartComponentToken;
-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.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.model.EmbeddedComponentModel;
-import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.parser.ComponentTemplate;
+import org.apache.tapestry5.internal.parser.EndElementToken;
+import org.apache.tapestry5.internal.parser.StartComponentToken;
+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.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.model.EmbeddedComponentModel;
+import org.apache.tapestry5.services.ComponentClassResolver;
import org.easymock.EasyMock;
import org.slf4j.Logger;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLocatorTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLocatorTest.java
index 235fc2c..8d1ae9b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLocatorTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageLocatorTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolCacheTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolCacheTest.java
index ddc9fc7..50cc0ad 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolCacheTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolCacheTest.java
@@ -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.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
import java.util.Locale;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolImplTest.java
index c149225..fc0fea2 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PagePoolImplTest.java
@@ -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.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.services.ThreadLocale;
-import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.services.ThreadLocale;
+import org.apache.tapestry5.services.ComponentClassResolver;
import static org.easymock.EasyMock.contains;
import org.slf4j.Logger;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageRenderDispatcherTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageRenderDispatcherTest.java
index 842733d..53991ef 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageRenderDispatcherTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageRenderDispatcherTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentEventCallback;
-import org.apache.tapestry.EventConstants;
-import org.apache.tapestry.EventContext;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.ComponentEventCallback;
+import org.apache.tapestry5.EventConstants;
+import org.apache.tapestry5.EventContext;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.*;
import org.easymock.EasyMock;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.isA;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageTemplateLocatorImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageTemplateLocatorImplTest.java
index 8cc492d..8f05ba0 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageTemplateLocatorImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PageTemplateLocatorImplTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.ComponentClassResolver;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.services.ComponentClassResolver;
import org.testng.annotations.Test;
import java.util.Locale;
@@ -71,8 +71,8 @@
}
/**
- * Because of how Tapestry maps class names to logical page names, part of the name may be have
- * been stripped off and we want to make sure we get it back.
+ * Because of how Tapestry maps class names to logical page names, part of the name may be have been stripped off
+ * and we want to make sure we get it back.
*/
@Test
public void uses_simple_class_name_in_folders()
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ParserExperiment.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ParserExperiment.java
index b3e3b65..050f71c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ParserExperiment.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ParserExperiment.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldBundleImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldBundleImplTest.java
index 59e4d67..7885fb5 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldBundleImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldBundleImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.PersistentFieldBundle;
-import org.apache.tapestry.services.PersistentFieldChange;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.PersistentFieldBundle;
+import org.apache.tapestry5.services.PersistentFieldChange;
import org.testng.annotations.Test;
import java.util.Arrays;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImplTest.java
index ef04650..5e7b65b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentFieldManagerImplTest.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.model.ComponentModel;
-import org.apache.tapestry.services.MetaDataLocator;
-import org.apache.tapestry.services.PersistentFieldBundle;
-import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.PersistentFieldStrategy;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.model.ComponentModel;
+import org.apache.tapestry5.services.MetaDataLocator;
+import org.apache.tapestry5.services.PersistentFieldBundle;
+import org.apache.tapestry5.services.PersistentFieldChange;
+import org.apache.tapestry5.services.PersistentFieldStrategy;
import org.testng.annotations.Test;
import java.util.Collection;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentLocaleImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentLocaleImplTest.java
index 8a5b586..d7a801c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentLocaleImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PersistentLocaleImplTest.java
@@ -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.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.Cookies;
-import org.apache.tapestry.services.PersistentLocale;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.services.Cookies;
+import org.apache.tapestry5.services.PersistentLocale;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -35,7 +35,7 @@
@Override
public String readCookieValue(String name)
{
- return name.equals("org.apache.tapestry.locale") ? "fr" : null;
+ return name.equals("org.apache.tapestry5.locale") ? "fr" : null;
}
};
@@ -76,7 +76,7 @@
PersistentLocale persistentLocale = new PersistentLocaleImpl(cookieSource);
persistentLocale.set(Locale.CANADA_FRENCH);
assertEquals(cookies.size(), 1);
- assertEquals(cookies.get("org.apache.tapestry.locale"), "fr_CA");
+ assertEquals(cookies.get("org.apache.tapestry5.locale"), "fr_CA");
}
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImplTest.java
index 813d1d7..896808e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/PropertyConduitSourceImplTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.PropertyConduit;
-import org.apache.tapestry.internal.bindings.PropBindingFactoryTest;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
-import org.apache.tapestry.ioc.services.ClassFab;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.services.PropertyConduitSource;
+import org.apache.tapestry5.PropertyConduit;
+import org.apache.tapestry5.internal.bindings.PropBindingFactoryTest;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryImpl;
+import org.apache.tapestry5.ioc.services.ClassFab;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.services.PropertyConduitSource;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RemoveFieldBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RemoveFieldBean.java
index ca0a37f..1f3b135 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RemoveFieldBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RemoveFieldBean.java
@@ -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 RemoveFieldBean
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderQueueImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderQueueImplTest.java
index a82521b..cb43a3d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderQueueImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderQueueImplTest.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.runtime.RenderCommand;
-import org.apache.tapestry.runtime.RenderQueue;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.MarkupWriter;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.runtime.RenderCommand;
+import org.apache.tapestry5.runtime.RenderQueue;
import org.slf4j.Logger;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java
index 7fb1146..0f3177b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.Asset;
-import org.apache.tapestry.RenderSupport;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.services.AssetSource;
+import org.apache.tapestry5.Asset;
+import org.apache.tapestry5.RenderSupport;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.services.AssetSource;
import org.testng.annotations.Test;
public class RenderSupportImplTest extends InternalBaseTestCase
{
private static final String CORE_ASSET_PATH_UNEXPANDED = "${core}";
- private static final String CORE_ASSET_PATH = "/org/apache/tapestry/core/core.png";
+ private static final String CORE_ASSET_PATH = "/org/apache/tapestry5/core/core.png";
private static final String CORE_ASSET_URL = "/assets/core/core.png";
@@ -99,7 +99,7 @@
public void add_classpath_script_link()
{
String path = "${root}/foo/bar.pdf";
- String expanded = "org/apache/tapestry/foo/bar.pdf";
+ String expanded = "org/apache/tapestry5/foo/bar.pdf";
DocumentLinker linker = mockDocumentLinker();
Asset asset = mockAsset();
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestEncodingInitializerImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestEncodingInitializerImplTest.java
index 942af7b..25e6893 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestEncodingInitializerImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestEncodingInitializerImplTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.MetaDataConstants;
-import org.apache.tapestry.internal.InternalComponentResources;
-import org.apache.tapestry.internal.structure.ComponentPageElement;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.MetaDataLocator;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.MetaDataConstants;
+import org.apache.tapestry5.internal.InternalComponentResources;
+import org.apache.tapestry5.internal.structure.ComponentPageElement;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.MetaDataLocator;
+import org.apache.tapestry5.services.Request;
import org.testng.annotations.Test;
public class RequestEncodingInitializerImplTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestImplTest.java
index 87b6ee5..659366c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Session;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Session;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -123,7 +123,8 @@
@DataProvider(name = "xhr_inputs")
public Object[][] xhr_inputs()
{
- return new Object[][]{{null, false}, {"", false}, {"some other value", false}, {"XMLHttpRequest", true}};
+ return new Object[][] { { null, false }, { "", false }, { "some other value", false },
+ { "XMLHttpRequest", true } };
}
@Test
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPageCacheImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPageCacheImplTest.java
index cfcd6ce..6670662 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPageCacheImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPageCacheImplTest.java
@@ -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.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
public class RequestPageCacheImplTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImplTest.java
index dae45be..53f4d93 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImplTest.java
@@ -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.Request;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.Request;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -24,74 +24,74 @@
@DataProvider(name = "uri_optimization")
public Object[][] uri_optimization_data()
{
- return new Object[][]{{"/context", "/foo/bar.png", "/context/foo/baz.png", "baz.png"},
+ return new Object[][] { { "/context", "/foo/bar.png", "/context/foo/baz.png", "baz.png" },
- {"/context", "/foo/bar.gif", "/context/foo//baz.gif", "baz.gif"},
+ { "/context", "/foo/bar.gif", "/context/foo//baz.gif", "baz.gif" },
- {"/context", "/foo//bar.css", "/context/foo/baz.css", "baz.css"},
+ { "/context", "/foo//bar.css", "/context/foo/baz.css", "baz.css" },
- {"", "/foo/bar.css", "/foo/baz.css", "baz.css"},
+ { "", "/foo/bar.css", "/foo/baz.css", "baz.css" },
- {"/reallylongcontexttoensureitisrelative", "/foo/bar/baz/biff.gif",
- "/reallylongcontexttoensureitisrelative/gnip/gnop.gif", "../../../gnip/gnop.gif"},
+ { "/reallylongcontexttoensureitisrelative", "/foo/bar/baz/biff.gif",
+ "/reallylongcontexttoensureitisrelative/gnip/gnop.gif", "../../../gnip/gnop.gif" },
- {"", "/foo/bar/baz/biff/yepthisissolongthatabsoluteurlisshorter/dude", "/gnip/gnop",
- "/gnip/gnop"},
+ { "", "/foo/bar/baz/biff/yepthisissolongthatabsoluteurlisshorter/dude", "/gnip/gnop",
+ "/gnip/gnop" },
- {"", "/foo/bar", "/foo/bar/baz/bif", "bar/baz/bif"},
+ { "", "/foo/bar", "/foo/bar/baz/bif", "bar/baz/bif" },
- {"", "/foo/bar/baz/bif", "/foo", "/foo"},
+ { "", "/foo/bar/baz/bif", "/foo", "/foo" },
- {"/ctx", "/foo/bar/baz/bif", "/ctx/foo", "/ctx/foo"},
+ { "/ctx", "/foo/bar/baz/bif", "/ctx/foo", "/ctx/foo" },
- {"/anotherobnoxiouslylongcontextthatiwllforcerelative", "/foo/bar/baz/bif",
- "/anotherobnoxiouslylongcontextthatiwllforcerelative/foo", "../../../foo"},
+ { "/anotherobnoxiouslylongcontextthatiwllforcerelative", "/foo/bar/baz/bif",
+ "/anotherobnoxiouslylongcontextthatiwllforcerelative/foo", "../../../foo" },
// A couple of better examples, see TAPESTRY-2033
- {"/manager", "", "/manager/asset/foo.gif", "asset/foo.gif"},
+ { "/manager", "", "/manager/asset/foo.gif", "asset/foo.gif" },
- {"", "", "/asset/foo.gif", "asset/foo.gif"},
+ { "", "", "/asset/foo.gif", "asset/foo.gif" },
- {"", "/griddemo.grid.columns.sort/title", "/assets/default.css", "/assets/default.css"},
+ { "", "/griddemo.grid.columns.sort/title", "/assets/default.css", "/assets/default.css" },
- {"/example", "/", "/example/assets/tapestry/default.css", "assets/tapestry/default.css"},
+ { "/example", "/", "/example/assets/tapestry/default.css", "assets/tapestry/default.css" },
- {"/example", "/newaccount", "/example/assets/tapestry/default.css",
- "assets/tapestry/default.css"},
+ { "/example", "/newaccount", "/example/assets/tapestry/default.css",
+ "assets/tapestry/default.css" },
- {"/verylongcontextname", "/style/app.css", "/verylongcontextname/asset/foo.gif",
- "../asset/foo.gif"},
+ { "/verylongcontextname", "/style/app.css", "/verylongcontextname/asset/foo.gif",
+ "../asset/foo.gif" },
- {"", "/eventhandlerdemo.barney/one", "/eventhandlerdemo.clear/anything",
- "/eventhandlerdemo.clear/anything"},
+ { "", "/eventhandlerdemo.barney/one", "/eventhandlerdemo.clear/anything",
+ "/eventhandlerdemo.clear/anything" },
- {"/verylongcontextname", "/eventhandlerdemo.barney/one",
+ { "/verylongcontextname", "/eventhandlerdemo.barney/one",
"/verylongcontextname/eventhandlerdemo.clear/anything",
- "../eventhandlerdemo.clear/anything"},
+ "../eventhandlerdemo.clear/anything" },
- {"/verylongcontextname", "/page", "/verylongcontextname/page:sort/foo",
- "./page:sort/foo"},
+ { "/verylongcontextname", "/page", "/verylongcontextname/page:sort/foo",
+ "./page:sort/foo" },
- {"", "/page", "/page:sort/foo", "/page:sort/foo"},
+ { "", "/page", "/page:sort/foo", "/page:sort/foo" },
// TAPESTRY-2046
- {"/attendance", "/view/sites", "/attendance/assets/tapestry/tapestry.js",
- "../assets/tapestry/tapestry.js"},
+ { "/attendance", "/view/sites", "/attendance/assets/tapestry/tapestry.js",
+ "../assets/tapestry/tapestry.js" },
// TAPESTRY-2095
- {"", "/", "/component:event", "/component:event"},
-
+ { "", "/", "/component:event", "/component:event" },
+
// TAPESTRY-2333
-
- {"", "/nested/actiondemo/", "/nested/actiondemo.actionlink/2", "../actiondemo.actionlink/2"},
+
+ { "", "/nested/actiondemo/", "/nested/actiondemo.actionlink/2", "../actiondemo.actionlink/2" },
// Make sure the ./ prefix is added even when the relative path doesn't contain
// a slash ... otherwise, invalid URL component:event (i.e., "component" protocol, not "http").
- {"/verylongcontextname", "/", "/verylongcontextname/component:event", "./component:event"}
+ { "/verylongcontextname", "/", "/verylongcontextname/component:event", "./component:event" }
};
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java
index d57d504..718d9e0 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java
@@ -12,18 +12,18 @@
// 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.Link;
-import org.apache.tapestry.MetaDataConstants;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.BaseURLSource;
-import org.apache.tapestry.services.MetaDataLocator;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.Link;
+import org.apache.tapestry5.MetaDataConstants;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.BaseURLSource;
+import org.apache.tapestry5.services.MetaDataLocator;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.Response;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceCacheImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceCacheImplTest.java
index 0f5f7a7..1e77ea5 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceCacheImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceCacheImplTest.java
@@ -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.events.InvalidationListener;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.services.ResourceDigestGenerator;
+import org.apache.tapestry5.internal.events.InvalidationListener;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.services.ResourceDigestGenerator;
import org.testng.annotations.Test;
import java.io.File;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceDigestGeneratorImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceDigestGeneratorImplTest.java
index acf8a79..f739004 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceDigestGeneratorImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceDigestGeneratorImplTest.java
@@ -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.ResourceDigestGenerator;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.services.ResourceDigestGenerator;
import org.testng.annotations.Test;
import java.io.*;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceStreamerImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceStreamerImplTest.java
index dae45d9..0245b1b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceStreamerImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResourceStreamerImplTest.java
@@ -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.ioc.Resource;
-import org.apache.tapestry.ioc.internal.util.ClasspathResource;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.internal.util.ClasspathResource;
+import org.apache.tapestry5.services.Request;
import org.apache.tapestry5.services.RequestGlobals;
+import org.apache.tapestry5.services.Response;
import static org.easymock.EasyMock.*;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResponseRendererImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResponseRendererImplTest.java
index b6b5a17..1c5795c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResponseRendererImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ResponseRendererImplTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.ContentType;
-import org.apache.tapestry.internal.structure.Page;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.runtime.Component;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.ComponentResources;
+import org.apache.tapestry5.ContentType;
+import org.apache.tapestry5.internal.structure.Page;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.runtime.Component;
+import org.apache.tapestry5.services.Response;
import org.testng.annotations.Test;
public class ResponseRendererImplTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ServiceAnnotationObjectProviderTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ServiceAnnotationObjectProviderTest.java
index 1603ffd..69ae536 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ServiceAnnotationObjectProviderTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ServiceAnnotationObjectProviderTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategyTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategyTest.java
index 74e297d..f198e2a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategyTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SessionApplicationStatePersistenceStrategyTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SessionImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SessionImplTest.java
index 7760b8e..6c97542 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SessionImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SessionImplTest.java
@@ -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;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SessionPersistentFieldStrategyTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SessionPersistentFieldStrategyTest.java
index ed325a6..332d229 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SessionPersistentFieldStrategyTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SessionPersistentFieldStrategyTest.java
@@ -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;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleASO.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleASO.java
index f7588d0..5f10303 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleASO.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleASO.java
@@ -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
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleBean.java
index 0d55d79..b617c26 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleBean.java
@@ -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
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleLayoutComponent.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleLayoutComponent.java
index 9598444..873e6e4 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleLayoutComponent.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/SimpleLayoutComponent.java
@@ -17,7 +17,7 @@
*
*
*/
-package org.apache.tapestry.internal.services;
+package org.apache.tapestry5.internal.services;
public class SimpleLayoutComponent
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StaticFilesFilterTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StaticFilesFilterTest.java
index c770eb1..16812d1 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StaticFilesFilterTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StaticFilesFilterTest.java
@@ -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;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StoogeBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StoogeBean.java
index fc14e82..dfd1072 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StoogeBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StoogeBean.java
@@ -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
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringArrayBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringArrayBean.java
index 3a22371..d308f58 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringArrayBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringArrayBean.java
@@ -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
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolder.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolder.java
index f3c5203..d6f4a1e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolder.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolder.java
@@ -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>
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolderBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolderBean.java
index c8a30ec..f2444e4 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolderBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/StringHolderBean.java
@@ -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>
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java
index d0689ba..9ee9563 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java
@@ -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")
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TranslatorSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TranslatorSourceImplTest.java
index c3f2f11..530631b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TranslatorSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TranslatorSourceImplTest.java
@@ -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;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/UpdateListenerHubImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/UpdateListenerHubImplTest.java
index b6cd0fc..fc75093 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/UpdateListenerHubImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/UpdateListenerHubImplTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ValidationMessagesSourceImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ValidationMessagesSourceImplTest.java
index c6c142a..8be37f5 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ValidationMessagesSourceImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ValidationMessagesSourceImplTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/VisibilityBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/VisibilityBean.java
index 8618053..26aa39e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/VisibilityBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/VisibilityBean.java
@@ -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.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/WriteOnlyBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/WriteOnlyBean.java
index ab300e2..cf22006 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/WriteOnlyBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/WriteOnlyBean.java
@@ -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
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/BlockImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/BlockImplTest.java
index 8cfd774..1bba008 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/BlockImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/BlockImplTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
index 7e9b94e..58d64ec 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java
@@ -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;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ExpansionPageElementImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ExpansionPageElementImplTest.java
index 705d2e1..952c889 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ExpansionPageElementImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ExpansionPageElementImplTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImplTest.java
index 4d6940f..eb089cd 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/InternalComponentResourcesImplTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/PageImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/PageImplTest.java
index 608fbc0..b7345b2 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/PageImplTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/PageImplTest.java
@@ -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;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/CodeEqTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/CodeEqTest.java
index 8f472c9..e9f73d5 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/CodeEqTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/CodeEqTest.java
@@ -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 }, };
}
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
index b54be93..f52631c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java
@@ -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);
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/PageTesterContextTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/PageTesterContextTest.java
index 9c03451..ec73e39 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/PageTesterContextTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/PageTesterContextTest.java
@@ -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;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/PageTesterSessionTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/PageTesterSessionTest.java
index b4241ed..e649d42 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/PageTesterSessionTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/PageTesterSessionTest.java
@@ -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;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ApplicationStateWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ApplicationStateWorkerTest.java
index cce1d45..5ec2fe5 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ApplicationStateWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ApplicationStateWorkerTest.java
@@ -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;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/CachedWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/CachedWorkerTest.java
index 7d35ad6..d1cbae8 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/CachedWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/CachedWorkerTest.java
@@ -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;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ComponentLifecycleMethodWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ComponentLifecycleMethodWorkerTest.java
index 2e8bc91..db943ac 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ComponentLifecycleMethodWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ComponentLifecycleMethodWorkerTest.java
@@ -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;
/**
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ContentTypeWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ContentTypeWorkerTest.java
index d7551da..750a778 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ContentTypeWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ContentTypeWorkerTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/FieldRemoval.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/FieldRemoval.java
index b37c093..8a2826e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/FieldRemoval.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/FieldRemoval.java
@@ -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
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InheritedAnnotation.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InheritedAnnotation.java
index 3c7a845..57bb5ba 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InheritedAnnotation.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InheritedAnnotation.java
@@ -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;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InjectComponentWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InjectComponentWorkerTest.java
index 579d997..6a8fe03 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InjectComponentWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InjectComponentWorkerTest.java
@@ -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;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InjectWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InjectWorkerTest.java
index 1246fcb..bb35cd3 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InjectWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InjectWorkerTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InvokePostRenderCleanupOnResourcesWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InvokePostRenderCleanupOnResourcesWorkerTest.java
index 8fae399..09c755b 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InvokePostRenderCleanupOnResourcesWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/InvokePostRenderCleanupOnResourcesWorkerTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MetaWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MetaWorkerTest.java
index 67e9679..779560e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MetaWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MetaWorkerTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MixinAfterWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MixinAfterWorkerTest.java
index 3e8aae7..6d86139 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MixinAfterWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MixinAfterWorkerTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MixinWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MixinWorkerTest.java
index 70e6041..7eceb87 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MixinWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/MixinWorkerTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ParameterWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ParameterWorkerTest.java
index 0f7bd35..c35c514 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ParameterWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ParameterWorkerTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ResponseEncodingWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ResponseEncodingWorkerTest.java
index df09534..50899fc 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ResponseEncodingWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/ResponseEncodingWorkerTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/RetainWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/RetainWorkerTest.java
index c578aee..46a5ea4 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/RetainWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/RetainWorkerTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/SupportsInformalParametersWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/SupportsInformalParametersWorkerTest.java
index 101f627..adc74d0 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/SupportsInformalParametersWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/SupportsInformalParametersWorkerTest.java
@@ -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
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/TestPackageAwareLoader.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/TestPackageAwareLoader.java
index 420b362..29526cc 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/TestPackageAwareLoader.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/TestPackageAwareLoader.java
@@ -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.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/UnclaimedFieldWorkerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/UnclaimedFieldWorkerTest.java
index f323412..fedf59e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/UnclaimedFieldWorkerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/UnclaimedFieldWorkerTest.java
@@ -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;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/components/DefaultParameterBindingMethodComponent.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/components/DefaultParameterBindingMethodComponent.java
index 8b1d79b..ddd3f81 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/components/DefaultParameterBindingMethodComponent.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/components/DefaultParameterBindingMethodComponent.java
@@ -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
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/components/DefaultParameterComponent.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/components/DefaultParameterComponent.java
index e4c2380..af6ae57 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/components/DefaultParameterComponent.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/components/DefaultParameterComponent.java
@@ -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
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/components/ParameterComponent.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/components/ParameterComponent.java
index fab9686..b31591e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/components/ParameterComponent.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/components/ParameterComponent.java
@@ -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
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/AbstractFoo.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/AbstractFoo.java
index 04f2e9c..25faca0 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/AbstractFoo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/AbstractFoo.java
@@ -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;
/**
*
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BarImpl.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BarImpl.java
index 8e0b925..d4fc20c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BarImpl.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BarImpl.java
@@ -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;
/**
*
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BasicComponent.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BasicComponent.java
index 38e5995..111d7a4 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BasicComponent.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BasicComponent.java
@@ -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.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BasicSubComponent.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BasicSubComponent.java
index ca24227..35956d7 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BasicSubComponent.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/BasicSubComponent.java
@@ -12,7 +12,7 @@
// 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;
/** */
public class BasicSubComponent extends BasicComponent
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ChildClassInheritsAnnotation.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ChildClassInheritsAnnotation.java
index 0b830a8..1088438 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ChildClassInheritsAnnotation.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ChildClassInheritsAnnotation.java
@@ -12,7 +12,7 @@
// 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;
/**
* Used to check that Javassist does make child classes inherit class annotations.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ClaimedFields.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ClaimedFields.java
index eb33d50..9e5889d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ClaimedFields.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ClaimedFields.java
@@ -12,7 +12,7 @@
// 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;
public class ClaimedFields
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/EventHandlerTarget.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/EventHandlerTarget.java
index eedc3cb..7eb6224 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/EventHandlerTarget.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/EventHandlerTarget.java
@@ -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.OnEvent;
+import org.apache.tapestry5.annotations.OnEvent;
public class EventHandlerTarget
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/FieldAccessBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/FieldAccessBean.java
index 2e6bc33..df30e63 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/FieldAccessBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/FieldAccessBean.java
@@ -12,7 +12,7 @@
// 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;
public class FieldAccessBean
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/FooImpl.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/FooImpl.java
index 0162270..aee400c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/FooImpl.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/FooImpl.java
@@ -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;
/**
*
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/MaybeStateHolder.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/MaybeStateHolder.java
index 1bf2059..7b4a72c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/MaybeStateHolder.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/MaybeStateHolder.java
@@ -12,10 +12,10 @@
// 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.ApplicationState;
-import org.apache.tapestry.internal.services.SimpleASO;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.internal.services.SimpleASO;
public class MaybeStateHolder
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/MethodIdentifier.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/MethodIdentifier.java
index ba59d13..9ce7597 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/MethodIdentifier.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/MethodIdentifier.java
@@ -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.OnEvent;
+import org.apache.tapestry5.annotations.OnEvent;
public class MethodIdentifier
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/MethodPrefixTarget.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/MethodPrefixTarget.java
index 8eb03c5..af06785 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/MethodPrefixTarget.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/MethodPrefixTarget.java
@@ -12,7 +12,7 @@
// 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;
public class MethodPrefixTarget
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ParentClass.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ParentClass.java
index 096b00b..c260704 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ParentClass.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ParentClass.java
@@ -12,14 +12,14 @@
// 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.Meta;
-import org.apache.tapestry.annotation.Retain;
-import org.apache.tapestry.internal.transform.InheritedAnnotation;
+import org.apache.tapestry5.annotations.Meta;
+import org.apache.tapestry5.annotations.Retain;
+import org.apache.tapestry5.internal.transform.InheritedAnnotation;
/**
- * Test class used with {@link org.apache.tapestry.internal.services.InternalClassTransformationImplTest}
+ * Test class used with {@link org.apache.tapestry5.internal.services.InternalClassTransformationImplTest}
*/
@Meta("foo=bar")
@InheritedAnnotation
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ReadOnlyBean.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ReadOnlyBean.java
index 9e8480c..e80399c 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ReadOnlyBean.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/ReadOnlyBean.java
@@ -12,7 +12,7 @@
// 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;
public class ReadOnlyBean
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/StateHolder.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/StateHolder.java
index 3cc75fc..463f849 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/StateHolder.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/StateHolder.java
@@ -12,10 +12,10 @@
// 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.ApplicationState;
-import org.apache.tapestry.internal.services.SimpleASO;
+import org.apache.tapestry5.annotations.ApplicationState;
+import org.apache.tapestry5.internal.services.SimpleASO;
public class StateHolder
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/TargetObject.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/TargetObject.java
index c1857b1..344f931 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/TargetObject.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/TargetObject.java
@@ -12,7 +12,7 @@
// 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;
/**
* An empty object to which fields, methods and interfaces are added.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/TargetObjectSubclass.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/TargetObjectSubclass.java
index 49a3c09..993c553 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/TargetObjectSubclass.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/transform/pages/TargetObjectSubclass.java
@@ -12,7 +12,7 @@
// 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;
/**
* A subclass for TargetObject, used to check that values can be inherited from a base class.
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/Base64Tests.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/Base64Tests.java
index 78289a5..dc8c4fd 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/Base64Tests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/Base64Tests.java
@@ -1,20 +1,20 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.internal.util;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+package org.apache.tapestry5.internal.util;
+
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -84,7 +84,7 @@
@Test
public void checks_for_eof() throws Exception
{
- String[] values = {"fred", "barney", "wilma"};
+ String[] values = { "fred", "barney", "wilma" };
Base64ObjectOutputStream os = new Base64ObjectOutputStream();
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/IntegerRangeTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/IntegerRangeTest.java
index 7f101ee..a36e788 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/IntegerRangeTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/IntegerRangeTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/MethodInvocationBuilderTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/MethodInvocationBuilderTest.java
index d5713ef..50f8041 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/MethodInvocationBuilderTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/MethodInvocationBuilderTest.java
@@ -1,23 +1,23 @@
-// Copyright 2006, 2007 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.internal.util;
+// Copyright 2006, 2007 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
-import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.TransformMethodSignature;
-import org.apache.tapestry.test.TapestryTestCase;
+package org.apache.tapestry5.internal.util;
+
+import org.apache.tapestry5.MarkupWriter;
+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;
@@ -36,7 +36,7 @@
replay();
TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "myMethod",
- new String[]{MARKUP_WRITER_CLASS_NAME}, null);
+ new String[] { MARKUP_WRITER_CLASS_NAME }, null);
MethodInvocationBuilder invoker = new MethodInvocationBuilder();
@@ -55,7 +55,7 @@
replay();
TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "myMethod",
- new String[]{MARKUP_WRITER_CLASS_NAME}, null);
+ new String[] { MARKUP_WRITER_CLASS_NAME }, null);
MethodInvocationBuilder invoker = new MethodInvocationBuilder();
@@ -71,8 +71,8 @@
replay();
- TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "myMethod", new String[]{
- MARKUP_WRITER_CLASS_NAME, LOCALE_CLASS_NAME}, null);
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "myMethod", new String[] {
+ MARKUP_WRITER_CLASS_NAME, LOCALE_CLASS_NAME }, null);
MethodInvocationBuilder invoker = new MethodInvocationBuilder();
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/MultiKeyTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/MultiKeyTest.java
index 881b59c..d1d9322 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/MultiKeyTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/MultiKeyTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/NotificationEventCallbackTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/NotificationEventCallbackTest.java
index 3523a47..47b4c4e 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/NotificationEventCallbackTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/NotificationEventCallbackTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.runtime.Component;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.runtime.Component;
import org.testng.annotations.Test;
public class NotificationEventCallbackTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/URLChangeTrackerTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/URLChangeTrackerTest.java
index c55a813..0e65b58 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/URLChangeTrackerTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/util/URLChangeTrackerTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry5.internal.util;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
import java.io.File;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/services/AliasContributionTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/services/AliasContributionTest.java
index cb894e9..87e17ef 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/services/AliasContributionTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/services/AliasContributionTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
public class AliasContributionTest extends TapestryTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/services/SyncCostBench.java b/tapestry-core/src/test/java/org/apache/tapestry5/services/SyncCostBench.java
index ee17d9b..abc58b1 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/services/SyncCostBench.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/services/SyncCostBench.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
+import org.apache.tapestry5.ioc.internal.util.ConcurrentBarrier;
import static java.lang.String.format;
import static java.lang.System.out;
@@ -27,7 +27,7 @@
* common) than about write locks (very rare). Another concern is that hotspot is going to mess up our synchronization
* when it see we're not really doing anything multi-threaded.
* <p/>
- * The results show that using the {@link org.apache.tapestry.internal.annotations.Concurrent} aspect (which used a
+ * The results show that using the {@link org.apache.tapestry5.internal.annotations.Concurrent} aspect (which used a
* {@link java.util.concurrent.locks.ReentrantReadWriteLock} under the covers) is about 4x as expensive as just using
* the synchronized keyword. There are some anomolous results ... for example, ReadWriteLockRunner is consistently
* slower than ReadWriteLockAspectRunner (one would expect it to be the other way around ... must be something about how
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/services/TransformMethodSignatureTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/services/TransformMethodSignatureTest.java
index d5e8eca..a23cfae 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/services/TransformMethodSignatureTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/services/TransformMethodSignatureTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -31,8 +31,8 @@
{
TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "int", "doSomething",
new String[]
- {"java.lang.String", "int"}, new String[]
- {"java.lang.RuntimeException", "org.foo.FredException"});
+ { "java.lang.String", "int" }, new String[]
+ { "java.lang.RuntimeException", "org.foo.FredException" });
assertEquals(
sig.toString(),
@@ -49,8 +49,8 @@
{
TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "int", "doSomething",
new String[]
- {"java.lang.String", "int"}, new String[]
- {"java.lang.RuntimeException", "org.foo.FredException"});
+ { "java.lang.String", "int" }, new String[]
+ { "java.lang.RuntimeException", "org.foo.FredException" });
assertEquals(sig.getMediumDescription(), "doSomething(java.lang.String, int)");
}
@@ -79,16 +79,16 @@
{
TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "int", "doSomething",
new String[]
- {"java.lang.String", "int"}, new String[]
- {"java.lang.RuntimeException", "org.foo.FredException"});
+ { "java.lang.String", "int" }, new String[]
+ { "java.lang.RuntimeException", "org.foo.FredException" });
assertEquals(sig.getModifiers(), Modifier.PUBLIC);
assertEquals(sig.getReturnType(), "int");
assertEquals(sig.getMethodName(), "doSomething");
assertEquals(sig.getParameterTypes(), new String[]
- {"java.lang.String", "int"});
+ { "java.lang.String", "int" });
assertEquals(sig.getExceptionTypes(), new String[]
- {"java.lang.RuntimeException", "org.foo.FredException"});
+ { "java.lang.RuntimeException", "org.foo.FredException" });
}
@Test
@@ -98,7 +98,7 @@
TransformMethodSignature bar = new TransformMethodSignature(Modifier.PUBLIC, "void", "bar", null, null);
TransformMethodSignature baz0 = new TransformMethodSignature(Modifier.PUBLIC, "void", "baz", null, null);
TransformMethodSignature baz1 = new TransformMethodSignature(Modifier.PUBLIC, "void", "baz", new String[]
- {"int"}, null);
+ { "int" }, null);
List<TransformMethodSignature> list = CollectionFactory.newList(Arrays.asList(foo, bar, baz0, baz1));
@@ -112,8 +112,8 @@
{
TransformMethodSignature sig1 = new TransformMethodSignature(Modifier.PUBLIC, "int", "doSomething",
new String[]
- {"int"}, new String[]
- {"org.foo.BarException"});
+ { "int" }, new String[]
+ { "org.foo.BarException" });
int hashCode1 = sig1.hashCode();
// Check that same value returned each time.
@@ -122,8 +122,8 @@
TransformMethodSignature sig2 = new TransformMethodSignature(Modifier.PUBLIC, "int", "doSomething",
new String[]
- {"int"}, new String[]
- {"org.foo.BarException"});
+ { "int" }, new String[]
+ { "org.foo.BarException" });
assertEquals(sig2.hashCode(), hashCode1);
assertEquals(sig2, sig1);
@@ -131,35 +131,35 @@
// Now work through the different properties, changing each one.
sig2 = new TransformMethodSignature(Modifier.PRIVATE, "int", "doSomething", new String[]
- {"int"}, new String[]
- {"org.foo.BarException"});
+ { "int" }, new String[]
+ { "org.foo.BarException" });
assertFalse(sig2.hashCode() == hashCode1);
assertFalse(sig2.equals(sig1));
sig2 = new TransformMethodSignature(Modifier.PUBLIC, "long", "doSomething", new String[]
- {"int"}, new String[]
- {"org.foo.BarException"});
+ { "int" }, new String[]
+ { "org.foo.BarException" });
assertFalse(sig2.hashCode() == hashCode1);
assertFalse(sig2.equals(sig1));
sig2 = new TransformMethodSignature(Modifier.PUBLIC, "int", "doSomethingElse", new String[]
- {"int"}, new String[]
- {"org.foo.BarException"});
+ { "int" }, new String[]
+ { "org.foo.BarException" });
assertFalse(sig2.hashCode() == hashCode1);
assertFalse(sig2.equals(sig1));
sig2 = new TransformMethodSignature(Modifier.PUBLIC, "int", "doSomething", new String[]
- {"long"}, new String[]
- {"org.foo.BarException"});
+ { "long" }, new String[]
+ { "org.foo.BarException" });
assertFalse(sig2.hashCode() == hashCode1);
assertFalse(sig2.equals(sig1));
sig2 = new TransformMethodSignature(Modifier.PUBLIC, "int", "doSomething", new String[]
- {"int"}, new String[0]);
+ { "int" }, new String[0]);
assertFalse(sig2.hashCode() == hashCode1);
assertFalse(sig2.equals(sig1));
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/services/TransformUtilsTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/services/TransformUtilsTest.java
index fab6efb..8b5a169 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/services/TransformUtilsTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/services/TransformUtilsTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.services;
+package org.apache.tapestry5.services;
-import static org.apache.tapestry.services.TransformUtils.*;
+import static org.apache.tapestry5.services.TransformUtils.*;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/util/DefaultPrimaryKeyEncoderTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/util/DefaultPrimaryKeyEncoderTest.java
index 8be5a81..4858210 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/util/DefaultPrimaryKeyEncoderTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/util/DefaultPrimaryKeyEncoderTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
import org.testng.annotations.Test;
import java.util.Arrays;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/util/EnumSelectModelTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/util/EnumSelectModelTest.java
index ac5df14..729f220 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/util/EnumSelectModelTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/util/EnumSelectModelTest.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
-import org.apache.tapestry.OptionModel;
-import org.apache.tapestry.SelectModel;
-import org.apache.tapestry.Stooge;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.OptionModel;
+import org.apache.tapestry5.SelectModel;
+import org.apache.tapestry5.Stooge;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
import java.util.List;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/util/FindTheParameterizedType.java b/tapestry-core/src/test/java/org/apache/tapestry5/util/FindTheParameterizedType.java
index 442c2ca..fe9d300 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/util/FindTheParameterizedType.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/util/FindTheParameterizedType.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
-import org.apache.tapestry.ioc.internal.util.Orderer;
+import org.apache.tapestry5.ioc.internal.util.Orderer;
import static java.lang.System.out;
import java.lang.reflect.Method;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/util/IdentifyTransformer.java b/tapestry-core/src/test/java/org/apache/tapestry5/util/IdentifyTransformer.java
index 768fc4f..79f8241 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/util/IdentifyTransformer.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/util/IdentifyTransformer.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
public class IdentifyTransformer<T> implements Transformer<T>
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/util/StringToEnumCoercionTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/util/StringToEnumCoercionTest.java
index a974d4b..1ea5f31 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/util/StringToEnumCoercionTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/util/StringToEnumCoercionTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
import junit.framework.AssertionFailedError;
-import org.apache.tapestry.Stooge;
+import org.apache.tapestry5.Stooge;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -52,7 +52,7 @@
{
assertEquals(
ex.getMessage(),
- "Input \'shemp\' does not identify a value from enumerated type org.apache.tapestry.Stooge. Available values: CURLY_JOE, LARRY, MOE.");
+ "Input \'shemp\' does not identify a value from enumerated type org.apache.tapestry5.Stooge. Available values: CURLY_JOE, LARRY, MOE.");
}
}
}
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/util/Transformer.java b/tapestry-core/src/test/java/org/apache/tapestry5/util/Transformer.java
index 5290b2b..5dee893 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/util/Transformer.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/util/Transformer.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
public interface Transformer<T>
{
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/util/UppercaseTransformer.java b/tapestry-core/src/test/java/org/apache/tapestry5/util/UppercaseTransformer.java
index af0068f..1e7c15d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/util/UppercaseTransformer.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/util/UppercaseTransformer.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.util;
+package org.apache.tapestry5.util;
public class UppercaseTransformer implements Transformer<String>
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/validator/MaxLengthTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/validator/MaxLengthTest.java
index e69c704..0d1daac 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/validator/MaxLengthTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/validator/MaxLengthTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.validator;
+package org.apache.tapestry5.validator;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.MessageFormatter;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.MessageFormatter;
import org.testng.annotations.Test;
public class MaxLengthTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/validator/MaxTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/validator/MaxTest.java
index 599b01d..a6ff254 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/validator/MaxTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/validator/MaxTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.validator;
+package org.apache.tapestry5.validator;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.MessageFormatter;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.MessageFormatter;
import org.testng.annotations.Test;
public class MaxTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/validator/MinLengthTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/validator/MinLengthTest.java
index 80a2e9d..9996d14 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/validator/MinLengthTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/validator/MinLengthTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.validator;
+package org.apache.tapestry5.validator;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.MessageFormatter;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.MessageFormatter;
import org.testng.annotations.Test;
public class MinLengthTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/validator/MinTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/validator/MinTest.java
index 35dfd78..b36675d 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/validator/MinTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/validator/MinTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.validator;
+package org.apache.tapestry5.validator;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.MessageFormatter;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.MessageFormatter;
import org.testng.annotations.Test;
public class MinTest extends InternalBaseTestCase
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/validator/RegexpTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/validator/RegexpTest.java
index 47a028c..58ceb57 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/validator/RegexpTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/validator/RegexpTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.validator;
+package org.apache.tapestry5.validator;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.MessageFormatter;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.internal.test.InternalBaseTestCase;
+import org.apache.tapestry5.ioc.MessageFormatter;
import org.testng.annotations.Test;
import java.util.regex.Pattern;
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/validator/RequiredTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/validator/RequiredTest.java
index 4876e03..1cbbcc1 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/validator/RequiredTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/validator/RequiredTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.validator;
+package org.apache.tapestry5.validator;
-import org.apache.tapestry.Field;
-import org.apache.tapestry.ValidationException;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.Field;
+import org.apache.tapestry5.ValidationException;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
public class RequiredTest extends TapestryTestCase
diff --git a/tapestry-core/src/test/resources/log4j.properties b/tapestry-core/src/test/resources/log4j.properties
index 57e6ee4..812562d 100644
--- a/tapestry-core/src/test/resources/log4j.properties
+++ b/tapestry-core/src/test/resources/log4j.properties
@@ -21,7 +21,7 @@
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern= %d{HH:mm:ss,SSS} [%p] %c{1} %m%n
-log4j.category.org.apache.tapestry.integration.app1=debug
+log4j.category.org.apache.tapestry5.integration.app1=debug
diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/AttributeExpansionsDemo.properties b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/AttributeExpansionsDemo.properties
index 246e490..aa1bb5c 100644
--- a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/AttributeExpansionsDemo.properties
+++ b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/AttributeExpansionsDemo.properties
@@ -13,4 +13,4 @@
# limitations under the License.
cssClassPrefix=goober-
-alert=expansions work inside formal component parameters as well
\ No newline at end of file
+alert=expansions work inside formal component parameters as well
diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/BeanEditorDemo.properties b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/BeanEditorDemo.properties
index bd19280..a86def5 100644
--- a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/BeanEditorDemo.properties
+++ b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/BeanEditorDemo.properties
@@ -14,4 +14,4 @@
birthYear-label=Year of Birth
lastName-required-message=Everyone has to have a last name!
-citizen-label=U.S. Citizen
\ No newline at end of file
+citizen-label=U.S. Citizen
diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/RegexpDemo.properties b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/RegexpDemo.properties
index 73b402e..c0acbee 100644
--- a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/RegexpDemo.properties
+++ b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/RegexpDemo.properties
@@ -13,4 +13,4 @@
# limitations under the License.
zipcode-regexp=\\d{5}(\-\\d{4})?
-zipcode-regexp-message=A zip code consists of five or nine digits, eg: 02134 or 90125-4472.
\ No newline at end of file
+zipcode-regexp-message=A zip code consists of five or nine digits, eg: 02134 or 90125-4472.
diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/SimpleForm.properties b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/SimpleForm.properties
index c70148a..04d7a53 100644
--- a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/SimpleForm.properties
+++ b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/SimpleForm.properties
@@ -28,4 +28,4 @@
# Correct some of the labels for the drop down list
SALES_AND_MARKETING=Sales/Marketing
RESEARCH_AND_DESIGN=R&D
-IT=IT
\ No newline at end of file
+IT=IT
diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/ValidForm.properties b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/ValidForm.properties
index 8f2fcc1..f3bb9af 100644
--- a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/ValidForm.properties
+++ b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/pages/ValidForm.properties
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-message-required-message=Please provide a detailed description of the incident.
\ No newline at end of file
+message-required-message=Please provide a detailed description of the incident.
diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/internal/ValidationTestMessages.properties b/tapestry-core/src/test/resources/org/apache/tapestry5/internal/ValidationTestMessages.properties
index 9fe1731..e0dbd0b 100644
--- a/tapestry-core/src/test/resources/org/apache/tapestry5/internal/ValidationTestMessages.properties
+++ b/tapestry-core/src/test/resources/org/apache/tapestry5/internal/ValidationTestMessages.properties
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-contributed=This message was contributed inside ValidationTestMessages.
\ No newline at end of file
+contributed=This message was contributed inside ValidationTestMessages.
diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/internal/ValidationTestMessages_fr.properties b/tapestry-core/src/test/resources/org/apache/tapestry5/internal/ValidationTestMessages_fr.properties
index 24700af..31273f2 100644
--- a/tapestry-core/src/test/resources/org/apache/tapestry5/internal/ValidationTestMessages_fr.properties
+++ b/tapestry-core/src/test/resources/org/apache/tapestry5/internal/ValidationTestMessages_fr.properties
@@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-contributed=Zees eez Cohntributahd.
\ No newline at end of file
+contributed=Zees eez Cohntributahd.
diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/AppCatalog.properties b/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/AppCatalog.properties
index 8940969..1b582c3 100644
--- a/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/AppCatalog.properties
+++ b/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/AppCatalog.properties
@@ -13,4 +13,4 @@
# limitations under the License.
app-catalog-source=AppCatalog
-app-catalog-overridden=Value from AppCatalog
\ No newline at end of file
+app-catalog-overridden=Value from AppCatalog
diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/SimpleComponent.properties b/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/SimpleComponent.properties
index 4cd540c..bb37b28 100644
--- a/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/SimpleComponent.properties
+++ b/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/SimpleComponent.properties
@@ -15,4 +15,4 @@
color=color
framework=Tapestry
source=SimpleComponent
-app-catalog-overridden=Overridden by Component
\ No newline at end of file
+app-catalog-overridden=Overridden by Component
diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/SubclassComponent.properties b/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/SubclassComponent.properties
index 254ff7c..9babdaf 100644
--- a/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/SubclassComponent.properties
+++ b/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/SubclassComponent.properties
@@ -13,4 +13,4 @@
# limitations under the License.
metal=steel
-source=SubclassComponent
\ No newline at end of file
+source=SubclassComponent
diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/system_doctype.xml b/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/system_doctype.xml
index 134123f..e091530 100644
--- a/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/system_doctype.xml
+++ b/tapestry-core/src/test/resources/org/apache/tapestry5/internal/services/system_doctype.xml
@@ -13,5 +13,5 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE foo SYSTEM "src/test/resources/org/apache/tapestry/internal/services/simple.dtd" >
+<!DOCTYPE foo SYSTEM "src/test/resources/org/apache/tapestry5/internal/services/simple.dtd" >
<foo>bar</foo>
diff --git a/tapestry-hibernate/pom.xml b/tapestry-hibernate/pom.xml
index 67f197c..3a3e74e 100644
--- a/tapestry-hibernate/pom.xml
+++ b/tapestry-hibernate/pom.xml
@@ -134,7 +134,7 @@
<archive>
<manifestEntries>
<Tapestry-Module-Classes>
- org.apache.tapestry.hibernate.HibernateModule
+ org.apache.tapestry5.hibernate.HibernateModule
</Tapestry-Module-Classes>
</manifestEntries>
</archive>
@@ -169,7 +169,7 @@
<artifactId>tapestry-component-report</artifactId>
<version>5.0.2</version>
<configuration>
- <rootPackage>org.apache.tapestry.corelib</rootPackage>
+ <rootPackage>org.apache.tapestry5.corelib</rootPackage>
</configuration>
</plugin>-->
</plugins>
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateConfigurer.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateConfigurer.java
index 183f62f..34bb517 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateConfigurer.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateConfigurer.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.hibernate;
+package org.apache.tapestry5.hibernate;
import org.hibernate.cfg.Configuration;
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateEntityPackageManager.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateEntityPackageManager.java
index 2af224b..b83263e 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateEntityPackageManager.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateEntityPackageManager.java
@@ -12,13 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.hibernate;
+package org.apache.tapestry5.hibernate;
import java.util.Collection;
-/** Contains a set of contributed package names from which to load entities.
+/**
+ * Contains a set of contributed package names from which to load entities.
*/
-public interface HibernateEntityPackageManager {
- /** Returns packages from which read entity classes */
- Collection<String> getPackageNames();
+public interface HibernateEntityPackageManager
+{
+ /**
+ * Returns packages from which read entity classes
+ */
+ Collection<String> getPackageNames();
}
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java
index d98e92a..5f420d3 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateModule.java
@@ -12,22 +12,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.hibernate;
+package org.apache.tapestry5.hibernate;
-import org.apache.tapestry.ValueEncoder;
-import org.apache.tapestry.internal.InternalConstants;
-import org.apache.tapestry.internal.hibernate.*;
-import org.apache.tapestry.ioc.*;
-import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.annotation.InjectService;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.ioc.services.*;
-import org.apache.tapestry.services.AliasContribution;
-import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.PersistentFieldStrategy;
-import org.apache.tapestry.services.ValueEncoderFactory;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.internal.InternalConstants;
+import org.apache.tapestry5.internal.hibernate.*;
+import org.apache.tapestry5.ioc.*;
+import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.InjectService;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.ioc.services.*;
+import org.apache.tapestry5.services.AliasContribution;
+import org.apache.tapestry5.services.ComponentClassTransformWorker;
+import org.apache.tapestry5.services.PersistentFieldStrategy;
+import org.apache.tapestry5.services.ValueEncoderFactory;
import org.hibernate.Session;
import org.hibernate.mapping.PersistentClass;
import org.slf4j.Logger;
@@ -178,7 +178,7 @@
}
/**
- * Adds the CommitAfter annotation work, to process the {@link org.apache.tapestry.hibernate.annotations.CommitAfter}
+ * Adds the CommitAfter annotation work, to process the {@link org.apache.tapestry5.hibernate.annotations.CommitAfter}
* annotation.
*/
public static void contributeComponentClassTransformWorker(
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionManager.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionManager.java
index 190bd69..f0b5384 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionManager.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionManager.java
@@ -12,41 +12,41 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.hibernate;
+package org.apache.tapestry5.hibernate;
import org.hibernate.Session;
/**
- * Manages the Hibernate session for the current thread. This includes creating the session as
- * needed, allowing the session to checkpoint (commit the current transaction and continue) and
- * commit the transaction automatically at the end of the request.
- * <p>
- * Remember that in Tapestry, action requests and render requests are entirely separate, and you
- * will see a separate request and a separate transaction for each. Care should be taken to ensure
- * that entity objects that are retained (in the session, as persistent field values) between
- * requests are handled correctly (they tend to become detached instances).
- * <p>
+ * Manages the Hibernate session for the current thread. This includes creating the session as needed, allowing the
+ * session to checkpoint (commit the current transaction and continue) and commit the transaction automatically at the
+ * end of the request.
+ * <p/>
+ * Remember that in Tapestry, action requests and render requests are entirely separate, and you will see a separate
+ * request and a separate transaction for each. Care should be taken to ensure that entity objects that are retained (in
+ * the session, as persistent field values) between requests are handled correctly (they tend to become detached
+ * instances).
+ * <p/>
* This implementation of this service is per-thread.
*/
public interface HibernateSessionManager
{
- /**
- * Gets the active session for this request, creating it as necessary. When the session is first
- * created, a transaction is started.
- *
- * @return the request's session
- * @see HibernateSessionSource
- */
- Session getSession();
+ /**
+ * Gets the active session for this request, creating it as necessary. When the session is first created, a
+ * transaction is started.
+ *
+ * @return the request's session
+ * @see HibernateSessionSource
+ */
+ Session getSession();
- /**
- * Commits the current transaction (which will cause a flush of data to the database), then starts
- * a new transaction to replace it.
- */
- void commit();
+ /**
+ * Commits the current transaction (which will cause a flush of data to the database), then starts a new transaction
+ * to replace it.
+ */
+ void commit();
- /**
- * Aborts the current transaction, and starts a new transaction to replace it.
- */
- void abort();
+ /**
+ * Aborts the current transaction, and starts a new transaction to replace it.
+ */
+ void abort();
}
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionSource.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionSource.java
index 0601128..5823961 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionSource.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateSessionSource.java
@@ -12,29 +12,30 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.hibernate;
+package org.apache.tapestry5.hibernate;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.Configuration;
/**
- * Responsible for creating a Hibernate session as needed. Internally, is responsible for Hibernate
- * {@link Configuration}, resulting in a {@link SessionFactory}.
+ * Responsible for creating a Hibernate session as needed. Internally, is responsible for Hibernate {@link
+ * Configuration}, resulting in a {@link SessionFactory}.
*/
public interface HibernateSessionSource
{
/**
- * Creates a new session using the {@link #getSessionFactory() SessionFactory} created at
- * service startup.
+ * Creates a new session using the {@link #getSessionFactory() SessionFactory} created at service startup.
*/
Session create();
- /** Returns the SessionFactory from which Hibernate sessions are created. */
+ /**
+ * Returns the SessionFactory from which Hibernate sessions are created.
+ */
SessionFactory getSessionFactory();
-
- /** Returns the final configuration used to create the {@link SessionFactory}.
- * The configuration is immutable.
+
+ /**
+ * Returns the final configuration used to create the {@link SessionFactory}. The configuration is immutable.
*/
Configuration getConfiguration();
}
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateTransactionDecorator.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateTransactionDecorator.java
index bbc6382..f85ba37 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateTransactionDecorator.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/HibernateTransactionDecorator.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.hibernate;
+package org.apache.tapestry5.hibernate;
/**
* Service that can create an interceptor that wraps around a service implementation. After invoking service methods
- * marked by {@link org.apache.tapestry.hibernate.annotations.CommitAfter} the current transaction is committed.
- * Declared exceptions will also {@linkplain org.apache.tapestry.hibernate.HibernateSessionManager#commit() commit the
- * transaction}; runtime exceptions will {@linkplain org.apache.tapestry.hibernate.HibernateSessionManager#abort() the
+ * marked by {@link org.apache.tapestry5.hibernate.annotations.CommitAfter} the current transaction is committed.
+ * Declared exceptions will also {@linkplain org.apache.tapestry5.hibernate.HibernateSessionManager#commit() commit the
+ * transaction}; runtime exceptions will {@linkplain org.apache.tapestry5.hibernate.HibernateSessionManager#abort() the
* transaction}.
*/
public interface HibernateTransactionDecorator
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/annotations/CommitAfter.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/annotations/CommitAfter.java
index 20cc32d..0377d35 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/annotations/CommitAfter.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/hibernate/annotations/CommitAfter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.hibernate.annotations;
+package org.apache.tapestry5.hibernate.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -22,10 +22,10 @@
/**
* Marks a method of a service (or a component method) as transactional: the active transaction should {@linkplain
- * org.apache.tapestry.hibernate.HibernateSessionManager#commit() commit} after invoking the method. Runtime exceptions
- * will abort the transaction, checked exceptions will <also commit> the transaction.
+ * org.apache.tapestry5.hibernate.HibernateSessionManager#commit() commit} after invoking the method. Runtime
+ * exceptions will abort the transaction, checked exceptions will <also commit> the transaction.
*
- * @see org.apache.tapestry.hibernate.HibernateTransactionDecorator
+ * @see org.apache.tapestry5.hibernate.HibernateTransactionDecorator
*/
@Target(METHOD)
@Retention(RUNTIME)
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/CommitAfterWorker.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/CommitAfterWorker.java
index 47c944c..5a5b0f5 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/CommitAfterWorker.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/CommitAfterWorker.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
-import org.apache.tapestry.hibernate.HibernateSessionManager;
-import org.apache.tapestry.hibernate.annotations.CommitAfter;
-import org.apache.tapestry.model.MutableComponentModel;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry5.hibernate.HibernateSessionManager;
+import org.apache.tapestry5.hibernate.annotations.CommitAfter;
+import org.apache.tapestry5.model.MutableComponentModel;
+import org.apache.tapestry5.services.*;
/**
- * Searches for methods that have the {@link org.apache.tapestry.hibernate.annotations.CommitAfter} annotation and adds
+ * Searches for methods that have the {@link org.apache.tapestry5.hibernate.annotations.CommitAfter} annotation and adds
* logic around the method to commit or abort the transaction. The commit/abort logic is the same as for the {@link
- * org.apache.tapestry.hibernate.HibernateTransactionDecorator} service.
+ * org.apache.tapestry5.hibernate.HibernateTransactionDecorator} service.
*/
public class CommitAfterWorker implements ComponentClassTransformWorker
{
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/DefaultHibernateConfigurer.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/DefaultHibernateConfigurer.java
index 9494dd2..1536769 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/DefaultHibernateConfigurer.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/DefaultHibernateConfigurer.java
@@ -12,16 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
-import org.apache.tapestry.hibernate.HibernateConfigurer;
+import org.apache.tapestry5.hibernate.HibernateConfigurer;
import org.hibernate.cfg.Configuration;
-/** Simply calls configure() to do the default Hibernate configuration.
+/**
+ * Simply calls configure() to do the default Hibernate configuration.
*/
-public final class DefaultHibernateConfigurer implements HibernateConfigurer {
+public final class DefaultHibernateConfigurer implements HibernateConfigurer
+{
- public void configure(Configuration configuration) {
- configuration.configure();
- }
+ public void configure(Configuration configuration)
+ {
+ configuration.configure();
+ }
}
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/EntityPersistentFieldStrategy.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/EntityPersistentFieldStrategy.java
index e813c9c..9e17d64 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/EntityPersistentFieldStrategy.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/EntityPersistentFieldStrategy.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
-import org.apache.tapestry.internal.services.AbstractSessionPersistentFieldStrategy;
-import org.apache.tapestry.internal.services.PersistentFieldChangeImpl;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.PersistentFieldStrategy;
-import org.apache.tapestry.services.Request;
+import org.apache.tapestry5.internal.services.AbstractSessionPersistentFieldStrategy;
+import org.apache.tapestry5.internal.services.PersistentFieldChangeImpl;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.services.PersistentFieldChange;
+import org.apache.tapestry5.services.PersistentFieldStrategy;
+import org.apache.tapestry5.services.Request;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.metadata.ClassMetadata;
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java
index fcd0bed..7be27b6 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoder.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
-import org.apache.tapestry.ValueEncoder;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
-import org.apache.tapestry.ioc.services.TypeCoercer;
+import org.apache.tapestry5.ValueEncoder;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.services.PropertyAdapter;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
import org.hibernate.Session;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateMessages.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateMessages.java
index 2897a6e..0dbf056 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateMessages.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateMessages.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
import java.util.Collection;
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionManagerImpl.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionManagerImpl.java
index 39ec2d1..887b6f3 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionManagerImpl.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionManagerImpl.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
-import org.apache.tapestry.hibernate.HibernateSessionManager;
-import org.apache.tapestry.hibernate.HibernateSessionSource;
-import org.apache.tapestry.ioc.services.ThreadCleanupListener;
+import org.apache.tapestry5.hibernate.HibernateSessionManager;
+import org.apache.tapestry5.hibernate.HibernateSessionSource;
+import org.apache.tapestry5.ioc.services.ThreadCleanupListener;
import org.hibernate.Session;
import org.hibernate.Transaction;
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java
index 8eb04ed..ae7e020 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImpl.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
-import org.apache.tapestry.hibernate.HibernateConfigurer;
-import org.apache.tapestry.hibernate.HibernateSessionSource;
-import org.apache.tapestry.ioc.services.RegistryShutdownListener;
+import org.apache.tapestry5.hibernate.HibernateConfigurer;
+import org.apache.tapestry5.hibernate.HibernateSessionSource;
+import org.apache.tapestry5.ioc.services.RegistryShutdownListener;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.hibernate.cfg.AnnotationConfiguration;
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImpl.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImpl.java
index f86d4f4..3ce38b9 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImpl.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImpl.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
-import org.apache.tapestry.hibernate.HibernateSessionManager;
-import org.apache.tapestry.hibernate.HibernateTransactionDecorator;
-import org.apache.tapestry.hibernate.annotations.CommitAfter;
-import org.apache.tapestry.ioc.Invocation;
-import org.apache.tapestry.ioc.MethodAdvice;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.services.AspectDecorator;
-import org.apache.tapestry.ioc.services.AspectInterceptorBuilder;
+import org.apache.tapestry5.hibernate.HibernateSessionManager;
+import org.apache.tapestry5.hibernate.HibernateTransactionDecorator;
+import org.apache.tapestry5.hibernate.annotations.CommitAfter;
+import org.apache.tapestry5.ioc.Invocation;
+import org.apache.tapestry5.ioc.MethodAdvice;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.services.AspectDecorator;
+import org.apache.tapestry5.ioc.services.AspectInterceptorBuilder;
import java.lang.reflect.Method;
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/ImmutableConfiguration.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/ImmutableConfiguration.java
index 0f9e9cd..0113c83 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/ImmutableConfiguration.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/ImmutableConfiguration.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
import org.dom4j.Document;
import org.hibernate.HibernateException;
@@ -494,5 +494,5 @@
public String toString()
{
return "ImmutableConfiguration[" + config + "]";
- }
+ }
}
diff --git a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java
index 80982f6..cffcdbf 100644
--- a/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java
+++ b/tapestry-hibernate/src/main/java/org/apache/tapestry5/internal/hibernate/PackageNameHibernateConfigurer.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
-import org.apache.tapestry.hibernate.HibernateConfigurer;
-import org.apache.tapestry.hibernate.HibernateEntityPackageManager;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.services.ClassNameLocator;
+import org.apache.tapestry5.hibernate.HibernateConfigurer;
+import org.apache.tapestry5.hibernate.HibernateEntityPackageManager;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.services.ClassNameLocator;
import org.hibernate.cfg.AnnotationConfiguration;
import org.hibernate.cfg.Configuration;
diff --git a/tapestry-hibernate/src/main/resources/org/apache/tapestry5/internal/hibernate/HibernateStrings.properties b/tapestry-hibernate/src/main/resources/org/apache/tapestry5/internal/hibernate/HibernateStrings.properties
index 27b489d..b08d235 100644
--- a/tapestry-hibernate/src/main/resources/org/apache/tapestry5/internal/hibernate/HibernateStrings.properties
+++ b/tapestry-hibernate/src/main/resources/org/apache/tapestry5/internal/hibernate/HibernateStrings.properties
@@ -17,4 +17,4 @@
configuration-immutable=The Hibernate configuration is now immutable since the SessionFactory has already been created.
bad-entity-id-type=Failed to load the entity id class while loading a persisted entity. entity: %s, id class: %s, id: %s
entity-not-attached=Failed persisting an entity in the session. Only entities attached to a Hibernate Session can be persisted. entity: %s
-commit-transaction-interceptor=<Hibernate Transaction interceptor for %s(%s)>
\ No newline at end of file
+commit-transaction-interceptor=<Hibernate Transaction interceptor for %s(%s)>
diff --git a/tapestry-hibernate/src/site/apt/userguide.apt b/tapestry-hibernate/src/site/apt/userguide.apt
index a9f4a59..f252fe5 100644
--- a/tapestry-hibernate/src/site/apt/userguide.apt
+++ b/tapestry-hibernate/src/site/apt/userguide.apt
@@ -94,7 +94,7 @@
onSuccess() has the @CommitAfter annotation.
Behind the scenes, the @CommitAfter annotation causes the
- {{{../apidocs/org/apache/tapestry/hibernate/HibernateSessionManager.html}HibernateSessionManager}}'s commit() method to be
+ {{{../apidocs/org/apache/tapestry5/hibernate/HibernateSessionManager.html}HibernateSessionManager}}'s commit() method to be
executed before the method returns.
The transaction will be committed when the method completes normally.
diff --git a/tapestry-hibernate/src/test/conf/testng.xml b/tapestry-hibernate/src/test/conf/testng.xml
index aa4db0f..ae459a0 100644
--- a/tapestry-hibernate/src/test/conf/testng.xml
+++ b/tapestry-hibernate/src/test/conf/testng.xml
@@ -16,15 +16,15 @@
-->
<suite name="Tapestry Hibernate" parallel="false" thread-count="10" annotations="1.5" verbose="2">
- <parameter name="tapestry.integration-webapp" value="src/test/webapp"/>
- <test name="Tapestry Hibernate Internal APIs">
- <packages>
- <package name="org.apache.tapestry.internal.hibernate"/>
- </packages>
- </test>
- <test name="Tapestry Hibernate Integration Tests">
- <packages>
- <package name="org.apache.tapestry.hibernate.integration"/>
- </packages>
- </test>
+ <parameter name="tapestry.integration-webapp" value="src/test/webapp"/>
+ <test name="Tapestry Hibernate Internal APIs">
+ <packages>
+ <package name="org.apache.tapestry5.internal.hibernate"/>
+ </packages>
+ </test>
+ <test name="Tapestry Hibernate Integration Tests">
+ <packages>
+ <package name="org.apache.tapestry5.hibernate.integration"/>
+ </packages>
+ </test>
</suite>
diff --git a/tapestry-hibernate/src/test/java/org/apache/tapestry5/hibernate/integration/TapestryHibernateIntegrationTests.java b/tapestry-hibernate/src/test/java/org/apache/tapestry5/hibernate/integration/TapestryHibernateIntegrationTests.java
index ce0c436..2f812ba 100644
--- a/tapestry-hibernate/src/test/java/org/apache/tapestry5/hibernate/integration/TapestryHibernateIntegrationTests.java
+++ b/tapestry-hibernate/src/test/java/org/apache/tapestry5/hibernate/integration/TapestryHibernateIntegrationTests.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.hibernate.integration;
+package org.apache.tapestry5.hibernate.integration;
-import org.apache.tapestry.test.AbstractIntegrationTestSuite;
+import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
import org.testng.annotations.Test;
@Test(sequential = true, groups = "integration")
diff --git a/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/DefaultHibernateConfigurerFilterTest.java b/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/DefaultHibernateConfigurerFilterTest.java
index 0b78cfd..9190e33 100644
--- a/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/DefaultHibernateConfigurerFilterTest.java
+++ b/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/DefaultHibernateConfigurerFilterTest.java
@@ -12,24 +12,23 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
import static org.easymock.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.verify;
-
+import static org.easymock.classextension.EasyMock.*;
import org.hibernate.cfg.Configuration;
import org.testng.annotations.Test;
@Test
-public class DefaultHibernateConfigurerFilterTest {
- public void testConfigure() throws Exception {
- Configuration config = createMock(Configuration.class);
- expect(config.configure()).andReturn(config);
-
- replay(config);
- new DefaultHibernateConfigurer().configure(config);
- verify(config);
- }
+public class DefaultHibernateConfigurerFilterTest
+{
+ public void testConfigure() throws Exception
+ {
+ Configuration config = createMock(Configuration.class);
+ expect(config.configure()).andReturn(config);
+
+ replay(config);
+ new DefaultHibernateConfigurer().configure(config);
+ verify(config);
+ }
}
diff --git a/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/EntityPersistentFieldStrategyTest.java b/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/EntityPersistentFieldStrategyTest.java
index 0b9d770..1ff6867 100644
--- a/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/EntityPersistentFieldStrategyTest.java
+++ b/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/EntityPersistentFieldStrategyTest.java
@@ -12,25 +12,31 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.testng.annotations.Test;
@Test
-public class EntityPersistentFieldStrategyTest extends TapestryTestCase {
- public void not_an_entity() {
- Session session = newMock(Session.class);
- EntityPersistentFieldStrategy strategy = new EntityPersistentFieldStrategy(session, null, null);
-
- expect(session.getEntityName("foo")).andThrow(new HibernateException("error"));
- replay();
- try {
- strategy.postChange(null, null, null, "foo");
- fail("did not throw");
- } catch (IllegalArgumentException e) { }
- verify();
- }
+public class EntityPersistentFieldStrategyTest extends TapestryTestCase
+{
+ public void not_an_entity()
+ {
+ Session session = newMock(Session.class);
+ EntityPersistentFieldStrategy strategy = new EntityPersistentFieldStrategy(session, null, null);
+
+ expect(session.getEntityName("foo")).andThrow(new HibernateException("error"));
+ replay();
+ try
+ {
+ strategy.postChange(null, null, null, "foo");
+ fail("did not throw");
+ }
+ catch (IllegalArgumentException e)
+ {
+ }
+ verify();
+ }
}
diff --git a/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoderTest.java b/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoderTest.java
index afdd246..8394157 100644
--- a/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoderTest.java
+++ b/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateEntityValueEncoderTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.hibernate.Session;
import org.hibernate.mapping.Property;
import org.hibernate.mapping.RootClass;
@@ -76,7 +76,7 @@
}
catch (IllegalStateException ex)
{
- assertMessageContains(ex, "Entity org.apache.tapestry.internal.hibernate.SampleEntity",
+ assertMessageContains(ex, "Entity org.apache.tapestry5.internal.hibernate.SampleEntity",
"has an id property of null");
}
diff --git a/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImplTest.java b/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImplTest.java
index 7353022..0b289cf 100644
--- a/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImplTest.java
+++ b/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateSessionSourceImplTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
-import org.apache.tapestry.hibernate.HibernateConfigurer;
-import org.apache.tapestry.hibernate.HibernateEntityPackageManager;
-import org.apache.tapestry.hibernate.HibernateSessionSource;
-import org.apache.tapestry.ioc.internal.services.ClassNameLocatorImpl;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.hibernate.HibernateConfigurer;
+import org.apache.tapestry5.hibernate.HibernateEntityPackageManager;
+import org.apache.tapestry5.hibernate.HibernateSessionSource;
+import org.apache.tapestry5.ioc.internal.services.ClassNameLocatorImpl;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.example.app0.entities.User;
import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
diff --git a/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImplTest.java b/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImplTest.java
index cf51699..fb38967 100644
--- a/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImplTest.java
+++ b/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/HibernateTransactionDecoratorImplTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
-import org.apache.tapestry.hibernate.HibernateSessionManager;
-import org.apache.tapestry.hibernate.HibernateTransactionDecorator;
-import org.apache.tapestry.hibernate.annotations.CommitAfter;
-import org.apache.tapestry.ioc.IOCUtilities;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.services.AspectDecorator;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.hibernate.HibernateSessionManager;
+import org.apache.tapestry5.hibernate.HibernateTransactionDecorator;
+import org.apache.tapestry5.hibernate.annotations.CommitAfter;
+import org.apache.tapestry5.ioc.IOCUtilities;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.services.AspectDecorator;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/SampleEntity.java b/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/SampleEntity.java
index 5c6ba74..b219279 100644
--- a/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/SampleEntity.java
+++ b/tapestry-hibernate/src/test/java/org/apache/tapestry5/internal/hibernate/SampleEntity.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.hibernate;
+package org.apache.tapestry5.internal.hibernate;
import javax.persistence.Entity;
import javax.persistence.Id;
/**
- * Fake entity used by {@link org.apache.tapestry.internal.hibernate.HibernateEntityValueEncoderTest}.
+ * Fake entity used by {@link org.apache.tapestry5.internal.hibernate.HibernateEntityValueEncoderTest}.
*/
@Entity
public class SampleEntity
diff --git a/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java b/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java
index a31ad79..756324b 100644
--- a/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java
+++ b/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java
@@ -14,10 +14,10 @@
package org.example.app0.pages;
-import org.apache.tapestry.annotation.Cached;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.hibernate.HibernateSessionManager;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.annotations.Cached;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.hibernate.HibernateSessionManager;
+import org.apache.tapestry5.ioc.annotations.Inject;
import org.example.app0.entities.User;
import org.hibernate.Session;
diff --git a/tapestry-hibernate/src/test/java/org/example/app0/pages/CommitAfterDemo.java b/tapestry-hibernate/src/test/java/org/example/app0/pages/CommitAfterDemo.java
index bf8ada5..6fcff30 100644
--- a/tapestry-hibernate/src/test/java/org/example/app0/pages/CommitAfterDemo.java
+++ b/tapestry-hibernate/src/test/java/org/example/app0/pages/CommitAfterDemo.java
@@ -1,6 +1,6 @@
package org.example.app0.pages;
-import org.apache.tapestry.hibernate.annotations.CommitAfter;
+import org.apache.tapestry5.hibernate.annotations.CommitAfter;
import org.example.app0.entities.User;
import java.sql.SQLException;
diff --git a/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java b/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java
index 6a95048..a9b01a8 100644
--- a/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java
+++ b/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java
@@ -14,9 +14,9 @@
package org.example.app0.pages;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.hibernate.annotations.CommitAfter;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.hibernate.annotations.CommitAfter;
+import org.apache.tapestry5.ioc.annotations.Inject;
import org.example.app0.entities.User;
import org.hibernate.Session;
diff --git a/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java b/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java
index c9c0e01..50cc55a 100644
--- a/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java
+++ b/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java
@@ -14,10 +14,10 @@
package org.example.app0.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.hibernate.HibernateSessionManager;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.hibernate.HibernateSessionManager;
+import org.apache.tapestry5.ioc.annotations.Inject;
import org.example.app0.entities.User;
import org.example.app0.services.UserDAO;
import org.hibernate.Session;
diff --git a/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java b/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
index 20ace43..4a7832c 100644
--- a/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
+++ b/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
@@ -14,8 +14,8 @@
package org.example.app0.pages;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.ioc.annotations.Inject;
import org.example.app0.entities.User;
import org.example.app0.services.UserDAO;
diff --git a/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java b/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java
index 31814d3..b8cdb28 100644
--- a/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java
+++ b/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java
@@ -14,13 +14,13 @@
package org.example.app0.services;
-import org.apache.tapestry.SymbolConstants;
-import org.apache.tapestry.hibernate.HibernateModule;
-import org.apache.tapestry.hibernate.HibernateTransactionDecorator;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.ServiceBinder;
-import org.apache.tapestry.ioc.annotation.Match;
-import org.apache.tapestry.ioc.annotation.SubModule;
+import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.hibernate.HibernateModule;
+import org.apache.tapestry5.hibernate.HibernateTransactionDecorator;
+import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.annotations.Match;
+import org.apache.tapestry5.ioc.annotations.SubModule;
@SubModule(HibernateModule.class)
public class AppModule
diff --git a/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAO.java b/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAO.java
index 73efac7..1dbf7a6 100644
--- a/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAO.java
+++ b/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAO.java
@@ -14,7 +14,7 @@
package org.example.app0.services;
-import org.apache.tapestry.hibernate.annotations.CommitAfter;
+import org.apache.tapestry5.hibernate.annotations.CommitAfter;
import org.example.app0.entities.User;
import java.util.List;
diff --git a/tapestry-hibernate/src/test/resources/log4j.properties b/tapestry-hibernate/src/test/resources/log4j.properties
index 3949f39..114898f 100644
--- a/tapestry-hibernate/src/test/resources/log4j.properties
+++ b/tapestry-hibernate/src/test/resources/log4j.properties
@@ -21,7 +21,7 @@
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=[%p] %c{1} %m%n
-log4j.category.org.apache.tapestry.TapestryFilter=info
+log4j.category.org.apache.tapestry5.TapestryFilter=info
log4j.category.org.apache.tapestry=error
log4j.category.tapestry=error
log4j.category.tapestry.ioc.ClassFactory=error
diff --git a/tapestry-hibernate/src/test/webapp/WEB-INF/web.xml b/tapestry-hibernate/src/test/webapp/WEB-INF/web.xml
index 4d57a56..376f6c5 100644
--- a/tapestry-hibernate/src/test/webapp/WEB-INF/web.xml
+++ b/tapestry-hibernate/src/test/webapp/WEB-INF/web.xml
@@ -26,7 +26,7 @@
</context-param>
<filter>
<filter-name>app</filter-name>
- <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+ <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>app</filter-name>
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/AnnotationProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/AnnotationProvider.java
index 7b70921..e08ffbe 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/AnnotationProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/AnnotationProvider.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
import java.lang.annotation.Annotation;
/**
- * A source of annotations. This interface is used to mask where the annotations come from (for
- * example, from a Method, a Class, or some other source).
+ * A source of annotations. This interface is used to mask where the annotations come from (for example, from a Method,
+ * a Class, or some other source).
*/
public interface AnnotationProvider
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/BaseLocatable.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/BaseLocatable.java
index 1b61c26..742dfd5 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/BaseLocatable.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/BaseLocatable.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
- * Base implementation of {@link org.apache.tapestry.ioc.Locatable}.
+ * Base implementation of {@link org.apache.tapestry5.ioc.Locatable}.
*/
public class BaseLocatable implements Locatable
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Configuration.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Configuration.java
index 14a8928..7c09715 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Configuration.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Configuration.java
@@ -1,35 +1,31 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc;
/**
- * Object passed into a service contributor method that allows the method provide contributed values
- * to the service's configuration.
+ * Object passed into a service contributor method that allows the method provide contributed values to the service's
+ * configuration.
* <p/>
- * A service can <em>collect</em> contributions in three different ways:
- * <ul>
- * <li>As an un-ordered collection of values</li>
- * <li>As an ordered list of values (where each value has a unique id, pre-requisited and
- * post-requisites)</li>
- * <li>As a map of keys and values
- * </ul>
+ * A service can <em>collect</em> contributions in three different ways: <ul> <li>As an un-ordered collection of
+ * values</li> <li>As an ordered list of values (where each value has a unique id, pre-requisited and
+ * post-requisites)</li> <li>As a map of keys and values </ul>
* <p/>
* This implementation is used for un-ordered configuration data.
* <p/>
- * The service defines the <em>type</em> of contribution, in terms of a base class or service
- * interface. Contributions must be compatible with the type.
+ * The service defines the <em>type</em> of contribution, in terms of a base class or service interface. Contributions
+ * must be compatible with the type.
*/
public interface Configuration<T>
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IOCConstants.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IOCConstants.java
index ffdd06a..51f0977 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IOCConstants.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IOCConstants.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public class IOCConstants
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IOCUtilities.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IOCUtilities.java
index 4c1244f..ec7b5d2 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IOCUtilities.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IOCUtilities.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import static org.apache.tapestry.ioc.IOCConstants.MODULE_BUILDER_MANIFEST_ENTRY_NAME;
-import org.apache.tapestry.ioc.annotation.SubModule;
+import static org.apache.tapestry5.ioc.IOCConstants.MODULE_BUILDER_MANIFEST_ENTRY_NAME;
+import org.apache.tapestry5.ioc.annotations.SubModule;
import java.io.Closeable;
import java.io.IOException;
@@ -26,7 +26,7 @@
/**
* A collection of utility methods for a couple of different areas, including creating the initial {@link
- * org.apache.tapestry.ioc.Registry}.
+ * org.apache.tapestry5.ioc.Registry}.
*/
public final class IOCUtilities
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IdMatcher.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IdMatcher.java
index b21d2db..6a96cce 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IdMatcher.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/IdMatcher.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
* A matcher of <em>fully qualified<em> ids.
@@ -26,4 +26,4 @@
* @return true on match, false otherwise
*/
boolean matches(String id);
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Invocation.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Invocation.java
index ff9437f..a72abd3 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Invocation.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Invocation.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
- * A method invocation passed to an {@link org.apache.tapestry.ioc.MethodAdvice}.
+ * A method invocation passed to an {@link org.apache.tapestry5.ioc.MethodAdvice}.
*/
public interface Invocation
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Locatable.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Locatable.java
index dfb70b7..af1064d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Locatable.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Locatable.java
@@ -1,22 +1,21 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc;
/**
- * Interface implemented by objects which carry a location tag. Defines a readable property,
- * location.
+ * Interface implemented by objects which carry a location tag. Defines a readable property, location.
*/
public interface Locatable
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Location.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Location.java
index 185f300..d771ca3 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Location.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Location.java
@@ -1,24 +1,23 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc;
/**
- * A kind of tag applied to other objects to identify where they came from, in terms of a file (the
- * resource), a line number, and a column number. This is part of "line precise exception
- * reporting", whereby errors at runtime can be tracked backwards to the files from which they were
- * parsed or otherwise constructed.
+ * A kind of tag applied to other objects to identify where they came from, in terms of a file (the resource), a line
+ * number, and a column number. This is part of "line precise exception reporting", whereby errors at runtime can be
+ * tracked backwards to the files from which they were parsed or otherwise constructed.
*/
public interface Location
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/LoggerSource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/LoggerSource.java
index bb1fecb..ff0d8e1 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/LoggerSource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/LoggerSource.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
import org.slf4j.Logger;
/**
- * A wrapper around SLF4J's LoggerFactory that exists to allow particular projects to "hook" the
- * creation of Logger instances.
+ * A wrapper around SLF4J's LoggerFactory that exists to allow particular projects to "hook" the creation of Logger
+ * instances.
*/
public interface LoggerSource
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/MappedConfiguration.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/MappedConfiguration.java
index da3ead6..db7dee5 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/MappedConfiguration.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/MappedConfiguration.java
@@ -1,33 +1,29 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc;
/**
- * Object passed into a service contributor method that allows the method provide contributed values
- * to the service's configuration.
+ * Object passed into a service contributor method that allows the method provide contributed values to the service's
+ * configuration.
* <p/>
- * A service can <em>collect</em> contributions in three different ways:
- * <ul>
- * <li>As an un-ordered collection of values</li>
- * <li>As an ordered list of values (where each value has a unique id, pre-requisited and
- * post-requisites)</li>
- * <li>As a map of keys and values
- * </ul>
+ * A service can <em>collect</em> contributions in three different ways: <ul> <li>As an un-ordered collection of
+ * values</li> <li>As an ordered list of values (where each value has a unique id, pre-requisited and
+ * post-requisites)</li> <li>As a map of keys and values </ul>
* <p/>
- * The service defines the <em>type</em> of contribution, in terms of a base class or service
- * interface. Contributions must be compatible with the type.
+ * The service defines the <em>type</em> of contribution, in terms of a base class or service interface. Contributions
+ * must be compatible with the type.
*/
public interface MappedConfiguration<K, V>
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/MessageFormatter.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/MessageFormatter.java
index c5323ff..3b2eebe 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/MessageFormatter.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/MessageFormatter.java
@@ -1,29 +1,29 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc;
/**
- * Obtained from a {@link org.apache.tapestry.ioc.Messages}, used to format messages for a specific
- * localized message key.
+ * Obtained from a {@link org.apache.tapestry5.ioc.Messages}, used to format messages for a specific localized message
+ * key.
*/
public interface MessageFormatter
{
/**
- * Formats the message. The arguments are passed to {@link java.util.Formatter} as is with one
- * exception: Object of type {@link Throwable} are converted to their
- * {@link Throwable#getMessage()} (or, if that is null, to the name of the class).
+ * Formats the message. The arguments are passed to {@link java.util.Formatter} as is with one exception: Object of
+ * type {@link Throwable} are converted to their {@link Throwable#getMessage()} (or, if that is null, to the name of
+ * the class).
*
* @param args
* @return formatted string
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Messages.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Messages.java
index a18d31e..93d13a5 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Messages.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Messages.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
- * Provides access to a messages catalog, a set of properties files that provide localized messages
- * for a particular locale. The message catalog consists of keys and values and follows the
- * semantics of a Java {@link java.util.ResourceBundle} with some changes.
+ * Provides access to a messages catalog, a set of properties files that provide localized messages for a particular
+ * locale. The message catalog consists of keys and values and follows the semantics of a Java {@link
+ * java.util.ResourceBundle} with some changes.
*/
public interface Messages
{
@@ -27,8 +27,8 @@
boolean contains(String key);
/**
- * Returns the localized message for the given key. If catalog does not contain such a key, then
- * a modified version of the key is returned (converted to upper case and enclosed in brackets).
+ * Returns the localized message for the given key. If catalog does not contain such a key, then a modified version
+ * of the key is returned (converted to upper case and enclosed in brackets).
*
* @param key
* @return localized message for key, or placeholder
@@ -36,8 +36,8 @@
String get(String key);
/**
- * Returns a formatter for the message, which can be used to substitute arguments (as per
- * {@link java.util.Formatter}).
+ * Returns a formatter for the message, which can be used to substitute arguments (as per {@link
+ * java.util.Formatter}).
*
* @param key
* @return formattable object
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/MethodAdvice.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/MethodAdvice.java
index d27e7f5..d0f8680 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/MethodAdvice.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/MethodAdvice.java
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
* For Tapestry IoC, Aspects provide a limited amount of advise, i.e., advising method invocations. That's the only join
* point available (method invocations of service interface methods); full AOP systems such as AspectJ can do much, much
* such as advising field access and even object construction.
*
- * @see org.apache.tapestry.ioc.services.AspectDecorator
+ * @see org.apache.tapestry5.ioc.services.AspectDecorator
*/
public interface MethodAdvice
{
/**
* Allows the Aspect to advise the invocation. The Aspect is free to inspect and even replace parameters. Most
- * Aspects will then invoke {@link org.apache.tapestry.ioc.Invocation#proceed()}. The Aspect may then inspect and
+ * Aspects will then invoke {@link org.apache.tapestry5.ioc.Invocation#proceed()}. The Aspect may then inspect and
* replace any checked thrown exceptions. Some Aspects (for example, caching) may selectively decide to bypass the
* invocation entirely, and instead invoke some other method or otherwise set a return value or thrown exception.
*
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ModuleBuilderSource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ModuleBuilderSource.java
index 07c9e76..9f985ed 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ModuleBuilderSource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ModuleBuilderSource.java
@@ -1,26 +1,25 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc;
/**
- * The source for the module builder instance needed by most (but not all) service builders, service
- * contributors and service decorators. Allows the creation of the moduleBuilder instance to be
- * deferred until actually needed; in practical terms, when the builder/decorator/contributor is a
- * <em>static</em> method on the module builder class, then a module builder instance is not
- * needed. This allows Tapestry IOC to work around a tricky chicken-and-the-egg problem, whereby the
- * constructor of a module builder instance requires contributions that originate in the same
+ * The source for the module builder instance needed by most (but not all) service builders, service contributors and
+ * service decorators. Allows the creation of the moduleBuilder instance to be deferred until actually needed; in
+ * practical terms, when the builder/decorator/contributor is a <em>static</em> method on the module builder class, then
+ * a module builder instance is not needed. This allows Tapestry IOC to work around a tricky chicken-and-the-egg
+ * problem, whereby the constructor of a module builder instance requires contributions that originate in the same
* module.
*/
public interface ModuleBuilderSource
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectCreator.java
index a5e7dc1..0d7766e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectCreator.java
@@ -12,17 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
- * Interface used to encapsulate any strategy used defer the creation of some object until just as
- * needed.
+ * Interface used to encapsulate any strategy used defer the creation of some object until just as needed.
*/
public interface ObjectCreator
{
/**
- * Create and return the object. In some limited circumstances, the implementation may cache
- * the result, returning the same object for repeated calls.
+ * Create and return the object. In some limited circumstances, the implementation may cache the result, returning
+ * the same object for repeated calls.
*/
Object createObject();
}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java
index bde67d3..a5c1e52 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectLocator.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.services.MasterObjectProvider;
+import org.apache.tapestry5.ioc.services.MasterObjectProvider;
/**
- * Defines an object which can provide access to services defined within a {@link org.apache.tapestry.ioc.Registry}, or
+ * Defines an object which can provide access to services defined within a {@link org.apache.tapestry5.ioc.Registry}, or
* to objects or object instances available by other means. Services are accessed via service id, or (when appropriate)
* by just service interface. The Registry itself implements this interface, as does {@link
- * org.apache.tapestry.ioc.ServiceResources}.
+ * org.apache.tapestry5.ioc.ServiceResources}.
*/
public interface ObjectLocator
{
@@ -54,8 +54,8 @@
<T> T getService(Class<T> serviceInterface);
/**
- * Obtains an object indirectly, using an {@link org.apache.tapestry.ioc.ObjectProvider} identified by the prefix of
- * the reference.
+ * Obtains an object indirectly, using an {@link org.apache.tapestry5.ioc.ObjectProvider} identified by the prefix
+ * of the reference.
*
* @param objectType the type of object to be returned
* @param annotationProvider provides access to annotations on the field or parameter for which a value is to be
@@ -84,7 +84,7 @@
* Creates a proxy. The proxy will defer invocation of {@link #autobuild(Class)} until just-in-time (that is, first
* method invocation). In a limited number of cases, it is necessary to use such a proxy to prevent service
* construction cycles, particularly when contributing (directly or indirectly) to the {@link
- * org.apache.tapestry.ioc.services.MasterObjectProvider} (which is itself at the heart of autobuilding).
+ * org.apache.tapestry5.ioc.services.MasterObjectProvider} (which is itself at the heart of autobuilding).
*
* @param <T>
* @param interfaceClass the interface implemented by the proxy
@@ -92,4 +92,4 @@
* @return a proxy
*/
<T> T proxy(Class<T> interfaceClass, Class<? extends T> implementationClass);
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectProvider.java
index d2e5cc0..c0e80bc 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ObjectProvider.java
@@ -12,31 +12,30 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
- * Object providers represent an alternate way to locate an object provided somewhere in the
- * {@link org.apache.tapestry.ioc.Registry}. Instead of using a just the service id to gain access
- * to a service within the Registry, object providers in different flavors are capable of vending,
- * or even creating, objects of disparate types from disparate sources.
+ * Object providers represent an alternate way to locate an object provided somewhere in the {@link
+ * org.apache.tapestry5.ioc.Registry}. Instead of using a just the service id to gain access to a service within the
+ * Registry, object providers in different flavors are capable of vending, or even creating, objects of disparate types
+ * from disparate sources.
* <p/>
* Object providers are consulted in a strict order, and the first non-null result is taken.
* <p/>
- * In many cases, an object provider searches for additional annotations on the element (usually a
- * parameter, or perhaps a field) for which a value is required.
+ * In many cases, an object provider searches for additional annotations on the element (usually a parameter, or perhaps
+ * a field) for which a value is required.
*/
public interface ObjectProvider
{
/**
- * Provides an object based on an expression. The process of providing objects occurs within a
- * particular <em>context</em>, which will typically be a service builder method, service
- * contributor method, or service decorator method. The locator parameter provides access to the
- * services visible <em>to that context</em>.
+ * Provides an object based on an expression. The process of providing objects occurs within a particular
+ * <em>context</em>, which will typically be a service builder method, service contributor method, or service
+ * decorator method. The locator parameter provides access to the services visible <em>to that context</em>.
*
* @param objectType the expected object type
* @param annotationProvider provides access to annotations (typically, the field or parameter to which an
- * injection-related annotation is attached); annotations on the field or parameter
- * may also be used when resolving the desired object
+ * injection-related annotation is attached); annotations on the field or parameter may
+ * also be used when resolving the desired object
* @param locator locator for the <em>context</em> in which the provider is being used
* @param <T>
* @return the requested object, or null if this object provider can not supply an object
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Orderable.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Orderable.java
index 429aa13..290be70 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Orderable.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Orderable.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.Defense;
/**
* A wrapper that allows objects of a target type to be ordered. Each Orderable object is given a unique id and a set of
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/OrderedConfiguration.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/OrderedConfiguration.java
index a0ae838..ae6feb9 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/OrderedConfiguration.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/OrderedConfiguration.java
@@ -1,43 +1,38 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc;
/**
- * Object passed into a service contributor method that allows the method provide contributed values
- * to the service's configuration.
+ * Object passed into a service contributor method that allows the method provide contributed values to the service's
+ * configuration.
* <p/>
- * A service can <em>collect</em> contributions in three different ways:
- * <ul>
- * <li>As an un-ordered collection of values</li>
- * <li>As an ordered list of values (where each value has a unique id, pre-requisited and
- * post-requisites)</li>
- * <li>As a map of keys and values
- * </ul>
+ * A service can <em>collect</em> contributions in three different ways: <ul> <li>As an un-ordered collection of
+ * values</li> <li>As an ordered list of values (where each value has a unique id, pre-requisited and
+ * post-requisites)</li> <li>As a map of keys and values </ul>
* <p/>
- * The service defines the <em>type</em> of contribution, in terms of a base class or service
- * interface. Contributions must be compatible with the type.
+ * The service defines the <em>type</em> of contribution, in terms of a base class or service interface. Contributions
+ * must be compatible with the type.
*/
public interface OrderedConfiguration<T>
{
/**
- * Adds an ordered object to a service's contribution. Each object has an id (which must be
- * unique). Optionally, pre-requisites (a list of ids that must precede this object) and
- * post-requisites (ids that must follow) can be provided.
+ * Adds an ordered object to a service's contribution. Each object has an id (which must be unique). Optionally,
+ * pre-requisites (a list of ids that must precede this object) and post-requisites (ids that must follow) can be
+ * provided.
*
- * @param id a unique id for the object; the id will be fully qualified with the contributing
- * module's id
+ * @param id a unique id for the object; the id will be fully qualified with the contributing module's id
* @param constraints used to order the object relative to other contributed objects
* @parm object to add to the service's configuration
*/
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Registry.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Registry.java
index 4c6c084..e977226 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Registry.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Registry.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.EagerLoad;
+import org.apache.tapestry5.ioc.annotations.EagerLoad;
/**
* Public access to the IoC service registry.
@@ -25,8 +25,8 @@
* Invoked at the end of a request to discard any thread-specific information accumulated during the current
* request.
*
- * @see org.apache.tapestry.ioc.services.PerthreadManager
- * @see org.apache.tapestry.ioc.services.ThreadCleanupListener
+ * @see org.apache.tapestry5.ioc.services.PerthreadManager
+ * @see org.apache.tapestry5.ioc.services.ThreadCleanupListener
*/
void cleanupThread();
@@ -34,8 +34,8 @@
* Shuts down a Registry instance. Notifies all listeners that the registry has shutdown. Further method invocations
* on the Registry are no longer allowed, and the Registry instance should be discarded.
*
- * @see org.apache.tapestry.ioc.services.RegistryShutdownHub
- * @see org.apache.tapestry.ioc.services.RegistryShutdownListener
+ * @see org.apache.tapestry5.ioc.services.RegistryShutdownHub
+ * @see org.apache.tapestry5.ioc.services.RegistryShutdownListener
*/
void shutdown();
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/RegistryBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/RegistryBuilder.java
index d4c1568..d1c94d1 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/RegistryBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/RegistryBuilder.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.SubModule;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.internal.DefaultModuleDefImpl;
-import org.apache.tapestry.ioc.internal.LoggerSourceImpl;
-import org.apache.tapestry.ioc.internal.RegistryImpl;
-import org.apache.tapestry.ioc.internal.RegistryWrapper;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.OneShotLock;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.TapestryIOCModule;
+import org.apache.tapestry5.ioc.annotations.SubModule;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.internal.DefaultModuleDefImpl;
+import org.apache.tapestry5.ioc.internal.LoggerSourceImpl;
+import org.apache.tapestry5.ioc.internal.RegistryImpl;
+import org.apache.tapestry5.ioc.internal.RegistryWrapper;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryImpl;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.OneShotLock;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.TapestryIOCModule;
import org.slf4j.Logger;
import java.lang.reflect.AnnotatedElement;
@@ -33,7 +33,7 @@
import java.util.Set;
/**
- * Used to construct the IoC {@link org.apache.tapestry.ioc.Registry}. This class is <em>not</em> thread-safe. The
+ * Used to construct the IoC {@link org.apache.tapestry5.ioc.Registry}. This class is <em>not</em> thread-safe. The
* Registry, once created, <em>is</em> thread-safe.
*/
public final class RegistryBuilder
@@ -100,7 +100,7 @@
/**
* Adds a number of modules (as module classes) to the registry, returning the builder for further configuration.
*
- * @see org.apache.tapestry.ioc.annotation.SubModule
+ * @see org.apache.tapestry5.ioc.annotations.SubModule
*/
public RegistryBuilder add(Class... moduleBuilderClasses)
{
@@ -135,7 +135,7 @@
* Adds a number of module classes (specified by fully qualified class name) to the registry, returning the builder
* for further configuration.
*
- * @see org.apache.tapestry.ioc.annotation.SubModule
+ * @see org.apache.tapestry5.ioc.annotations.SubModule
*/
public RegistryBuilder add(String classname)
{
@@ -157,7 +157,7 @@
/**
* Constructs and returns the registry; this may only be done once. The caller is responsible for invoking {@link
- * org.apache.tapestry.ioc.Registry#performRegistryStartup()}.
+ * org.apache.tapestry5.ioc.Registry#performRegistryStartup()}.
*/
public Registry build()
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Resource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Resource.java
index e257452..aa431f5 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Resource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/Resource.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
import java.io.IOException;
import java.io.InputStream;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBinder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBinder.java
index 2a741c1..cc37c54 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBinder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBinder.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.ioc.def.ServiceDef;
/**
* Allows a module to bind service interfaces to service implementation classes in support of autobuilding services. A
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBindingOptions.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBindingOptions.java
index 2aca3ee..8c4c698 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBindingOptions.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBindingOptions.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.EagerLoad;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.annotations.EagerLoad;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.ioc.def.ServiceDef;
import java.lang.annotation.Annotation;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBuilderResources.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBuilderResources.java
index 33df6fe..d07439d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBuilderResources.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceBuilderResources.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
import java.util.Collection;
import java.util.List;
import java.util.Map;
/**
- * Extends {@link org.apache.tapestry.ioc.ServiceResources} with additional methods needed only by
- * the service builder method, related to accessing a service's configuration. Services may have a
- * <em>single</em> configuration in one of three flavors: unordered, ordered or mapped.
+ * Extends {@link org.apache.tapestry5.ioc.ServiceResources} with additional methods needed only by the service builder
+ * method, related to accessing a service's configuration. Services may have a <em>single</em> configuration in one of
+ * three flavors: unordered, ordered or mapped.
*/
public interface ServiceBuilderResources extends ServiceResources, ModuleBuilderSource
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceDecorator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceDecorator.java
index 526d72f..27f2e43 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceDecorator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceDecorator.java
@@ -1,33 +1,31 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc;
/**
- * A service decorator is derived from a {@link org.apache.tapestry.ioc.def.DecoratorDef} and is
- * responsible for building an interceptor around an existing implementation (called the
- * "delegate").
+ * A service decorator is derived from a {@link org.apache.tapestry5.ioc.def.DecoratorDef} and is responsible for
+ * building an interceptor around an existing implementation (called the "delegate").
*/
public interface ServiceDecorator
{
/**
- * Creates a new interceptor object implementing the same service interface as the delegate
- * object.
+ * Creates a new interceptor object implementing the same service interface as the delegate object.
*
* @param delegate an existing object implementing the service interface.
- * @return a new object implementing the same service interface, or delegate or null if the
- * decorator chooses not to create a new interceptor.
+ * @return a new object implementing the same service interface, or delegate or null if the decorator chooses not to
+ * create a new interceptor.
*/
public Object createInterceptor(Object delegate);
}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceLifecycle.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceLifecycle.java
index 6f1f2d8..6362a22 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceLifecycle.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceLifecycle.java
@@ -1,18 +1,18 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc;
/**
* Allows certain types of lifecycles to control exactly how services are instantiated.
@@ -20,14 +20,12 @@
public interface ServiceLifecycle
{
/**
- * Returns the same creator, or a new one, that encapsulates the creation of the core service
- * implementation.
+ * Returns the same creator, or a new one, that encapsulates the creation of the core service implementation.
*
- * @param resources source of information about the service to be created, and source of additional
- * services or other resources that may be needed when constructing the core service
- * implementation
- * @param creator object capable of creating the service implementation on demand. This is a wrapper
- * around the service's builder method.
+ * @param resources source of information about the service to be created, and source of additional services or
+ * other resources that may be needed when constructing the core service implementation
+ * @param creator object capable of creating the service implementation on demand. This is a wrapper around the
+ * service's builder method.
* @return the service or equivalent service proxy
*/
Object createService(ServiceResources resources, ObjectCreator creator);
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceResources.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceResources.java
index 6f00be5..01c511d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceResources.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/ServiceResources.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
import org.slf4j.Logger;
/**
- * Contains resources that may be provided to a service when it initializes, which includes other
- * services defined in the registry. ServiceResources provides access to other services (it extends
- * {@link org.apache.tapestry.ioc.ObjectLocator}).
+ * Contains resources that may be provided to a service when it initializes, which includes other services defined in
+ * the registry. ServiceResources provides access to other services (it extends {@link
+ * org.apache.tapestry5.ioc.ObjectLocator}).
*/
public interface ServiceResources extends ObjectLocator
{
@@ -34,10 +34,9 @@
Class getServiceInterface();
/**
- * Returns a Logger appropriate for logging messages. This includes debug level messages about
- * the creation and configuration of the underlying service, as well as debug, warning, or error
- * level messages from the service itself. Often service interceptors will make use of the
- * service's logger.
+ * Returns a Logger appropriate for logging messages. This includes debug level messages about the creation and
+ * configuration of the underlying service, as well as debug, warning, or error level messages from the service
+ * itself. Often service interceptors will make use of the service's logger.
*/
Logger getLogger();
}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/EagerLoad.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/EagerLoad.java
index 892d41f..9a853aa 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/EagerLoad.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/EagerLoad.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
-import org.apache.tapestry.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.ServiceBinder;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Marker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Marker.java
index 0127e5b..b1e5a10 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Marker.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Marker.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
-import org.apache.tapestry.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -30,7 +30,7 @@
* <p/>
* When applied to a module class, this sets the default markers for all services within the module. Markers are
* additive, so a Marker annotation on the implementation class and/or specified with {@link
- * org.apache.tapestry.ioc.ServiceBindingOptions#withMarker(Class[])} will accumulate; a service may have any number of
+ * org.apache.tapestry5.ioc.ServiceBindingOptions#withMarker(Class[])} will accumulate; a service may have any number of
* markers. Generally one or two is enough.
*/
@Target(
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Match.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Match.java
index 0578dbe..bb79a41 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Match.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Match.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Order.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Order.java
index 9d9e5fe..53045d8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Order.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Order.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
@@ -24,7 +24,7 @@
* Used with a service decorator method to control the order in which decorations occur. Identifies other decorators
* which should occur before the annotated decorator.
*
- * @see org.apache.tapestry.ioc.def.DecoratorDef
+ * @see org.apache.tapestry5.ioc.def.DecoratorDef
*/
@Target(METHOD)
@Retention(RUNTIME)
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Scope.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Scope.java
index 511d605..de6df28 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Scope.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/Scope.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
-import org.apache.tapestry.ioc.ServiceBinder;
-import org.apache.tapestry.ioc.ServiceLifecycle;
-import org.apache.tapestry.ioc.services.ServiceLifecycleSource;
+import org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.ServiceLifecycle;
+import org.apache.tapestry5.ioc.services.ServiceLifecycleSource;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.METHOD;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/SubModule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/SubModule.java
index 7a1e58c..28614ad 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/SubModule.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/annotation/SubModule.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.annotation;
+package org.apache.tapestry5.ioc.annotations;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.TYPE;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ContributionDef.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ContributionDef.java
index 38eaf72..c22e0af 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ContributionDef.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ContributionDef.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.def;
+package org.apache.tapestry5.ioc.def;
-import org.apache.tapestry.ioc.*;
+import org.apache.tapestry5.ioc.*;
/**
* Contribution to a service configuration.
* <p/>
- * The toString() method of the ContributionDef will be used for some exception reporting and should
- * clearly identify where the contribution comes from; the normal behavior is to identify the class
- * and method of the contribution method.
+ * The toString() method of the ContributionDef will be used for some exception reporting and should clearly identify
+ * where the contribution comes from; the normal behavior is to identify the class and method of the contribution
+ * method.
*/
public interface ContributionDef
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/DecoratorDef.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/DecoratorDef.java
index 769312d..4bc48eb 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/DecoratorDef.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/DecoratorDef.java
@@ -12,31 +12,29 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.def;
+package org.apache.tapestry5.ioc.def;
-import org.apache.tapestry.ioc.ModuleBuilderSource;
-import org.apache.tapestry.ioc.ServiceDecorator;
-import org.apache.tapestry.ioc.ServiceResources;
+import org.apache.tapestry5.ioc.ModuleBuilderSource;
+import org.apache.tapestry5.ioc.ServiceDecorator;
+import org.apache.tapestry5.ioc.ServiceResources;
/**
* Definition of a service decorator, which (by default) is derived from a service decorator method.
* <p/>
- * A note on decorator scheduling. The scheduling is based on the desired order of <em>behavior</em>.
- * Thus, if logging should occur before security checks, and security checks should occur before
- * transaction management, then the desired decorator order is Logging, Security, Transactions. This
- * might be specified as having Security occur after Logging, and Transactions occur after Security.
- * It might also be specified by having Logging ordered "before:*", and Transactions ordered
- * "after:*" with no specified scheduling for Security.
+ * A note on decorator scheduling. The scheduling is based on the desired order of <em>behavior</em>. Thus, if logging
+ * should occur before security checks, and security checks should occur before transaction management, then the desired
+ * decorator order is Logging, Security, Transactions. This might be specified as having Security occur after Logging,
+ * and Transactions occur after Security. It might also be specified by having Logging ordered "before:*", and
+ * Transactions ordered "after:*" with no specified scheduling for Security.
* <p/>
- * Once this order is established, decorators are <em>applied</em> in reverse order. Each
- * decorator's job is to create an <em>interceptor</em> for the service, that delegates to the
- * next implementation. This implies that the decorators are executed last to first. In the above
- * example, the core service implementation would be passed to the Transaction decorator, resulting
- * in the Transaction interceptor. The Transaction interceptor would be passed to the Security
- * decorator, resulting in the Security interceptor. The Security interceptor would be passed to the
- * Logging decorator, resulting in the Logging interceptor. Thus at runtime, the Logging interceptor
- * will execute first, then delegate to the Security interceptor, which would delegate to the
- * Transaction interceptor, which would finally delegate to the core service implementation.
+ * Once this order is established, decorators are <em>applied</em> in reverse order. Each decorator's job is to create
+ * an <em>interceptor</em> for the service, that delegates to the next implementation. This implies that the decorators
+ * are executed last to first. In the above example, the core service implementation would be passed to the Transaction
+ * decorator, resulting in the Transaction interceptor. The Transaction interceptor would be passed to the Security
+ * decorator, resulting in the Security interceptor. The Security interceptor would be passed to the Logging decorator,
+ * resulting in the Logging interceptor. Thus at runtime, the Logging interceptor will execute first, then delegate to
+ * the Security interceptor, which would delegate to the Transaction interceptor, which would finally delegate to the
+ * core service implementation.
*/
public interface DecoratorDef
{
@@ -46,32 +44,31 @@
String getDecoratorId();
/**
- * Returns zero or more ordering constraint strings, used to order the decorated relative to the
- * other decorators.
+ * Returns zero or more ordering constraint strings, used to order the decorated relative to the other decorators.
*/
String[] getConstraints();
/**
- * Creates an object that can perform the decoration (in the default case, by invoking the
- * decorator method on the module builder instance.
+ * Creates an object that can perform the decoration (in the default case, by invoking the decorator method on the
+ * module builder instance.
*
- * @param moduleBuilderSource the module builder instance associated with the module containing the decorator
- * (not necessarily the module containing the service being decorated)
- * @param resources the resources visible <em>to the decorator</em> (which may be in a different
- * module than the service being decorated). Other resource properties (serviceId,
+ * @param moduleBuilderSource the module builder instance associated with the module containing the decorator (not
+ * necessarily the module containing the service being decorated)
+ * @param resources the resources visible <em>to the decorator</em> (which may be in a different module
+ * than the service being decorated). Other resource properties (serviceId,
* serviceInterface, log, etc.) are for the service being decorated.
*/
ServiceDecorator createDecorator(ModuleBuilderSource moduleBuilderSource,
ServiceResources resources);
/**
- * Used to determine which services may be decorated by this decorator. When decorating a
- * service, first the decorators that target the service are identified, then ordering occurs,
- * then the {@link ServiceDecorator}s are invoked.
+ * Used to determine which services may be decorated by this decorator. When decorating a service, first the
+ * decorators that target the service are identified, then ordering occurs, then the {@link ServiceDecorator}s are
+ * invoked.
*
* @param serviceDef
* @return true if the decorator applies to the service
*/
boolean matches(ServiceDef serviceDef);
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ModuleDef.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ModuleDef.java
index d4f2dd2..663cf2b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ModuleDef.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ModuleDef.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.def;
+package org.apache.tapestry5.ioc.def;
import org.slf4j.Logger;
import java.util.Set;
/**
- * Defines the contents of a module. In the default case, this is information about the services
- * provided by the module builder class.
+ * Defines the contents of a module. In the default case, this is information about the services provided by the module
+ * builder class.
*/
public interface ModuleDef
{
@@ -48,15 +48,13 @@
Set<ContributionDef> getContributionDefs();
/**
- * Returns the class that will be instantiated. Annotated instance methods of this class are
- * invoked to build services, to decorate/intercept services, and make contributions to other
- * services.
+ * Returns the class that will be instantiated. Annotated instance methods of this class are invoked to build
+ * services, to decorate/intercept services, and make contributions to other services.
*/
Class getBuilderClass();
/**
- * Returns the name used to create a {@link Logger} instance. This is typically the builder class
- * name.
+ * Returns the name used to create a {@link Logger} instance. This is typically the builder class name.
*/
String getLoggerName();
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef.java
index 4672dcc..d760b29 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/def/ServiceDef.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.def;
+package org.apache.tapestry5.ioc.def;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ServiceBuilderResources;
import java.util.Set;
@@ -59,7 +59,7 @@
/**
* Returns the lifecycle defined for the service. This is indicated by adding a {@link
- * org.apache.tapestry.ioc.annotation.Scope} annotation to the service builder method for the service.
+ * org.apache.tapestry5.ioc.annotations.Scope} annotation to the service builder method for the service.
* <p/>
* Services that are not proxied will ignore their scope; such services are always treated as singletons.
*/
@@ -68,7 +68,7 @@
/**
* Returns true if the service should be eagerly loaded at Registry startup.
*
- * @see org.apache.tapestry.ioc.annotation.EagerLoad
+ * @see org.apache.tapestry5.ioc.annotations.EagerLoad
*/
boolean isEagerLoad();
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractServiceCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractServiceCreator.java
index 9f66d6a..2d72e7b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractServiceCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/AbstractServiceCreator.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
-import org.apache.tapestry.ioc.ServiceResources;
-import static org.apache.tapestry.ioc.internal.ConfigurationType.*;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ServiceBuilderResources;
+import org.apache.tapestry5.ioc.ServiceResources;
+import static org.apache.tapestry5.ioc.internal.ConfigurationType.*;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import org.slf4j.Logger;
import java.lang.reflect.ParameterizedType;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConfigurationType.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConfigurationType.java
index abc70e6..17db41f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConfigurationType.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConfigurationType.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
* Defines the three types of configurations a service may request.
@@ -21,15 +21,15 @@
{
/**
- * @see org.apache.tapestry.ioc.Configuration
+ * @see org.apache.tapestry5.ioc.Configuration
*/
UNORDERED,
/**
- * @see org.apache.tapestry.ioc.OrderedConfiguration
+ * @see org.apache.tapestry5.ioc.OrderedConfiguration
*/
ORDERED,
/**
- * @see org.apache.tapestry.ioc.MappedConfiguration
+ * @see org.apache.tapestry5.ioc.MappedConfiguration
*/
MAPPED
}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java
index 4e5b391..ed363ed 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ConstructorServiceCreator.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.ServiceBuilderResources;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ContributionDefImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ContributionDefImpl.java
index 767d60c..0b6668e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ContributionDefImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ContributionDefImpl.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ClassFactory;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DecoratorDefImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DecoratorDefImpl.java
index 4f239eb..3cd8fc8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DecoratorDefImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DecoratorDefImpl.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.IdMatcher;
-import org.apache.tapestry.ioc.ModuleBuilderSource;
-import org.apache.tapestry.ioc.ServiceDecorator;
-import org.apache.tapestry.ioc.ServiceResources;
-import org.apache.tapestry.ioc.def.DecoratorDef;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.IdMatcher;
+import org.apache.tapestry5.ioc.ModuleBuilderSource;
+import org.apache.tapestry5.ioc.ServiceDecorator;
+import org.apache.tapestry5.ioc.ServiceResources;
+import org.apache.tapestry5.ioc.def.DecoratorDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ClassFactory;
import java.lang.reflect.Method;
import java.util.List;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
index 09304bd..f18388a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImpl.java
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotation.*;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.DecoratorDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import static org.apache.tapestry.ioc.internal.ConfigurationType.*;
-import static org.apache.tapestry.ioc.internal.IOCMessages.*;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.annotations.*;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.DecoratorDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import static org.apache.tapestry5.ioc.internal.ConfigurationType.*;
+import static org.apache.tapestry5.ioc.internal.IOCMessages.*;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.*;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ClassFactory;
import org.slf4j.Logger;
import java.lang.reflect.InvocationTargetException;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/EagerLoadServiceProxy.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/EagerLoadServiceProxy.java
index afa42d1..679915c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/EagerLoadServiceProxy.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/EagerLoadServiceProxy.java
@@ -1,22 +1,22 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.internal;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.internal;
/**
- * Interface implemented by all service proxies. Service proxies are always
- * {@link org.apache.tapestry.ioc.services.RegistryShutdownListener}s, they also can be eager-load
+ * Interface implemented by all service proxies. Service proxies are always {@link
+ * org.apache.tapestry5.ioc.services.RegistryShutdownListener}s, they also can be eager-load
*/
public interface EagerLoadServiceProxy
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/GlobPatternMatcher.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/GlobPatternMatcher.java
index c5505a8..d98730d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/GlobPatternMatcher.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/GlobPatternMatcher.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import static org.apache.tapestry.ioc.internal.MatchType.*;
+import static org.apache.tapestry5.ioc.internal.MatchType.*;
public class GlobPatternMatcher
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IOCInternalTestCase.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IOCInternalTestCase.java
index 83787a2..b5a95ee 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IOCInternalTestCase.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IOCInternalTestCase.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import static org.easymock.EasyMock.isA;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.AfterSuite;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IOCMessages.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IOCMessages.java
index 7b37ce4..d5dce09 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IOCMessages.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IOCMessages.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import static org.apache.tapestry.ioc.internal.util.InternalUtils.asString;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
-import static org.apache.tapestry.ioc.services.ClassFabUtils.toJavaClassName;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import static org.apache.tapestry5.ioc.internal.util.InternalUtils.asString;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import static org.apache.tapestry5.ioc.services.ClassFabUtils.toJavaClassName;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IdMatcherImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IdMatcherImpl.java
index 1a570e3..a2fe889 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IdMatcherImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/IdMatcherImpl.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.IdMatcher;
+import org.apache.tapestry5.ioc.IdMatcher;
/**
* A wrapper around a {@link GlobPatternMatcher} used to glob-match service ids.
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilder.java
index ba515d2..970c128 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilder.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceDecorator;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ServiceDecorator;
import java.util.Collections;
import java.util.List;
/**
* Responsible for constructing the interceptor stack, on demand, by invoking an ordered series of decorators ({@link
- * org.apache.tapestry.ioc.def.DecoratorDef} (which are converted into {@link ServiceDecorator}s).
+ * org.apache.tapestry5.ioc.def.DecoratorDef} (which are converted into {@link ServiceDecorator}s).
*/
public class InterceptorStackBuilder implements ObjectCreator
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/InternalRegistry.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/InternalRegistry.java
index 002f8b0..3905be6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/InternalRegistry.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/InternalRegistry.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.ServiceDecorator;
-import org.apache.tapestry.ioc.ServiceLifecycle;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import org.apache.tapestry.ioc.services.ClassFab;
-import org.apache.tapestry.ioc.services.RegistryShutdownHub;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.ServiceDecorator;
+import org.apache.tapestry5.ioc.ServiceLifecycle;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.services.ClassFab;
+import org.apache.tapestry5.ioc.services.RegistryShutdownHub;
import org.slf4j.Logger;
import java.util.Collection;
@@ -41,15 +41,14 @@
ServiceLifecycle getServiceLifecycle(String scope);
/**
- * Searches for decorators for a particular service. The resulting
- * {@link org.apache.tapestry.ioc.def.DecoratorDef}s are ordered, then converted into
- * {@link ServiceDecorator}s.
+ * Searches for decorators for a particular service. The resulting {@link org.apache.tapestry5.ioc.def.DecoratorDef}s
+ * are ordered, then converted into {@link ServiceDecorator}s.
*/
List<ServiceDecorator> findDecoratorsForService(ServiceDef serviceDef);
/**
- * Builds up an unordered collection by invoking service contributor methods that target the
- * service (from any module, unless the service is private).
+ * Builds up an unordered collection by invoking service contributor methods that target the service (from any
+ * module, unless the service is private).
*
* @param <T>
* @param serviceDef defines the service for which configuration data is being assembled
@@ -59,10 +58,9 @@
<T> Collection<T> getUnorderedConfiguration(ServiceDef serviceDef, Class<T> valueType);
/**
- * Builds up an ordered collection by invoking service contributor methods that target the
- * service (from any module, unless the service is private). Once all values have been added
- * (each with an id, and pre/post constraints), the values are ordered, null values dropped, and
- * the final sorted list is returned.
+ * Builds up an ordered collection by invoking service contributor methods that target the service (from any module,
+ * unless the service is private). Once all values have been added (each with an id, and pre/post constraints), the
+ * values are ordered, null values dropped, and the final sorted list is returned.
*
* @param <T>
* @param serviceDef defines the service for which configuration data is being assembled
@@ -72,10 +70,9 @@
<T> List<T> getOrderedConfiguration(ServiceDef serviceDef, Class<T> valueType);
/**
- * Builds up a map of key/value pairs by invoking service contribution methods that tharget the
- * service (from any module, unless the service is private). Values and keys may not be null.
- * Invalid values (keys or values that are the wrong type, or duplicate keys) result in warnings
- * and are ignored.
+ * Builds up a map of key/value pairs by invoking service contribution methods that tharget the service (from any
+ * module, unless the service is private). Values and keys may not be null. Invalid values (keys or values that are
+ * the wrong type, or duplicate keys) result in warnings and are ignored.
*
* @param <K, V>
* @param serviceDef defines the service for which configuration data is being assembled
@@ -87,16 +84,15 @@
Class<V> valueType);
/**
- * Convieience for creating a new {@link ClassFab} instance using a
- * {@link org.apache.tapestry.ioc.services.ClassFactory}.
+ * Convieience for creating a new {@link ClassFab} instance using a {@link org.apache.tapestry5.ioc.services.ClassFactory}.
*
* @param serviceInterface the interface to be implemented by the provided class
*/
ClassFab newClass(Class serviceInterface);
/**
- * Given an input string that <em>may</em> contain symbols, returns the string with any and
- * all symbols fully expanded.
+ * Given an input string that <em>may</em> contain symbols, returns the string with any and all symbols fully
+ * expanded.
*
* @param input
* @return expanded input
@@ -104,8 +100,8 @@
String expandSymbols(String input);
/**
- * Returns a logger for the service, which consists of the Module's
- * {@link Module#getLoggerName() log name} suffixed with a period and the service id.
+ * Returns a logger for the service, which consists of the Module's {@link Module#getLoggerName() log name} suffixed
+ * with a period and the service id.
*
* @param serviceId
* @return the logger for the service
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LifecycleWrappedServiceCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LifecycleWrappedServiceCreator.java
index 39d0ee2..933b913 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LifecycleWrappedServiceCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LifecycleWrappedServiceCreator.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceLifecycle;
-import org.apache.tapestry.ioc.ServiceResources;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ServiceLifecycle;
+import org.apache.tapestry5.ioc.ServiceResources;
/**
* Wrapper around a lifecycle, a set of resources for a service, and an underlying {@link ObjectCreator} for a service
@@ -43,7 +43,7 @@
}
/**
- * Passes the resources and the service creator through the {@link org.apache.tapestry.ioc.ServiceLifecycle}.
+ * Passes the resources and the service creator through the {@link org.apache.tapestry5.ioc.ServiceLifecycle}.
*/
public Object createObject()
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LoggerSourceImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LoggerSourceImpl.java
index 11d48c0..4e90c8e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LoggerSourceImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/LoggerSourceImpl.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.LoggerSource;
+import org.apache.tapestry5.ioc.LoggerSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Simple wrapper around SLF4J's LoggerFactory. The concept here is that Log implementations could
- * be provided that promote warnings or errors upto thrown exceptions, for people who like their IOC
- * container extra finicky. In addition, the extra layer makes things a lot easier to mock.
+ * Simple wrapper around SLF4J's LoggerFactory. The concept here is that Log implementations could be provided that
+ * promote warnings or errors upto thrown exceptions, for people who like their IOC container extra finicky. In
+ * addition, the extra layer makes things a lot easier to mock.
*/
public class LoggerSourceImpl implements LoggerSource
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/MatchType.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/MatchType.java
index 918597f..b649279 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/MatchType.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/MatchType.java
@@ -15,9 +15,9 @@
/**
*
*/
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
enum MatchType
{
EXACT, PREFIX, SUFFIX, INFIX, ANY
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/Module.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/Module.java
index 8dfbda5..49b7615 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/Module.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/Module.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ModuleBuilderSource;
-import org.apache.tapestry.ioc.ServiceDecorator;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.DecoratorDef;
-import org.apache.tapestry.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.ModuleBuilderSource;
+import org.apache.tapestry5.ioc.ServiceDecorator;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.DecoratorDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
import java.util.Collection;
import java.util.List;
@@ -53,7 +53,7 @@
/**
* Locates all the decorators that should apply the identified service. This includes visibility rules (private
* services may only be decorated by decorators in the same module) and other filtering rules. The resulting list is
- * ordered and from the list of {@link org.apache.tapestry.ioc.def.DecoratorDef}s, a list of {@link
+ * ordered and from the list of {@link org.apache.tapestry5.ioc.def.DecoratorDef}s, a list of {@link
* ServiceDecorator}s is returned.
*
* @param serviceId identifies the service to be decorated
@@ -76,7 +76,7 @@
Set<ContributionDef> getContributorDefsForService(String serviceId);
/**
- * Locates services with the {@link org.apache.tapestry.ioc.annotation.EagerLoad} annotation and generates proxies
+ * Locates services with the {@link org.apache.tapestry5.ioc.annotations.EagerLoad} annotation and generates proxies
* for them, then adds them to the proxies list for instantiation.
*
* @param proxies collection of proxies to which any eager load services in the module should be added
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
index 0cdd82e..b4b87a5 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ModuleImpl.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.DecoratorDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import org.apache.tapestry.ioc.internal.services.JustInTimeObjectCreator;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.*;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.DecoratorDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.internal.services.JustInTimeObjectCreator;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.*;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.*;
import org.slf4j.Logger;
import java.io.ObjectStreamException;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/NullAnnotationProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/NullAnnotationProvider.java
index f22f489..0034fef 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/NullAnnotationProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/NullAnnotationProvider.java
@@ -12,15 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.AnnotationProvider;
import java.lang.annotation.Annotation;
/**
- * A null implementation of {@link AnnotationProvider}, used when there is not appropriate source
- * of annotations.
+ * A null implementation of {@link AnnotationProvider}, used when there is not appropriate source of annotations.
*/
public class NullAnnotationProvider implements AnnotationProvider
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ObjectCreatorSource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ObjectCreatorSource.java
index b8c1ad5..5633fcc 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ObjectCreatorSource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ObjectCreatorSource.java
@@ -12,22 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ServiceBuilderResources;
/**
- * An object which can, when passed a {@link ServiceBuilderResources}, create a corresponding
- * {@link ObjectCreator}. A secondary responsibility is to provide a description of the creator,
- * which is usually based on the name of the method or constructor to be invoked, and is ultimately
- * used in some debugging or error output.
+ * An object which can, when passed a {@link ServiceBuilderResources}, create a corresponding {@link ObjectCreator}. A
+ * secondary responsibility is to provide a description of the creator, which is usually based on the name of the method
+ * or constructor to be invoked, and is ultimately used in some debugging or error output.
*/
public interface ObjectCreatorSource
{
/**
- * Provides an ObjectCreator that can be used to ultimately instantiate the core service
- * implementation.
+ * Provides an ObjectCreator that can be used to ultimately instantiate the core service implementation.
*/
ObjectCreator constructCreator(ServiceBuilderResources resources);
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ObjectLocatorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ObjectLocatorImpl.java
index dcf9c9d..6d8edad 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ObjectLocatorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ObjectLocatorImpl.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
/**
* Base service locator class used when only the module is known (i.e., when instantiating a module builder class).
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OrIdMatcher.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OrIdMatcher.java
index 35e6ec4..c3ab471 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OrIdMatcher.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/OrIdMatcher.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.IdMatcher;
+import org.apache.tapestry5.ioc.IdMatcher;
import java.util.Collection;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RecursiveServiceCreationCheckWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RecursiveServiceCreationCheckWrapper.java
index 3c766f8..ed956b9 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RecursiveServiceCreationCheckWrapper.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RecursiveServiceCreationCheckWrapper.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.def.ServiceDef;
import org.slf4j.Logger;
/**
- * Decorator for {@link org.apache.tapestry.ioc.ObjectCreator} that ensures the service is only created once. This
+ * Decorator for {@link org.apache.tapestry5.ioc.ObjectCreator} that ensures the service is only created once. This
* detects a situation where the service builder for a service directly or indirectly invokes methods on the service
* itself. This would show up as a second call up the ServiceCreator stack injected into the proxy, potentially leading
* to endless recursion. We try to identify that recursion and produce a useable exception report.
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
index 4e77237..c4c1cbe 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryImpl.java
@@ -12,22 +12,22 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.DecoratorDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import org.apache.tapestry.ioc.internal.services.PerthreadManagerImpl;
-import org.apache.tapestry.ioc.internal.services.RegistryShutdownHubImpl;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.OneShotLock;
-import org.apache.tapestry.ioc.internal.util.Orderer;
-import org.apache.tapestry.ioc.services.*;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.DecoratorDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.internal.services.PerthreadManagerImpl;
+import org.apache.tapestry5.ioc.internal.services.RegistryShutdownHubImpl;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.*;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.OneShotLock;
+import org.apache.tapestry5.ioc.internal.util.Orderer;
+import org.apache.tapestry5.ioc.services.*;
import org.slf4j.Logger;
import java.lang.reflect.Constructor;
@@ -55,7 +55,7 @@
}
/**
- * Used to obtain the {@link org.apache.tapestry.ioc.services.ClassFactory} service, which is crucial when creating
+ * Used to obtain the {@link org.apache.tapestry5.ioc.services.ClassFactory} service, which is crucial when creating
* runtime classes for proxies and the like.
*/
static final String CLASS_FACTORY_SERVICE_ID = "ClassFactory";
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryWrapper.java
index 4eb7eb8..1f7f12b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryWrapper.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/RegistryWrapper.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.Registry;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.Registry;
/**
* A wrapper around {@link InternalRegistry} that exists to expand symbols in a service id before invoking {@link
@@ -73,4 +73,4 @@
return registry.proxy(interfaceClass, implementationClass);
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/SerializationSupport.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/SerializationSupport.java
index 24af031..55c7bd6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/SerializationSupport.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/SerializationSupport.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -78,4 +78,4 @@
return new ServiceProxyToken(serviceId);
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceActivityTracker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceActivityTracker.java
index 5f903ee..6ea3730 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceActivityTracker.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceActivityTracker.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import org.apache.tapestry.ioc.services.ServiceActivityScoreboard;
-import org.apache.tapestry.ioc.services.Status;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.services.ServiceActivityScoreboard;
+import org.apache.tapestry5.ioc.services.Status;
/**
* Used to update the status of services defined by the {@link ServiceActivityScoreboard}.
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceActivityTrackerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceActivityTrackerImpl.java
index 2b947a4..4aea702 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceActivityTrackerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceActivityTrackerImpl.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.ServiceActivity;
-import org.apache.tapestry.ioc.services.ServiceActivityScoreboard;
-import org.apache.tapestry.ioc.services.Status;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.ServiceActivity;
+import org.apache.tapestry5.ioc.services.ServiceActivityScoreboard;
+import org.apache.tapestry5.ioc.services.Status;
import java.util.List;
import java.util.Map;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBinderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBinderImpl.java
index 24c4183..5f8b3b4 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBinderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBinderImpl.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotation.EagerLoad;
-import org.apache.tapestry.ioc.annotation.Marker;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.OneShotLock;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.annotations.EagerLoad;
+import org.apache.tapestry5.ioc.annotations.Marker;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.OneShotLock;
+import org.apache.tapestry5.ioc.services.ClassFactory;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java
index 54b327d..2bf8ed0 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvoker.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.ServiceBuilderResources;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Map;
/**
- * Basic implementation of {@link org.apache.tapestry.ioc.ObjectCreator} that handles invoking a method on the module
+ * Basic implementation of {@link org.apache.tapestry5.ioc.ObjectCreator} that handles invoking a method on the module
* builder, and figures out the correct parameters to pass into the annotated method.
*/
public class ServiceBuilderMethodInvoker extends AbstractServiceCreator
@@ -96,4 +96,4 @@
return result;
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImpl.java
index c1d50f0..aa4fefe 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImpl.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ModuleBuilderSource;
-import org.apache.tapestry.ioc.ServiceDecorator;
-import org.apache.tapestry.ioc.ServiceResources;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.ModuleBuilderSource;
+import org.apache.tapestry5.ioc.ServiceDecorator;
+import org.apache.tapestry5.ioc.ServiceResources;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ClassFactory;
import org.slf4j.Logger;
import java.lang.reflect.InvocationTargetException;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDefAccumulator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDefAccumulator.java
index 1421c1e..b129f2b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDefAccumulator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDefAccumulator.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
public interface ServiceDefAccumulator
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDefImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDefImpl.java
index 1e75b01..2cc0630 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDefImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceDefImpl.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.IOCConstants;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
-import org.apache.tapestry.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.IOCConstants;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ServiceBuilderResources;
+import org.apache.tapestry5.ioc.def.ServiceDef;
import java.util.Set;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceProxyProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceProxyProvider.java
index d5ac7ef..83eec6b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceProxyProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceProxyProvider.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
- * Used in concert with {@link org.apache.tapestry.ioc.internal.SerializationSupport} to
- * convert service tokens back into service proxies.
+ * Used in concert with {@link org.apache.tapestry5.ioc.internal.SerializationSupport} to convert service tokens back
+ * into service proxies.
*/
public interface ServiceProxyProvider
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceProxyToken.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceProxyToken.java
index 125e6c6..af81421 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceProxyToken.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceProxyToken.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
import java.io.InvalidObjectException;
import java.io.ObjectStreamException;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceResourcesImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceResourcesImpl.java
index 06dbaff..4e7d290 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceResourcesImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ServiceResourcesImpl.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ServiceBuilderResources;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ClassFactory;
import org.slf4j.Logger;
import java.lang.reflect.Constructor;
@@ -28,9 +28,9 @@
import java.util.Map;
/**
- * Implementation of {@link org.apache.tapestry.ioc.ServiceBuilderResources}. We just have one implementation that fills
- * the purposes of methods that need a {@link org.apache.tapestry.ioc.ServiceResources} (which includes service
- * decorator methods) as well as methods that need a {@link org.apache.tapestry.ioc.ServiceBuilderResources} (which is
+ * Implementation of {@link org.apache.tapestry5.ioc.ServiceBuilderResources}. We just have one implementation that
+ * fills the purposes of methods that need a {@link org.apache.tapestry5.ioc.ServiceResources} (which includes service
+ * decorator methods) as well as methods that need a {@link org.apache.tapestry5.ioc.ServiceBuilderResources} (which is
* just service builder methods). Since it is most commonly used for the former, we'll just leave the name as
* ServiceResourcesImpl.
*/
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/SingletonServiceLifecycle.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/SingletonServiceLifecycle.java
index 15c1135..d20211f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/SingletonServiceLifecycle.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/SingletonServiceLifecycle.java
@@ -1,26 +1,26 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.internal;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceLifecycle;
-import org.apache.tapestry.ioc.ServiceResources;
+package org.apache.tapestry5.ioc.internal;
+
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ServiceLifecycle;
+import org.apache.tapestry5.ioc.ServiceResources;
/**
- * The basic implementation of a service lifecycle, which simply uses the
- * {@link org.apache.tapestry.ioc.ObjectCreator} to create an instance of the service when asked.
+ * The basic implementation of a service lifecycle, which simply uses the {@link org.apache.tapestry5.ioc.ObjectCreator}
+ * to create an instance of the service when asked.
*/
public class SingletonServiceLifecycle implements ServiceLifecycle
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingConfigurationWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingConfigurationWrapper.java
index cb66fa2..3bd5d49 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingConfigurationWrapper.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingConfigurationWrapper.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.Configuration;
-import org.apache.tapestry.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.Configuration;
+import org.apache.tapestry5.ioc.def.ContributionDef;
import org.slf4j.Logger;
/**
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java
index 6cbf8b4..ea3192a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapper.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.ioc.def.ContributionDef;
import org.slf4j.Logger;
import java.util.Map;
@@ -23,7 +23,7 @@
/**
* Provides two forms of validation for mapped configurations: <ul> <li>If either key or value is null, then a warning
* is logged </li> <li>If the key has previously been stored (by some other {@link
- * org.apache.tapestry.ioc.def.ContributionDef}, then a warning is logged</li> </ul>
+ * org.apache.tapestry5.ioc.def.ContributionDef}, then a warning is logged</li> </ul>
* <p/>
* When a warning is logged, the key/value pair is not added to the delegate.
*
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapper.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapper.java
index 6bcdd7a..b90b637 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapper.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapper.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
+import org.apache.tapestry5.ioc.def.ContributionDef;
import org.slf4j.Logger;
/**
- * Implements validation of values provided to an {@link org.apache.tapestry.ioc.OrderedConfiguration}. If you provide
+ * Implements validation of values provided to an {@link org.apache.tapestry5.ioc.OrderedConfiguration}. If you provide
* an incorrect value type, the value is converted to null but added anyway. This ensures that incorrect values
- * contributed in don't screw up the {@link org.apache.tapestry.ioc.internal.util.Orderer} (and generate a bunch of
+ * contributed in don't screw up the {@link org.apache.tapestry5.ioc.internal.util.Orderer} (and generate a bunch of
* error messages there).
*
* @param <T>
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbstractFab.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbstractFab.java
index 0ef4dae..70c04a0 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbstractFab.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbstractFab.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
import javassist.CtClass;
-import org.apache.tapestry.ioc.internal.util.OneShotLock;
+import org.apache.tapestry5.ioc.internal.util.OneShotLock;
import org.slf4j.Logger;
/**
- * Base class for {@link org.apache.tapestry.ioc.internal.services.ClassFabImpl}. This code is a fork from HiveMind; it
+ * Base class for {@link org.apache.tapestry5.ioc.internal.services.ClassFabImpl}. This code is a fork from HiveMind; it
* is kept seperate from ClassFabImpl in case we want to re-introduce the idea of an InterfaceFab.
*/
public class AbstractFab
@@ -99,4 +99,4 @@
return source;
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbstractInvocation.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbstractInvocation.java
index 40eb520..05b9d7d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbstractInvocation.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AbstractInvocation.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Invocation;
-import org.apache.tapestry.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.Invocation;
+import org.apache.tapestry5.ioc.internal.util.Defense;
import java.lang.reflect.Method;
/**
- * Base class for {@link org.apache.tapestry.ioc.Invocation}, which is extended with a dynamically generated class
+ * Base class for {@link org.apache.tapestry5.ioc.Invocation}, which is extended with a dynamically generated class
* generated for each individual class and method.
*/
public abstract class AbstractInvocation implements Invocation
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
index 2fd9c22..24dd967 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectDecoratorImpl.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.MethodAdvice;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.services.AspectDecorator;
-import org.apache.tapestry.ioc.services.AspectInterceptorBuilder;
-import org.apache.tapestry.ioc.services.Builtin;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.MethodAdvice;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.services.AspectDecorator;
+import org.apache.tapestry5.ioc.services.AspectInterceptorBuilder;
+import org.apache.tapestry5.ioc.services.Builtin;
+import org.apache.tapestry5.ioc.services.ClassFactory;
import java.lang.reflect.Method;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
index 8fcf3fb..c41294b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImpl.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Invocation;
-import org.apache.tapestry.ioc.MethodAdvice;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.internal.util.OneShotLock;
-import org.apache.tapestry.ioc.services.*;
-import org.apache.tapestry.ioc.util.BodyBuilder;
+import org.apache.tapestry5.ioc.Invocation;
+import org.apache.tapestry5.ioc.MethodAdvice;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.OneShotLock;
+import org.apache.tapestry5.ioc.services.*;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
index 2569cad..40abdbd 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilder.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.ioc.services.ClassFab;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.MethodIterator;
-import org.apache.tapestry.ioc.services.MethodSignature;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.services.ClassFab;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.MethodIterator;
+import org.apache.tapestry5.ioc.services.MethodSignature;
import org.slf4j.Logger;
import static java.lang.String.format;
@@ -28,7 +28,7 @@
import java.util.List;
/**
- * Used by the {@link org.apache.tapestry.ioc.internal.services.PipelineBuilderImpl} to create bridge classes and to
+ * Used by the {@link org.apache.tapestry5.ioc.internal.services.PipelineBuilderImpl} to create bridge classes and to
* create instances of bridge classes. A bridge class implements the <em>service</em> interface. Within the chain,
* bridge 1 is passed to filter 1. Invoking methods on bridge 1 will invoke methods on filter 2.
*/
@@ -234,4 +234,4 @@
classFab.addMethod(Modifier.PUBLIC, ms, buffer.toString());
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
index 35c1e46..0f4c043 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImpl.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
-import org.apache.tapestry.ioc.services.*;
-import org.apache.tapestry.ioc.util.BodyBuilder;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newConcurrentMap;
+import org.apache.tapestry5.ioc.services.*;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
import static java.lang.String.format;
import java.lang.reflect.Constructor;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassFabImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassFabImpl.java
index f71904a..79e7a6f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassFabImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassFabImpl.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
import javassist.*;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
-import org.apache.tapestry.ioc.internal.util.Defense;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ClassFab;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
-import org.apache.tapestry.ioc.services.MethodIterator;
-import org.apache.tapestry.ioc.services.MethodSignature;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newSet;
+import org.apache.tapestry5.ioc.internal.util.Defense;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ClassFab;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.ioc.services.MethodIterator;
+import org.apache.tapestry5.ioc.services.MethodSignature;
import org.slf4j.Logger;
import static java.lang.String.format;
@@ -32,7 +32,7 @@
import java.util.Set;
/**
- * Implementation of {@link org.apache.tapestry.ioc.services.ClassFab}. Hides, as much as possible, the underlying
+ * Implementation of {@link org.apache.tapestry5.ioc.services.ClassFab}. Hides, as much as possible, the underlying
* library (Javassist).
*/
public class ClassFabImpl extends AbstractFab implements ClassFab
@@ -329,4 +329,4 @@
description.append("\n");
description.append(body);
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassFactoryClassPool.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassFactoryClassPool.java
index 8555849..a57882d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassFactoryClassPool.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassFactoryClassPool.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
import javassist.*;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newSet;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
import java.util.Map;
import java.util.Set;
@@ -112,4 +112,4 @@
l = l.getParent();
}
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassFactoryImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassFactoryImpl.java
index b31fe8c..f693c7f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassFactoryImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassFactoryImpl.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
import javassist.CtClass;
import javassist.CtConstructor;
import javassist.CtMethod;
-import org.apache.tapestry.ioc.Location;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ClassFab;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.Location;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ClassFab;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.ioc.services.ClassFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,7 +30,7 @@
import java.lang.reflect.Method;
/**
- * Implementation of {@link org.apache.tapestry.ioc.services.ClassFactory}.
+ * Implementation of {@link org.apache.tapestry5.ioc.services.ClassFactory}.
*/
public class ClassFactoryImpl implements ClassFactory
{
@@ -219,4 +219,4 @@
return new StringLocation(builder.toString(), lineNumber);
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
index 48d5cfc..e9d8d5d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImpl.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ClassNameLocator;
-import org.apache.tapestry.ioc.util.Stack;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ClassNameLocator;
+import org.apache.tapestry5.ioc.util.Stack;
import java.io.*;
import java.net.JarURLConnection;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
index cb7e493..c435371 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ClassPropertyAdapterImpl.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
-import org.apache.tapestry.ioc.internal.util.GenericsUtils;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
+import org.apache.tapestry5.ioc.internal.util.GenericsUtils;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ClassPropertyAdapter;
+import org.apache.tapestry5.ioc.services.PropertyAdapter;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
index 0e9238a..f66e090 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CompoundCoercion.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.services.Coercion;
+import org.apache.tapestry5.ioc.services.Coercion;
/**
* Combines two coercions to create a coercsion through an intermediate type.
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CtClassSource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CtClassSource.java
index efabdd5..aac6235 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CtClassSource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CtClassSource.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
import javassist.CtClass;
/**
* Used when generating new classes on the fly.
*
- * @see org.apache.tapestry.ioc.services.ClassFactory
+ * @see org.apache.tapestry5.ioc.services.ClassFactory
*/
public interface CtClassSource
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CtClassSourceImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CtClassSourceImpl.java
index 42fae15..1059bd2 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CtClassSourceImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/CtClassSourceImpl.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
import javassist.CtClass;
import javassist.NotFoundException;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
import java.security.ProtectionDomain;
@@ -118,4 +118,4 @@
ex.printStackTrace(System.err);
}
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
index bd932e6..617c83b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImpl.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newConcurrentMap;
-import org.apache.tapestry.ioc.services.*;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newConcurrentMap;
+import org.apache.tapestry5.ioc.services.*;
import static java.lang.String.format;
import java.util.Map;
@@ -91,4 +91,4 @@
return cf.createClass();
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
index 60555c3..089d61e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalysisImpl.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.services.ExceptionAnalysis;
-import org.apache.tapestry.ioc.services.ExceptionInfo;
+import org.apache.tapestry5.ioc.services.ExceptionAnalysis;
+import org.apache.tapestry5.ioc.services.ExceptionInfo;
import static java.util.Collections.unmodifiableList;
import java.util.List;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
index c1e85da..5eb448d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImpl.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
-import org.apache.tapestry.ioc.services.*;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.*;
+import org.apache.tapestry5.ioc.services.*;
import java.util.Collections;
import java.util.List;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
index 607fd5c..51820c3 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionInfoImpl.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ExceptionInfo;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ExceptionInfo;
import static java.util.Collections.unmodifiableList;
import java.util.List;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
index 3d29800..a1ab520 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImpl.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.ExceptionTracker;
+import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.ExceptionTracker;
import java.util.Set;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/FilterMethodAnalyzer.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/FilterMethodAnalyzer.java
index 60d3d8f..f2d553e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/FilterMethodAnalyzer.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/FilterMethodAnalyzer.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.services.MethodSignature;
+import org.apache.tapestry5.ioc.services.MethodSignature;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.services.PipelineBuilderImpl} to analyze service interface methods
+ * Used by {@link org.apache.tapestry5.ioc.internal.services.PipelineBuilderImpl} to analyze service interface methods
* against filter interface methods to find the position of the extra service parameter (in the filter method).
*/
public class FilterMethodAnalyzer
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
index e8b8935..5df5d7a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreator.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.internal.EagerLoadServiceProxy;
-import org.apache.tapestry.ioc.internal.ServiceActivityTracker;
-import org.apache.tapestry.ioc.services.RegistryShutdownListener;
-import org.apache.tapestry.ioc.services.Status;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.internal.EagerLoadServiceProxy;
+import org.apache.tapestry5.ioc.internal.ServiceActivityTracker;
+import org.apache.tapestry5.ioc.services.RegistryShutdownListener;
+import org.apache.tapestry5.ioc.services.Status;
/**
* Invoked from a fabricated service delegate to get or realize (instantiate and configure) the service implementation.
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
index 096923d..3e147d3 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingAdvice.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Invocation;
-import org.apache.tapestry.ioc.MethodAdvice;
-import org.apache.tapestry.ioc.services.ExceptionTracker;
+import org.apache.tapestry5.ioc.Invocation;
+import org.apache.tapestry5.ioc.MethodAdvice;
+import org.apache.tapestry5.ioc.services.ExceptionTracker;
import org.slf4j.Logger;
public class LoggingAdvice implements MethodAdvice
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
index a6c1ec4..6722911 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImpl.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.MethodAdvice;
-import org.apache.tapestry.ioc.services.AspectDecorator;
-import org.apache.tapestry.ioc.services.ExceptionTracker;
-import org.apache.tapestry.ioc.services.LoggingDecorator;
+import org.apache.tapestry5.ioc.MethodAdvice;
+import org.apache.tapestry5.ioc.services.AspectDecorator;
+import org.apache.tapestry5.ioc.services.ExceptionTracker;
+import org.apache.tapestry5.ioc.services.LoggingDecorator;
import org.slf4j.Logger;
public class LoggingDecoratorImpl implements LoggingDecorator
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
index f76ac61..749f3db 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MapSymbolProvider.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.services.SymbolProvider;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
import java.util.Map;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
index c155037..1aabacd 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImpl.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.services.MasterObjectProvider;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
+import org.apache.tapestry5.ioc.services.MasterObjectProvider;
import java.util.List;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodLogger.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodLogger.java
index 7c80d3b..468f609 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodLogger.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodLogger.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Invocation;
-import org.apache.tapestry.ioc.services.ExceptionTracker;
+import org.apache.tapestry5.ioc.Invocation;
+import org.apache.tapestry5.ioc.services.ExceptionTracker;
import org.slf4j.Logger;
import static java.lang.String.format;
import java.util.Iterator;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.services.LoggingDecoratorImpl} to delegate out logging behavior to a
+ * Used by {@link org.apache.tapestry5.ioc.internal.services.LoggingDecoratorImpl} to delegate out logging behavior to a
* seperate object.
*/
public final class MethodLogger
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
index 28e333f..406e543 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceCreator.java
@@ -15,10 +15,10 @@
/**
*
*/
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.services.PerthreadManager;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.services.PerthreadManager;
/**
* Provides per-thread implementations of services.
@@ -36,9 +36,9 @@
}
/**
- * For each thread, the first call will use the delegate {@link org.apache.tapestry.ioc.ObjectCreator} to create an
+ * For each thread, the first call will use the delegate {@link org.apache.tapestry5.ioc.ObjectCreator} to create an
* instance, and later calls will reuse the same per-thread instance. The instance is stored in the {@link
- * org.apache.tapestry.ioc.services.PerthreadManager} and will be released at the end of the request.
+ * org.apache.tapestry5.ioc.services.PerthreadManager} and will be released at the end of the request.
*/
public Object createObject()
{
@@ -54,4 +54,4 @@
return perthreadInstance;
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
index c81d022..1ed1651 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerThreadServiceLifecycle.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceLifecycle;
-import org.apache.tapestry.ioc.ServiceResources;
-import org.apache.tapestry.ioc.services.*;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ServiceLifecycle;
+import org.apache.tapestry5.ioc.ServiceResources;
+import org.apache.tapestry5.ioc.services.*;
import static java.lang.String.format;
import java.lang.reflect.Constructor;
@@ -26,7 +26,7 @@
/**
* Allows a service to exist "per thread" (in each thread). This involves an inner proxy, which caches an object derived
- * from a {@link org.apache.tapestry.ioc.ObjectCreator} as a key in the {@link org.apache.tapestry.ioc.services.PerthreadManager}.
+ * from a {@link org.apache.tapestry5.ioc.ObjectCreator} as a key in the {@link org.apache.tapestry5.ioc.services.PerthreadManager}.
* Method invocations are delegated to the per-thread service instance.
* <p/>
* This scheme ensures that, although the service builder method will be invoked many times over the life of the
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
index bc0b5c7..6178dd8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.PerthreadManager;
-import org.apache.tapestry.ioc.services.ThreadCleanupListener;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.PerthreadManager;
+import org.apache.tapestry5.ioc.services.ThreadCleanupListener;
import org.slf4j.Logger;
import java.util.List;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
index a94a262..a27717c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImpl.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.services.Builtin;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.DefaultImplementationBuilder;
-import org.apache.tapestry.ioc.services.PipelineBuilder;
+import org.apache.tapestry5.ioc.services.Builtin;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.DefaultImplementationBuilder;
+import org.apache.tapestry5.ioc.services.PipelineBuilder;
import org.slf4j.Logger;
import java.util.List;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
index a2d36c3..964f643 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImpl.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
-import org.apache.tapestry.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.ClassPropertyAdapter;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
index 7f3c5f8..d488f85 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyAdapterImpl.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.services.PropertyAdapter;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
index ef62aee..f886d4f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PropertyShadowBuilderImpl.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.services.*;
+import org.apache.tapestry5.ioc.services.*;
import static java.lang.String.format;
import java.lang.reflect.Constructor;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
index 7e8f8ca..703a256 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImpl.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newThreadSafeList;
-import org.apache.tapestry.ioc.internal.util.OneShotLock;
-import org.apache.tapestry.ioc.services.RegistryShutdownHub;
-import org.apache.tapestry.ioc.services.RegistryShutdownListener;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newThreadSafeList;
+import org.apache.tapestry5.ioc.internal.util.OneShotLock;
+import org.apache.tapestry5.ioc.services.RegistryShutdownHub;
+import org.apache.tapestry5.ioc.services.RegistryShutdownListener;
import org.slf4j.Logger;
import java.util.List;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
index f379b65..a6b3d0c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/RegistryStartup.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.internal.util.OneShotLock;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.internal.util.OneShotLock;
import org.slf4j.Logger;
import java.util.List;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceMessages.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceMessages.java
index 86ccd4c..5407c02 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceMessages.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ServiceMessages.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
import javassist.CtClass;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
-import org.apache.tapestry.ioc.services.Coercion;
-import org.apache.tapestry.ioc.services.MethodSignature;
-import org.apache.tapestry.ioc.services.ThreadCleanupListener;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.ioc.services.Coercion;
+import org.apache.tapestry5.ioc.services.MethodSignature;
+import org.apache.tapestry5.ioc.services.ThreadCleanupListener;
final class ServiceMessages
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
index 5847adf..d5678b8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImpl.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.services.*;
-import org.apache.tapestry.ioc.util.BodyBuilder;
-import org.apache.tapestry.ioc.util.StrategyRegistry;
+import org.apache.tapestry5.ioc.services.*;
+import org.apache.tapestry5.ioc.util.BodyBuilder;
+import org.apache.tapestry5.ioc.util.StrategyRegistry;
import java.lang.reflect.Modifier;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
index 25204f4..3a94d04 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/StringLocation.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Resource;
/**
* Implementation of {@link Location} used when the underlying resource isn't really known.
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
index 818cf32..5c5a847 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProvider.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.annotation.IntermediateType;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.ioc.services.Builtin;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.ioc.services.TypeCoercer;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
+import org.apache.tapestry5.ioc.annotations.IntermediateType;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.ioc.services.Builtin;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
/**
* Performs an injection based on a {@link Symbol} annotation.
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
index 328ced8..0f37db7 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImpl.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newLinkedList;
-import org.apache.tapestry.ioc.services.SymbolProvider;
-import org.apache.tapestry.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newLinkedList;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
+import org.apache.tapestry5.ioc.services.SymbolSource;
import java.util.LinkedList;
import java.util.List;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
index 24886e9..023f785 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/SystemPropertiesSymbolProvider.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.services.SymbolProvider;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
/**
- * Obtains symbol values from JVM System properties. This implementation is usually ordered first,
- * so that explicit overrides, provided as JVM system properties, can take effect.
+ * Obtains symbol values from JVM System properties. This implementation is usually ordered first, so that explicit
+ * overrides, provided as JVM system properties, can take effect.
*/
public class SystemPropertiesSymbolProvider implements SymbolProvider
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
index b79e671..926e990 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImpl.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotation.Scope;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.services.ThreadLocale;
+import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.services.ThreadLocale;
import java.util.Locale;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
index 36e7466..1bb6916 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImpl.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import org.apache.tapestry.ioc.internal.util.InheritanceSearch;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
-import org.apache.tapestry.ioc.services.Coercion;
-import org.apache.tapestry.ioc.services.CoercionTuple;
-import org.apache.tapestry.ioc.services.TypeCoercer;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.*;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.internal.util.InheritanceSearch;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.ioc.services.Coercion;
+import org.apache.tapestry5.ioc.services.CoercionTuple;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
import java.util.*;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
index 35bb5cf..828c669 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProvider.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.annotation.IntermediateType;
-import org.apache.tapestry.ioc.annotation.Value;
-import org.apache.tapestry.ioc.services.Builtin;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.ioc.services.TypeCoercer;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
+import org.apache.tapestry5.ioc.annotations.IntermediateType;
+import org.apache.tapestry5.ioc.annotations.Value;
+import org.apache.tapestry5.ioc.services.Builtin;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
/**
* Provides an object when the {@link Value} annotation is present. The string value has symbols expanded, and then is
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
index 441b42e..e59f0d7 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/AbstractResource.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Resource;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.Resource;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
import java.io.BufferedInputStream;
import java.io.IOException;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
index 1dd0c53..345aab1 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ClasspathResource.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Resource;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
+import org.apache.tapestry5.ioc.Resource;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
import java.net.URL;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/CollectionFactory.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/CollectionFactory.java
index 7bf3ab5..2bc5c0f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/CollectionFactory.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/CollectionFactory.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.util.CaseInsensitiveMap;
-import org.apache.tapestry.ioc.util.Stack;
+import org.apache.tapestry5.ioc.util.CaseInsensitiveMap;
+import org.apache.tapestry5.ioc.util.Stack;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
index 541e437..565af9a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrier.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReadWriteLock;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Defense.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Defense.java
index 57f282b..ae6f069 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Defense.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Defense.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
* Static utility methods for defensive programming.
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DependencyNode.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DependencyNode.java
index b009684..04ca3e5 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DependencyNode.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/DependencyNode.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Orderable;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.Orderable;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
import org.slf4j.Logger;
import java.util.List;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.util.Orderer} to establish backward dependencies for {@link
- * org.apache.tapestry.ioc.Orderable} objects.
+ * Used by {@link org.apache.tapestry5.ioc.internal.util.Orderer} to establish backward dependencies for {@link
+ * org.apache.tapestry5.ioc.Orderable} objects.
*
* @param <T>
*/
@@ -134,4 +134,4 @@
list.add(orderable);
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
index cce8403..f0c3750 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/GenericsUtils.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdAllocator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdAllocator.java
index 70280fc..22b4f3a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdAllocator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/IdAllocator.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
import java.util.HashMap;
import java.util.IdentityHashMap;
@@ -182,4 +182,4 @@
{
generatorMap.clear();
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
index 3812e90..bdd6d1e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearch.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
import java.util.Iterator;
import java.util.LinkedList;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
index f5f51da..c299312 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.Locatable;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.annotation.InjectService;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.Locatable;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.InjectService;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import org.apache.tapestry5.ioc.services.ClassFactory;
import java.io.Closeable;
import java.io.IOException;
@@ -450,7 +450,7 @@
* Searches a class for the "best" constructor, the public constructor with the most parameters. Returns null if
* there are no public constructors. If there is more than one constructor with the maximum number of parameters, it
* is not determined which will be returned (don't build a class like that!). In addition, if a constructor is
- * annotated with {@link org.apache.tapestry.ioc.annotation.Inject}, it will be used (no check for multiple such
+ * annotated with {@link org.apache.tapestry5.ioc.annotations.Inject}, it will be used (no check for multiple such
* constructors is made, only at most a single constructor should have the annotation).
*
* @param clazz to search for a constructor for
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Invokable.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Invokable.java
index 8fc43cb..3ea883e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Invokable.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Invokable.java
@@ -1,26 +1,25 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.internal.util;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.internal.util;
/**
- * Similiar to {@link Runnable} execpt that it returns a value. Used by {@link ConcurrentBarrier} to
- * identify the block of code to execute with read/write lock protection.
+ * Similiar to {@link Runnable} execpt that it returns a value. Used by {@link ConcurrentBarrier} to identify the block
+ * of code to execute with read/write lock protection.
*
- * @param <T>
- * the return value type
+ * @param <T> the return value type
*/
public interface Invokable<T>
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocalizedNameGenerator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocalizedNameGenerator.java
index d7f3a16..81df3e2 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocalizedNameGenerator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocalizedNameGenerator.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
import java.util.Iterator;
import java.util.Locale;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
index c0f1622..211ca3b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/LocationImpl.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Resource;
import java.util.Formatter;
/**
- * Implementation class for {@link org.apache.tapestry.ioc.Location}.
+ * Implementation class for {@link org.apache.tapestry5.ioc.Location}.
*/
public final class LocationImpl implements Location
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
index e9c1e92..add2429 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImpl.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.MessageFormatter;
+import org.apache.tapestry5.ioc.MessageFormatter;
import java.util.Locale;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
index 49413fb..0c542a8 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/MessagesImpl.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.util.AbstractMessages;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.util.AbstractMessages;
import java.util.Enumeration;
import java.util.Locale;
@@ -23,7 +23,7 @@
import java.util.ResourceBundle;
/**
- * Implementation of {@link org.apache.tapestry.ioc.Messages} based around a {@link java.util.ResourceBundle}.
+ * Implementation of {@link org.apache.tapestry5.ioc.Messages} based around a {@link java.util.ResourceBundle}.
*/
public class MessagesImpl extends AbstractMessages
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/OneShotLock.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/OneShotLock.java
index 9948b61..18b2851 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/OneShotLock.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/OneShotLock.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
* Logic for handling one shot semantics for classes; classes that include a method (or methods) that "locks down" the
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
index 7bff8db..90666f3 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Orderer.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.IdMatcher;
-import org.apache.tapestry.ioc.Orderable;
-import org.apache.tapestry.ioc.internal.IdMatcherImpl;
-import org.apache.tapestry.ioc.internal.OrIdMatcher;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.IdMatcher;
+import org.apache.tapestry5.ioc.Orderable;
+import org.apache.tapestry5.ioc.internal.IdMatcherImpl;
+import org.apache.tapestry5.ioc.internal.OrIdMatcher;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
import org.slf4j.Logger;
import java.util.Collection;
@@ -239,4 +239,4 @@
return matchers.size() == 1 ? matchers.get(0) : new OrIdMatcher(matchers);
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
index d2f61f4..12ffbe4 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/TapestryException.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Locatable;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Locatable;
+import org.apache.tapestry5.ioc.Location;
/**
* Exception class used as a replacement for {@link java.lang.RuntimeException} when the exception is related to a
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/UtilMessages.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/UtilMessages.java
index 5fae7a6..8cee99e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/UtilMessages.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/UtilMessages.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Messages;
+import org.apache.tapestry5.ioc.Messages;
class UtilMessages
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/idToDependencyNode.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/idToDependencyNode.java
index 5c32aae..103e648 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/idToDependencyNode.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/idToDependencyNode.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.IdMatcher;
-import org.apache.tapestry.ioc.Orderable;
-import org.apache.tapestry.ioc.internal.IdMatcherImpl;
-import org.apache.tapestry.ioc.internal.OrIdMatcher;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.IdMatcher;
+import org.apache.tapestry5.ioc.Orderable;
+import org.apache.tapestry5.ioc.internal.IdMatcherImpl;
+import org.apache.tapestry5.ioc.internal.OrIdMatcher;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
import org.slf4j.Logger;
import java.util.Collection;
@@ -106,7 +106,7 @@
* @param id unique, qualified id for the target
* @param target the object to be ordered (or null as a placeholder)
* @param constraints optional, variable constraints
- * @see #add(org.apache.tapestry.ioc.Orderable)
+ * @see #add(org.apache.tapestry5.ioc.Orderable)
*/
public void add(String id, T target, String... constraints)
@@ -239,4 +239,4 @@
return matchers.size() == 1 ? matchers.get(0) : new OrIdMatcher(matchers);
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ApplicationDefaults.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ApplicationDefaults.java
index 028685d..97cacf0 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ApplicationDefaults.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ApplicationDefaults.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -22,13 +22,13 @@
import java.lang.annotation.Target;
/**
- * Used to disambiguate which version of {@link SymbolProvider} is being referenced. Contributions
- * to the ApplicationDefaults symbol source are overridden by JVM System properties.
+ * Used to disambiguate which version of {@link SymbolProvider} is being referenced. Contributions to the
+ * ApplicationDefaults symbol source are overridden by JVM System properties.
*
* @see FactoryDefaults
*/
@Target(
- {PARAMETER, FIELD})
+ { PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
public @interface ApplicationDefaults
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/AspectDecorator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/AspectDecorator.java
index 6bbf24d..81cc345 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/AspectDecorator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/AspectDecorator.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.MethodAdvice;
+import org.apache.tapestry5.ioc.MethodAdvice;
/**
* A decorator used to create an interceptor that delegates each method's invocation to an {@link
- * org.apache.tapestry.ioc.MethodAdvice} for advice. Advice can inspect or change method parameters, inspect or change
+ * org.apache.tapestry5.ioc.MethodAdvice} for advice. Advice can inspect or change method parameters, inspect or change
* the method's return value, and inspect and change thrown exceptions (checked and unchecked).
*/
public interface AspectDecorator
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/AspectInterceptorBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/AspectInterceptorBuilder.java
index 203fc07..43f55d6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/AspectInterceptorBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/AspectInterceptorBuilder.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.MethodAdvice;
+import org.apache.tapestry5.ioc.MethodAdvice;
import java.lang.reflect.Method;
/**
- * A builder may be obtained from the {@link org.apache.tapestry.ioc.services.AspectDecorator} and allows more
+ * A builder may be obtained from the {@link org.apache.tapestry5.ioc.services.AspectDecorator} and allows more
* controlled creation of the created interceptor; it allows different methods to be given different advice, and allows
* methods to be omitted (in which case the method invocation passes through without advice).
*/
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/Builtin.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/Builtin.java
index a4a17e1..ce0bac7 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/Builtin.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/Builtin.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -22,16 +22,15 @@
import java.lang.annotation.Target;
/**
- * Marks services provided by this module that may need to be unambiguously referenced.
- * Injecting with this marker annotation and the correct type ensure that the version defined in
- * this module is used, even if another module provides a service with the same service
- * interface.
+ * Marks services provided by this module that may need to be unambiguously referenced. Injecting with this marker
+ * annotation and the correct type ensure that the version defined in this module is used, even if another module
+ * provides a service with the same service interface.
*/
@Target(
- {PARAMETER, FIELD})
+ { PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
public @interface Builtin
{
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ChainBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ChainBuilder.java
index 8876a37..20279aa 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ChainBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ChainBuilder.java
@@ -1,43 +1,41 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.services;
import java.util.List;
/**
- * A service which can assemble an implementation based on a command interface, and an ordered list
- * of objects implementing that interface (the "commands"). This is an implementation of the Gang of
- * Four Chain Of Command pattern.
+ * A service which can assemble an implementation based on a command interface, and an ordered list of objects
+ * implementing that interface (the "commands"). This is an implementation of the Gang of Four Chain Of Command
+ * pattern.
* <p/>
- * For each method in the interface, the chain implementation will call the corresponding method on
- * each command object in turn (with the order defined by the list). If any of the command objects
- * return true, then the chain of command stops and the initial method invocation returns true.
- * Otherwise, the chain of command continues to the next command (and will return false if none of
- * the commands returns true).
+ * For each method in the interface, the chain implementation will call the corresponding method on each command object
+ * in turn (with the order defined by the list). If any of the command objects return true, then the chain of command
+ * stops and the initial method invocation returns true. Otherwise, the chain of command continues to the next command
+ * (and will return false if none of the commands returns true).
* <p/>
- * For methods whose return type is not boolean, the chain stops with the first non-null (for object
- * types), or non-zero (for numeric types). The chain returns the value that was returned by the
- * command. If the method return type is void, all commands will be invoked.
+ * For methods whose return type is not boolean, the chain stops with the first non-null (for object types), or non-zero
+ * (for numeric types). The chain returns the value that was returned by the command. If the method return type is void,
+ * all commands will be invoked.
* <p/>
* Method invocations will also be terminated if an exception is thrown.
*/
public interface ChainBuilder
{
/**
- * Creates a chain instance from a command interface and a list of commands (implementing the
- * interface).
+ * Creates a chain instance from a command interface and a list of commands (implementing the interface).
*/
<T> T build(Class<T> commandInterface, List<T> commands);
}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassFab.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassFab.java
index 7594791..fb7eba3 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassFab.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassFab.java
@@ -12,41 +12,33 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
/**
* Used when fabricating a new class. Represents a wrapper around the Javassist library.
* <p/>
- * The core concept of Javassist is how method bodies (as well as constructor bodies, etc.) are
- * specified ... as a very Java-like scripting language. Details are available at the <a
- * href="http://jboss.org/products/javassist">Javassist home page</a>.
+ * The core concept of Javassist is how method bodies (as well as constructor bodies, etc.) are specified ... as a very
+ * Java-like scripting language. Details are available at the <a href="http://jboss.org/products/javassist">Javassist
+ * home page</a>.
* <p/>
- * Method bodies look largely like Java. References to java classes must be fully qualified. Several
- * special variables are used:
- * <ul>
- * <li><code>$0</code> first parameter, equivalent to <code>this</code> in Java code (and can't
- * be used when creating a static method)
- * <li><code>$1, $2, ...</code> actual parameters to the method
- * <li><code>$args</code> all the parameters as an <code>Object[]</code>
- * <li><code>$r</code> the return type of the method, typically used as
- * <code>return ($r) ...</code>. <code>$r</code> is valid with method that return
- * <code>void</code>. This also handles conversions between wrapper types and primitive types.
- * <li><code>$w</code> conversion from primitive type to wrapper type, used as
- * <code>($w) foo()</code> where <code>foo()</code> returns a primitive type and a wrapper type
- * is needed
- * <li>
- * </ul>
+ * Method bodies look largely like Java. References to java classes must be fully qualified. Several special variables
+ * are used: <ul> <li><code>$0</code> first parameter, equivalent to <code>this</code> in Java code (and can't be used
+ * when creating a static method) <li><code>$1, $2, ...</code> actual parameters to the method <li><code>$args</code>
+ * all the parameters as an <code>Object[]</code> <li><code>$r</code> the return type of the method, typically used as
+ * <code>return ($r) ...</code>. <code>$r</code> is valid with method that return <code>void</code>. This also handles
+ * conversions between wrapper types and primitive types. <li><code>$w</code> conversion from primitive type to wrapper
+ * type, used as <code>($w) foo()</code> where <code>foo()</code> returns a primitive type and a wrapper type is needed
+ * <li> </ul>
* <p/>
* ClassFab instances are not thread safe.
* <p/>
- * ClassFab instances are created by a {@link org.apache.tapestry.ioc.services.ClassFactory}.
+ * ClassFab instances are created by a {@link org.apache.tapestry5.ioc.services.ClassFactory}.
*/
public interface ClassFab
{
/**
- * Adds the specified interface as an interface implemented by this class. It is not an error to
- * invoke this method multiple times with the same interface class (and the interface is only
- * added once).
+ * Adds the specified interface as an interface implemented by this class. It is not an error to invoke this method
+ * multiple times with the same interface class (and the interface is only added once).
*/
void addInterface(Class interfaceClass);
@@ -67,8 +59,8 @@
* @param signature defines the name, return type, parameters and exceptions thrown
* @param body The body of the method.
* @return a method fabricator, used to add catch handlers.
- * @throws RuntimeException if a method with that signature has already been added, or if there is a
- * Javassist compilation error
+ * @throws RuntimeException if a method with that signature has already been added, or if there is a Javassist
+ * compilation error
*/
void addMethod(int modifiers, MethodSignature signature, String body);
@@ -87,29 +79,26 @@
void addToString(String toString);
/**
- * Makes the fabricated class implement the provided service interface. The interface will be
- * added, and all methods in the interface will be delegate wrappers. If toString() is not part
- * of the delegate interface, then an implementation will be supplied that returns the provided
- * string. This method is used when creating objects that proxy their behavior to some other
- * object.
+ * Makes the fabricated class implement the provided service interface. The interface will be added, and all methods
+ * in the interface will be delegate wrappers. If toString() is not part of the delegate interface, then an
+ * implementation will be supplied that returns the provided string. This method is used when creating objects that
+ * proxy their behavior to some other object.
*
* @param serviceInterface the interface to implement
- * @param delegateExpression the expression used to find the delegate on which methods should be invoked.
- * Typically a field name, such as "_delegate", or a method to invoke, such as
- * "_service()".
+ * @param delegateExpression the expression used to find the delegate on which methods should be invoked. Typically
+ * a field name, such as "_delegate", or a method to invoke, such as "_service()".
* @param toString fixed value to be returned as the description of the resultant object
*/
void proxyMethodsToDelegate(Class serviceInterface, String delegateExpression, String toString);
/**
- * Invoked last to create the class. This will enforce that all abstract methods have been
- * implemented in the (concrete) class.
+ * Invoked last to create the class. This will enforce that all abstract methods have been implemented in the
+ * (concrete) class.
*/
Class createClass();
/**
- * Adds a public no-op method. The method will return null, false, or zero as per the return
- * type (if not void).
+ * Adds a public no-op method. The method will return null, false, or zero as per the return type (if not void).
*/
void addNoOpMethod(MethodSignature signature);
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassFabUtils.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassFabUtils.java
index 5d353bc..5f89a2d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassFabUtils.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassFabUtils.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.ObjectCreator;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
import static java.lang.String.format;
import java.lang.reflect.Method;
@@ -24,7 +24,7 @@
import java.util.concurrent.atomic.AtomicLong;
/**
- * Handy method useful when creating new classes using {@link org.apache.tapestry.ioc.services.ClassFab}.
+ * Handy method useful when creating new classes using {@link org.apache.tapestry5.ioc.services.ClassFab}.
*/
public final class ClassFabUtils
{
@@ -228,7 +228,7 @@
}
/**
- * Creates a proxy for a given service interface around an {@link org.apache.tapestry.ioc.ObjectCreator} that can
+ * Creates a proxy for a given service interface around an {@link org.apache.tapestry5.ioc.ObjectCreator} that can
* provide (on demand) an object (implementing the service interface) to delegate to. The ObjectCreator will be
* invoked on every method invocation (if it is caching, that should be internal to its implementation).
*
@@ -268,4 +268,4 @@
throw new RuntimeException(ex.getMessage(), ex);
}
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassFactory.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassFactory.java
index 96ae66f..056bc8a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassFactory.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassFactory.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
@@ -25,32 +25,30 @@
public interface ClassFactory
{
/**
- * Simplified version of {@link #newClass(String, Class)} that generates a name based on the
- * service interface name, extends from java.lang.Object, and automatically adds the
- * serviceInterface to the returned ClassFab. This is the most common use when creating the
- * kinds of proxies used throughout Tapestry IoC.
+ * Simplified version of {@link #newClass(String, Class)} that generates a name based on the service interface name,
+ * extends from java.lang.Object, and automatically adds the serviceInterface to the returned ClassFab. This is the
+ * most common use when creating the kinds of proxies used throughout Tapestry IoC.
*
* @param serviceInterface
*/
ClassFab newClass(Class serviceInterface);
/**
- * Creates a {@link ClassFab} object for the given name; the new class is a subclass of the
- * indicated class. The new class is always public and concrete.
+ * Creates a {@link ClassFab} object for the given name; the new class is a subclass of the indicated class. The new
+ * class is always public and concrete.
*
- * @param name the full qualified name of the class to create (note that it is common to place
- * created classes in the default package)
+ * @param name the full qualified name of the class to create (note that it is common to place created classes
+ * in the default package)
* @param superClass the parent class, which is often java.lang.Object
*/
ClassFab newClass(String name, Class superClass);
/**
- * Imports the class to make it referenceable within the factory. The class loader for the class
- * is added to the class path. The class itself is returned, if its bytecode is available. If
- * not, a search up the inhertance occurs until a proper class (that can be referenced in
- * generated bytecode) is found. This is necessary to handle cases where a class is generated at
- * runtime, outside of the class factory, and bytecode is not available for it.
+ * Imports the class to make it referenceable within the factory. The class loader for the class is added to the
+ * class path. The class itself is returned, if its bytecode is available. If not, a search up the inhertance occurs
+ * until a proper class (that can be referenced in generated bytecode) is found. This is necessary to handle cases
+ * where a class is generated at runtime, outside of the class factory, and bytecode is not available for it.
*
* @param clazz
* @return a referencable super-class
@@ -64,14 +62,13 @@
int getCreatedClassCount();
/**
- * Returns the class loader used when creating new classes; this is generally the same as the
- * current thread's context class loader (except perhaps during testing).
+ * Returns the class loader used when creating new classes; this is generally the same as the current thread's
+ * context class loader (except perhaps during testing).
*/
ClassLoader getClassLoader();
/**
- * Converts a method to a {@link Location}, which includes information about the source
- * file name and line number.
+ * Converts a method to a {@link Location}, which includes information about the source file name and line number.
*
* @param method to look up
* @return the location, or null if the necessary information is not available
@@ -79,8 +76,8 @@
Location getMethodLocation(Method method);
/**
- * Return a string representation fo the constructor (including class and parameters) and (if
- * available) file name and line number.
+ * Return a string representation fo the constructor (including class and parameters) and (if available) file name
+ * and line number.
*/
Location getConstructorLocation(Constructor constructor);
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassNameLocator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassNameLocator.java
index e761fa9..06c5d15 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassNameLocator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassNameLocator.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
import java.util.Collection;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassPropertyAdapter.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassPropertyAdapter.java
index 4ebc52c..02c9f67 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassPropertyAdapter.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ClassPropertyAdapter.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
import java.util.List;
/**
- * Organizes all {@link org.apache.tapestry.ioc.services.PropertyAdapter}s for a particular class.
+ * Organizes all {@link org.apache.tapestry5.ioc.services.PropertyAdapter}s for a particular class.
* <p/>
* Only provides access to <em>simple</em> properties. Indexed properties are ignored.
* <p/>
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/Coercion.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/Coercion.java
index 35cb4dc..77c5ea1 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/Coercion.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/Coercion.java
@@ -1,27 +1,24 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.services;
/**
- * Responsible for converting from one type to another. This is used primarily around component
- * parameters.
+ * Responsible for converting from one type to another. This is used primarily around component parameters.
*
- * @param <S>
- * the source type (input)
- * @param <T>
- * the target type (output)
+ * @param <S> the source type (input)
+ * @param <T> the target type (output)
*/
public interface Coercion<S, T>
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
index 302d871..1290ab1 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/CoercionTuple.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
/**
* An immutable object that represents a mapping from one type to another. This is also the contribution type when
- * building the {@link org.apache.tapestry.ioc.services.TypeCoercer} service. Wraps a {@link
- * org.apache.tapestry.ioc.services.Coercion} object that performs the work with additional properties that describe the
- * input and output types of the coercion, needed when searching for an appropriate coercion (or sequence of
+ * building the {@link org.apache.tapestry5.ioc.services.TypeCoercer} service. Wraps a {@link
+ * org.apache.tapestry5.ioc.services.Coercion} object that performs the work with additional properties that describe
+ * the input and output types of the coercion, needed when searching for an appropriate coercion (or sequence of
* coercions).
*
* @param <S> source (input) type
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/DefaultImplementationBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/DefaultImplementationBuilder.java
index 7641efd..177fb9b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/DefaultImplementationBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/DefaultImplementationBuilder.java
@@ -1,30 +1,30 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.services;
/**
* Creates default implementatons of a class.
*
- * @see org.apache.tapestry.ioc.services.ClassFab#addNoOpMethod(MethodSignature)
+ * @see org.apache.tapestry5.ioc.services.ClassFab#addNoOpMethod(MethodSignature)
*/
public interface DefaultImplementationBuilder
{
/**
- * Creates a new implementation of the provided interface. Each method in the interface will be
- * implemented as a noop method. The method will ignore any parameters and return null, or 0, or
- * false (or return nothing if the method is void).
+ * Creates a new implementation of the provided interface. Each method in the interface will be implemented as a
+ * noop method. The method will ignore any parameters and return null, or 0, or false (or return nothing if the
+ * method is void).
*
* @param <S>
* @param serviceInterface
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionAnalysis.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionAnalysis.java
index e62764f..2418a46 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionAnalysis.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionAnalysis.java
@@ -1,18 +1,18 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.services;
import java.util.List;
@@ -24,8 +24,7 @@
public interface ExceptionAnalysis
{
/**
- * Returns the analyzed exception info for each exception. The are ordered outermost exception
- * to innermost.
+ * Returns the analyzed exception info for each exception. The are ordered outermost exception to innermost.
*/
List<ExceptionInfo> getExceptionInfos();
}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionAnalyzer.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionAnalyzer.java
index 762d962..308066d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionAnalyzer.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionAnalyzer.java
@@ -1,22 +1,22 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.services;
/**
- * Analyzes an exception, providing an analysis. The analysis easily exposes properties of the
- * exception, the stack trace, and nested exceptions.
+ * Analyzes an exception, providing an analysis. The analysis easily exposes properties of the exception, the stack
+ * trace, and nested exceptions.
*/
public interface ExceptionAnalyzer
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionInfo.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionInfo.java
index b9197c6..bafe769 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionInfo.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionInfo.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
import java.util.List;
/**
* Contains information about an analyzed exception.
*
- * @see {@link org.apache.tapestry.ioc.services.ExceptionAnalysis}
+ * @see {@link org.apache.tapestry5.ioc.services.ExceptionAnalysis}
*/
public interface ExceptionInfo
{
@@ -44,8 +44,7 @@
Object getProperty(String name);
/**
- * Returns the stack trace elements. Generally this is an empty list except for the deepest
- * exception.
+ * Returns the stack trace elements. Generally this is an empty list except for the deepest exception.
*/
List<StackTraceElement> getStackTrace();
}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionTracker.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionTracker.java
index db42c8c..2557fd6 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionTracker.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ExceptionTracker.java
@@ -1,30 +1,29 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.services;
/**
- * Used by {@link org.apache.tapestry.ioc.services.LoggingDecorator} to track which exceptions have
- * been logged during the current request (the ExceptionTracker is perthread). This keeps redundant
- * information from appearing in the console output.
+ * Used by {@link org.apache.tapestry5.ioc.services.LoggingDecorator} to track which exceptions have been logged during
+ * the current request (the ExceptionTracker is perthread). This keeps redundant information from appearing in the
+ * console output.
*/
public interface ExceptionTracker
{
/**
- * Returns true if the indicated exception has already been logged (it is assumed that the
- * exception will be logged if this method returns false). The exception is recorded for later
- * checks.
+ * Returns true if the indicated exception has already been logged (it is assumed that the exception will be logged
+ * if this method returns false). The exception is recorded for later checks.
*
* @param exception to check
* @return false if the exception has not been previously checked, true otherwise
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/FactoryDefaults.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/FactoryDefaults.java
index 9b63a15..9736241 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/FactoryDefaults.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/FactoryDefaults.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -22,11 +22,11 @@
import java.lang.annotation.Target;
/**
- * Used to disambiguate which version of {@link SymbolProvider} is being referenced. Symbols defined
- * by contributing to FactoryDefaults are overridden by contributions to {@link ApplicationDefaults}.
+ * Used to disambiguate which version of {@link SymbolProvider} is being referenced. Symbols defined by contributing to
+ * FactoryDefaults are overridden by contributions to {@link ApplicationDefaults}.
*/
@Target(
- {PARAMETER, FIELD})
+ { PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
public @interface FactoryDefaults
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java
index 1b765f5..383ca1b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/LoggingDecorator.java
@@ -1,25 +1,25 @@
-// Copyright 2006, 2007 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
+// Copyright 2006, 2007 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.services;
import org.slf4j.Logger;
/**
- * Service that can create a logging interceptor that wraps around a service implementation (or
- * interceptor). The interceptor works with the service's log to log, at debug level, method entry
- * (with arguments), method exit (with return value, if any) as well as any thrown exceptions.
+ * Service that can create a logging interceptor that wraps around a service implementation (or interceptor). The
+ * interceptor works with the service's log to log, at debug level, method entry (with arguments), method exit (with
+ * return value, if any) as well as any thrown exceptions.
*/
public interface LoggingDecorator
{
@@ -31,8 +31,8 @@
* @param delegate existing object to be wrapped
* @param serviceId id of service
* @param logger log used for debug level logging messages by the interceptor
- * @return a new object implementing the interface that can be used in place of the delegate,
- * providing logging behavior around each method call on the service interface
+ * @return a new object implementing the interface that can be used in place of the delegate, providing logging
+ * behavior around each method call on the service interface
*/
<T> T build(Class<T> serviceInterface, T delegate, String serviceId, Logger logger);
}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MasterObjectProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MasterObjectProvider.java
index a04e9fa..e5f4f38 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MasterObjectProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MasterObjectProvider.java
@@ -12,32 +12,30 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
/**
- * Rolls up a number of {@link ObjectProvider}, but allows for the case where no object may be
- * provided.
+ * Rolls up a number of {@link ObjectProvider}, but allows for the case where no object may be provided.
*/
public interface MasterObjectProvider
{
/**
- * Provides an object based on an expression. The process of providing objects occurs within a
- * particular <em>context</em>, which will typically be a service builder method, service
- * contributor method, or service decorator method. The locator parameter provides access to the
- * services visible <em>to that context</em>.
+ * Provides an object based on an expression. The process of providing objects occurs within a particular
+ * <em>context</em>, which will typically be a service builder method, service contributor method, or service
+ * decorator method. The locator parameter provides access to the services visible <em>to that context</em>.
* <p/>
- * When the value is required and no {@link ObjectProvider} provided a non-null value, then
- * {@link ObjectLocator#getService(Class)} is invoked, to provide a uniquely matching service,
- * or throw a failure exception if no <em>single</em> service can be found.
+ * When the value is required and no {@link ObjectProvider} provided a non-null value, then {@link
+ * ObjectLocator#getService(Class)} is invoked, to provide a uniquely matching service, or throw a failure exception
+ * if no <em>single</em> service can be found.
*
* @param objectType the expected object type
* @param annotationProvider provides access to annotations (typically, the field or parameter to which an
- * injection-related annotation is attached); annotations on the field or parameter
- * may also be used when resolving the desired object
+ * injection-related annotation is attached); annotations on the field or parameter may
+ * also be used when resolving the desired object
* @param locator locator for the <em>context</em> in which the provider is being used
* @param required if true (normal case) a value must be provided; if false then it is allowed for no
* ObjectProvider to provide a value, and this method may return null to indicate the
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MethodIterator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MethodIterator.java
index b5baafa..2070d1d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MethodIterator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MethodIterator.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
import java.lang.reflect.Method;
import java.util.*;
@@ -25,7 +25,7 @@
* some complications that can occur when a class inherits the same method from multiple interfaces and with slightly
* different signatures (due to the fact that declared thrown exceptions can vary slightly for the "same" method).
*
- * @see org.apache.tapestry.ioc.services.MethodSignature#isOverridingSignatureOf(MethodSignature)
+ * @see org.apache.tapestry5.ioc.services.MethodSignature#isOverridingSignatureOf(MethodSignature)
*/
public class MethodIterator
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MethodSignature.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MethodSignature.java
index 614f1e6..c4e654b 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MethodSignature.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/MethodSignature.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import static org.apache.tapestry.ioc.internal.util.Defense.notBlank;
-import static org.apache.tapestry.ioc.internal.util.Defense.notNull;
-import static org.apache.tapestry.ioc.internal.util.InternalUtils.size;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notBlank;
+import static org.apache.tapestry5.ioc.internal.util.Defense.notNull;
+import static org.apache.tapestry5.ioc.internal.util.InternalUtils.size;
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -31,7 +31,7 @@
* instance and static methods</em>.
* <p/>
* This version of MethodSignature works with <em>loaded</em> classes, and it usually used in the context of {@link
- * org.apache.tapestry.ioc.services.ClassFab} to create new classes and subclasses.
+ * org.apache.tapestry5.ioc.services.ClassFab} to create new classes and subclasses.
*/
public class MethodSignature
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PerthreadManager.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PerthreadManager.java
index 6978fe0..9440b7e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PerthreadManager.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PerthreadManager.java
@@ -12,39 +12,36 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
/**
* Manages per-thread data, and provides a way for listeners to know when such data should be cleaned up. Typically,
- * data is cleaned up at the end of the request (in a web application).
- * Tapestry IoC has any number of objects that need to know
- * when this event occurs, so that they can clean up any per-thread/per-request state.
+ * data is cleaned up at the end of the request (in a web application). Tapestry IoC has any number of objects that need
+ * to know when this event occurs, so that they can clean up any per-thread/per-request state.
* <p/>
- * Due to <a href="https://issues.apache.org/jira/browse/TAPESTRY-2141">TAPESTRY-2141<a> (and
- * the underlying JDK 1.5 bug <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5025230">5025230</a>),
- * this service has expanded to manager per-thread data (not just end-of-request listeners).
+ * Due to <a href="https://issues.apache.org/jira/browse/TAPESTRY-2141">TAPESTRY-2141<a> (and the underlying JDK 1.5 bug
+ * <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5025230">5025230</a>), this service has expanded to
+ * manager per-thread data (not just end-of-request listeners).
*/
public interface PerthreadManager
{
/**
- * Adds a listener to the hub. All listeners are discarded at the
- * {@link #cleanup()}.
+ * Adds a listener to the hub. All listeners are discarded at the {@link #cleanup()}.
*
* @param listener to add
*/
void addThreadCleanupListener(ThreadCleanupListener listener);
/**
- * Immediately performs a cleanup of the thread, notifying all listeners then
- * discarding the thread locale and the map it stores.
+ * Immediately performs a cleanup of the thread, notifying all listeners then discarding the thread locale and the
+ * map it stores.
*/
void cleanup();
/**
- * Returns an object stored in the per-thread map. When the object is a string,
- * the expected name is <em>service id</em>.<em>subkey</em>. Unlike most of Tapestry,
- * such keys <em>will</em> be case sensitive.
+ * Returns an object stored in the per-thread map. When the object is a string, the expected name is <em>service
+ * id</em>.<em>subkey</em>. Unlike most of Tapestry, such keys <em>will</em> be case sensitive.
*
* @param key key used to retrieve object
* @return corresponding per-thread object, or null
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PipelineBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PipelineBuilder.java
index e4b4b98..2eca461 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PipelineBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PipelineBuilder.java
@@ -12,59 +12,57 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
-
-import org.slf4j.Logger;
-
-import java.util.List;
-
-/**
- * Creates a pipeline from a service inteface and an ordered list of filters. Each filter is defined
- * in terms of a filter interface: the filter interface is a variant of the service interface, where
- * each method has an additional parameter that is an instance of the service interface. Typically,
- * this service parameter (often named "delegate") is either the first or the last parameter of each
- * method.
- * <p/>
- * The implementation of a filter method is expected to pass all of its parameters to the service
- * instance passed into it.
- * <p/>
- * The interesting thing is that there may be multiple filters in the pipeline. A fabricated
- * "bridge" object (that implements the service interface) is created to let each filter invoke
- * methods on the next filter down the pipeline. This simplifies the model for creating pipelines,
- * as each filter is coded as if it was directly "in front of" the terminator. In fact, it may be
- * indirectly invoking methods on the next filter in the pipeline via a bridge instance.
- * <p/>
- * The builder is fairly smart about matching up service interface methods to filter interface
- * methods, but keeping it simple is also a good idea.
- */
-public interface PipelineBuilder
-{
- /**
- * Creates a pipeline from the filters and a terminator.
- *
- * @param <S> service type
- * @param <F> filter type
- * @param logger logs any warnings generated when constructing the pipeline
- * @param serviceInterface
- * @param filterInterface
- * @param filters sorted list of filters
- * @param terminator end of the pipeline
- * @return an object that encapsulates the filters and the terminator
- */
- <S, F> S build(Logger logger, Class<S> serviceInterface, Class<F> filterInterface, List<F> filters, S terminator);
-
- /**
- * Creates a pipeline from just the filters. A
- * {@link DefaultImplementationBuilder default implementation} is created as the terminator.
- *
- * @param <S>
- * @param <F>
- * @param logger
- * @param serviceInterface
- * @param filterInterface
- * @param filters
- * @return
- */
- <S, F> S build(Logger logger, Class<S> serviceInterface, Class<F> filterInterface, List<F> filters);
-
-}
\ No newline at end of file
+package org.apache.tapestry5.ioc.services;
+
+import org.slf4j.Logger;
+
+import java.util.List;
+
+/**
+ * Creates a pipeline from a service inteface and an ordered list of filters. Each filter is defined in terms of a
+ * filter interface: the filter interface is a variant of the service interface, where each method has an additional
+ * parameter that is an instance of the service interface. Typically, this service parameter (often named "delegate") is
+ * either the first or the last parameter of each method.
+ * <p/>
+ * The implementation of a filter method is expected to pass all of its parameters to the service instance passed into
+ * it.
+ * <p/>
+ * The interesting thing is that there may be multiple filters in the pipeline. A fabricated "bridge" object (that
+ * implements the service interface) is created to let each filter invoke methods on the next filter down the pipeline.
+ * This simplifies the model for creating pipelines, as each filter is coded as if it was directly "in front of" the
+ * terminator. In fact, it may be indirectly invoking methods on the next filter in the pipeline via a bridge instance.
+ * <p/>
+ * The builder is fairly smart about matching up service interface methods to filter interface methods, but keeping it
+ * simple is also a good idea.
+ */
+public interface PipelineBuilder
+{
+ /**
+ * Creates a pipeline from the filters and a terminator.
+ *
+ * @param <S> service type
+ * @param <F> filter type
+ * @param logger logs any warnings generated when constructing the pipeline
+ * @param serviceInterface
+ * @param filterInterface
+ * @param filters sorted list of filters
+ * @param terminator end of the pipeline
+ * @return an object that encapsulates the filters and the terminator
+ */
+ <S, F> S build(Logger logger, Class<S> serviceInterface, Class<F> filterInterface, List<F> filters, S terminator);
+
+ /**
+ * Creates a pipeline from just the filters. A {@link DefaultImplementationBuilder default implementation} is
+ * created as the terminator.
+ *
+ * @param <S>
+ * @param <F>
+ * @param logger
+ * @param serviceInterface
+ * @param filterInterface
+ * @param filters
+ * @return
+ */
+ <S, F> S build(Logger logger, Class<S> serviceInterface, Class<F> filterInterface, List<F> filters);
+
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyAccess.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyAccess.java
index 3dee132..7e4801d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyAccess.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyAccess.java
@@ -12,11 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
/**
- * A wrapper around the JavaBean Introspector that allows more manageable access to JavaBean
- * properties of objects.
+ * A wrapper around the JavaBean Introspector that allows more manageable access to JavaBean properties of objects.
* <p/>
* <p/>
* Only provides access to <em>simple</em> properties. Indexed properties are ignored.
@@ -40,8 +39,7 @@
void set(Object instance, String propertyName, Object value);
/**
- * Returns the adapter for a particular object instance. A convienience over invoking
- * {@link #getAdapter(Class)}.
+ * Returns the adapter for a particular object instance. A convienience over invoking {@link #getAdapter(Class)}.
*/
ClassPropertyAdapter getAdapter(Object instance);
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyAdapter.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyAdapter.java
index c4608ef..f8b2549 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyAdapter.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyAdapter.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.AnnotationProvider;
import java.lang.reflect.Method;
@@ -22,7 +22,7 @@
* Provides access to a single property within a class. Acts as an {@link AnnotationProvider}; when searching for
* annotations, the read method (if present) is checked first, followed by the write method.
*
- * @see org.apache.tapestry.ioc.services.ClassPropertyAdapter
+ * @see org.apache.tapestry5.ioc.services.ClassPropertyAdapter
*/
public interface PropertyAdapter extends AnnotationProvider
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilder.java
index a553352..efad942 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilder.java
@@ -1,28 +1,26 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.services;
/**
- * Creates a "shadow" of a property of an object. The shadow has the same type as the property, and
- * delegates all method invocations to the property. Each method invocation on the shadow
- * re-acquires the value of the property from the underlying object and delegates to the current
- * value of the property.
+ * Creates a "shadow" of a property of an object. The shadow has the same type as the property, and delegates all method
+ * invocations to the property. Each method invocation on the shadow re-acquires the value of the property from the
+ * underlying object and delegates to the current value of the property.
* <p/>
- * Typically, the object in question is another service, one with the "perthread" service lifecycle.
- * This allows a global singleton to shadow a value that is specific to the current thread (and
- * therefore, the current request).
+ * Typically, the object in question is another service, one with the "perthread" service lifecycle. This allows a
+ * global singleton to shadow a value that is specific to the current thread (and therefore, the current request).
*/
public interface PropertyShadowBuilder
{
@@ -30,8 +28,7 @@
* @param <T>
* @param source the object from which a property will be extracted
* @param propertyName the name of a property of the object, which must be readable
- * @param propertyType the expected type of the property, the actual property type must be assignable to
- * this type
+ * @param propertyType the expected type of the property, the actual property type must be assignable to this type
* @return the shadow
*/
<T> T build(Object source, String propertyName, Class<T> propertyType);
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownHub.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownHub.java
index db6008e..38a237c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownHub.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownHub.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
/**
- * Event hub for notifications when the IOC {@link org.apache.tapestry.ioc.Registry} shuts down.
+ * Event hub for notifications when the IOC {@link org.apache.tapestry5.ioc.Registry} shuts down.
*/
public interface RegistryShutdownHub
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownListener.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownListener.java
index 68abb35..9f97561 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownListener.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/RegistryShutdownListener.java
@@ -1,18 +1,18 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.services;
import java.util.EventListener;
@@ -22,9 +22,9 @@
public interface RegistryShutdownListener extends EventListener
{
/**
- * Invoked when the registry shuts down, giving services a chance to perform any final
- * operations. Service implementations should not attempt to invoke methods on other services
- * (via proxies) as the service proxies may themselves be shutdown.
+ * Invoked when the registry shuts down, giving services a chance to perform any final operations. Service
+ * implementations should not attempt to invoke methods on other services (via proxies) as the service proxies may
+ * themselves be shutdown.
*/
void registryDidShutdown();
}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceActivity.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceActivity.java
index 1ac793c..93e49c2 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceActivity.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceActivity.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
/**
* Provided by the {@link ServiceActivityScoreboard} to track a single service's state and activity.
@@ -29,8 +29,7 @@
String getServiceId();
/**
- * The interface implemented by the service (this may occasionally be a class, for non-proxied
- * services).
+ * The interface implemented by the service (this may occasionally be a class, for non-proxied services).
*/
Class getServiceInterface();
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceActivityScoreboard.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceActivityScoreboard.java
index 6bc3467..ebfa99e 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceActivityScoreboard.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceActivityScoreboard.java
@@ -12,13 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
import java.util.List;
/**
- * Provides access to the runtime details about services in the
- * {@link org.apache.tapestry.ioc.Registry}.
+ * Provides access to the runtime details about services in the {@link org.apache.tapestry5.ioc.Registry}.
*/
public interface ServiceActivityScoreboard
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceLifecycleSource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceLifecycleSource.java
index 88223cb..0429c55 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceLifecycleSource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ServiceLifecycleSource.java
@@ -1,24 +1,24 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
-import org.apache.tapestry.ioc.ServiceLifecycle;
+package org.apache.tapestry5.ioc.services;
+
+import org.apache.tapestry5.ioc.ServiceLifecycle;
/**
- * Provides access to user defined lifecycles (beyond the two built-in lifecycles: "singleton" and
- * "primitive"). The user defined lifecycles are contributed into the service's configuration.
+ * Provides access to user defined lifecycles (beyond the two built-in lifecycles: "singleton" and "primitive"). The
+ * user defined lifecycles are contributed into the service's configuration.
*/
public interface ServiceLifecycleSource
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/Status.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/Status.java
index 831c582..b62b112 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/Status.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/Status.java
@@ -12,13 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.Registry;
+import org.apache.tapestry5.ioc.Registry;
/**
- * Used in {@link ServiceActivity} to identify the state of the service in terms of its overall
- * lifecycle.
+ * Used in {@link ServiceActivity} to identify the state of the service in terms of its overall lifecycle.
*/
public enum Status
{
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/StrategyBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/StrategyBuilder.java
index e87dfda..bb78c7f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/StrategyBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/StrategyBuilder.java
@@ -1,27 +1,27 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
-import org.apache.tapestry.ioc.util.StrategyRegistry;
+package org.apache.tapestry5.ioc.services;
+
+import org.apache.tapestry5.ioc.util.StrategyRegistry;
/**
- * A service implementation builder that operates around a {@link StrategyRegistry}, implementing a
- * version of the Gang of Four Strategy pattern.
+ * A service implementation builder that operates around a {@link StrategyRegistry}, implementing a version of the Gang
+ * of Four Strategy pattern.
* <p/>
- * The constructed service is configured with a number of adapters (that implement the same service
- * interface). Method invocations on the service are routed to one of the adapters.
+ * The constructed service is configured with a number of adapters (that implement the same service interface). Method
+ * invocations on the service are routed to one of the adapters.
* <p/>
* The first parameter of each method is used to select the appropriate adapter.
* <p/>
@@ -30,9 +30,8 @@
public interface StrategyBuilder
{
/**
- * Given a number of adapters implementing the service interface, builds a "dispatcher"
- * implementations that delegates to the one of the adapters. It is an error if any of the
- * methods takes no parameters.
+ * Given a number of adapters implementing the service interface, builds a "dispatcher" implementations that
+ * delegates to the one of the adapters. It is an error if any of the methods takes no parameters.
*
* @param <S> the service interface type
* @param registry defines the adapters based on parameter type (of the first parameter)
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolProvider.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolProvider.java
index b82c24a..3e313c5 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolProvider.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolProvider.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
/**
* A provider of values for symbols.
@@ -20,8 +20,8 @@
public interface SymbolProvider
{
/**
- * Returns the value for the symbol, or null if this provider can not provide a value. The value
- * itself may contain symbols that will be recursively expanded.
+ * Returns the value for the symbol, or null if this provider can not provide a value. The value itself may contain
+ * symbols that will be recursively expanded.
*
* @param symbolName
* @return the value or null
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolSource.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolSource.java
index f36b16d..ac06106 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolSource.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/SymbolSource.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.annotation.Value;
+import org.apache.tapestry5.ioc.annotations.Value;
/**
* Used to manage <em>symbols</em>, configuration properties whose value is evaluated at runtime. Symbols use the Ant
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TapestryIOCModule.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TapestryIOCModule.java
index 438be54..215de37 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TapestryIOCModule.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TapestryIOCModule.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.*;
-import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotation.Marker;
-import org.apache.tapestry.ioc.annotation.Value;
-import org.apache.tapestry.ioc.internal.services.*;
-import org.apache.tapestry.ioc.util.TimeInterval;
+import org.apache.tapestry5.ioc.*;
+import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry5.ioc.annotations.Marker;
+import org.apache.tapestry5.ioc.annotations.Value;
+import org.apache.tapestry5.ioc.internal.services.*;
+import org.apache.tapestry5.ioc.util.TimeInterval;
import java.io.File;
import java.lang.reflect.Array;
@@ -104,7 +104,7 @@
* strings are true)</li> <li>Long to Boolean (true if long value is non zero)</li> <li>Null to Boolean (always
* false)</li> <li>Collection to Boolean (false if empty)</li> <li>Object[] to List</li> <li>primitive[] to
* List</li> <li>Object to List (by wrapping as a singleton list)</li> <li>String to File</li> <li>String to {@link
- * org.apache.tapestry.ioc.util.TimeInterval}</li> <li>{@link org.apache.tapestry.ioc.util.TimeInterval} to
+ * org.apache.tapestry5.ioc.util.TimeInterval}</li> <li>{@link org.apache.tapestry5.ioc.util.TimeInterval} to
* Long</li> </ul>
*/
@SuppressWarnings("unchecked")
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadCleanupListener.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadCleanupListener.java
index 788e2f4..6af799a 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadCleanupListener.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadCleanupListener.java
@@ -1,32 +1,32 @@
-// Copyright 2006, 2008 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
-
-import java.util.EventListener;
-
-/**
- * Listener interface for object that need to know about thread event cleanup.
- * <p/>
- * Note that registration with the {@link org.apache.tapestry.ioc.services.PerthreadManager} is a
- * one-shot affair; it lasts no longer than the next cleanup.
- */
-public interface ThreadCleanupListener extends EventListener
-{
- /**
- * Invoked by {@link org.apache.tapestry.ioc.services.PerthreadManager} service when a thread
- * performs and end-of-request cleanup.
- */
- void threadDidCleanup();
-}
\ No newline at end of file
+// Copyright 2006, 2008 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.services;
+
+import java.util.EventListener;
+
+/**
+ * Listener interface for object that need to know about thread event cleanup.
+ * <p/>
+ * Note that registration with the {@link org.apache.tapestry5.ioc.services.PerthreadManager} is a one-shot affair; it
+ * lasts no longer than the next cleanup.
+ */
+public interface ThreadCleanupListener extends EventListener
+{
+ /**
+ * Invoked by {@link org.apache.tapestry5.ioc.services.PerthreadManager} service when a thread performs and
+ * end-of-request cleanup.
+ */
+ void threadDidCleanup();
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadLocale.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadLocale.java
index 4a1a6d9..358b8da 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadLocale.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/ThreadLocale.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.Registry;
+import org.apache.tapestry5.ioc.Registry;
import java.util.Locale;
/**
- * Stores the locale <em>for the current thread</em>. This value persists until
- * {@link Registry#cleanupThread()} is invoked.
+ * Stores the locale <em>for the current thread</em>. This value persists until {@link Registry#cleanupThread()} is
+ * invoked.
*/
public interface ThreadLocale
{
@@ -32,8 +32,8 @@
void setLocale(Locale locale);
/**
- * Returns the thread's locale, which will be the JVM's default locale, until
- * {@link #setLocale(Locale)} is invoked.
+ * Returns the thread's locale, which will be the JVM's default locale, until {@link #setLocale(Locale)} is
+ * invoked.
*
* @return the thread's locale
*/
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TypeCoercer.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TypeCoercer.java
index 78fb711..c5fd2e5 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TypeCoercer.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/services/TypeCoercer.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
/**
* Makes use of {@link Coercion}s (via {@link CoercionTuple}s) to convert between an input value (of some specific type)
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/IOCTestCase.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/IOCTestCase.java
index 4080f42..f24abfc 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/IOCTestCase.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/IOCTestCase.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.test;
+package org.apache.tapestry5.ioc.test;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotation.IntermediateType;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.DecoratorDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import org.apache.tapestry.ioc.services.*;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.annotations.IntermediateType;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.DecoratorDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.services.*;
import static org.easymock.EasyMock.isA;
import org.slf4j.Logger;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java
index 33cf125..ddea0f5 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/MockTester.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.test;
+package org.apache.tapestry5.ioc.test;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java
index 9d6027e..a0a9f27 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/test/TestBase.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.test;
+package org.apache.tapestry5.ioc.test;
import org.easymock.EasyMock;
import org.easymock.IExpectationSetters;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
index 8b1e5f8..baf797f 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/AbstractMessages.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.ioc.Messages;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
-import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
-import org.apache.tapestry.ioc.internal.util.Invokable;
-import org.apache.tapestry.ioc.internal.util.MessageFormatterImpl;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.ioc.Messages;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
+import org.apache.tapestry5.ioc.internal.util.ConcurrentBarrier;
+import org.apache.tapestry5.ioc.internal.util.Invokable;
+import org.apache.tapestry5.ioc.internal.util.MessageFormatterImpl;
import java.util.Locale;
import java.util.Map;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/BodyBuilder.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/BodyBuilder.java
index a4cc84f..9b5ee51 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/BodyBuilder.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/BodyBuilder.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.services.MethodSignature;
+import org.apache.tapestry5.ioc.services.MethodSignature;
import java.util.Formatter;
@@ -152,8 +152,8 @@
/**
* Returns the current contents of the buffer. This value is often passed to methods such as {@link
- * org.apache.tapestry.ioc.services.ClassFab#addConstructor(Class[], Class[], String)} or {@link
- * org.apache.tapestry.ioc.services.ClassFab#addMethod(int, MethodSignature, String)}.
+ * org.apache.tapestry5.ioc.services.ClassFab#addConstructor(Class[], Class[], String)} or {@link
+ * org.apache.tapestry5.ioc.services.ClassFab#addMethod(int, MethodSignature, String)}.
* <p/>
* A BodyBuilder can be used again after invoking toString(), typically by invoking {@link #clear()}.
*/
@@ -162,4 +162,4 @@
{
return buffer.toString();
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
index acf7228..09f464d 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
import java.io.Serializable;
import java.util.*;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/ExceptionUtils.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/ExceptionUtils.java
index 21b9005..479ad1c 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/ExceptionUtils.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/ExceptionUtils.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
/**
* Contains static methods useful for manipulating exceptions.
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/Stack.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/Stack.java
index 4762f79..72bedfe 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/Stack.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/Stack.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
/**
* A simple, streamlined implementation of {@link java.util.Stack}. The implementation is <em>not</em> threadsafe.
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/StrategyRegistry.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/StrategyRegistry.java
index 2a2a3bf..da7a8d3 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/StrategyRegistry.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/StrategyRegistry.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InheritanceSearch;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InheritanceSearch;
import java.util.Collection;
import java.util.List;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/TimeInterval.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/TimeInterval.java
index 29b1dcc..50a31a1 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/TimeInterval.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/TimeInterval.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.Map;
import java.util.regex.Matcher;
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/UtilMessages.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/UtilMessages.java
index c21903a..c3af135 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/UtilMessages.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/util/UtilMessages.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
import java.util.Collection;
diff --git a/tapestry-ioc/src/main/resources/org/apache/tapestry5/ioc/internal/IOCStrings.properties b/tapestry-ioc/src/main/resources/org/apache/tapestry5/ioc/internal/IOCStrings.properties
index 99056cd..a3a719a 100644
--- a/tapestry-ioc/src/main/resources/org/apache/tapestry5/ioc/internal/IOCStrings.properties
+++ b/tapestry-ioc/src/main/resources/org/apache/tapestry5/ioc/internal/IOCStrings.properties
@@ -86,4 +86,4 @@
autobuild-constructor-error=Error invoking constructor %s: %s
overlapping-service-proxy-providers=Setting a new service proxy provider when there's already an existing provider. This may indicate that you have multiple IoC Registries.
unexpected-service-proxy-provider=Unexpected service proxy provider when clearing the provider. This may indicate that you have multiple IoC Registries.
-no-proxy-provider=Service token for service '%s' can not be converted back into a proxy because no proxy provider has been registered. This may indicate that an IoC Registry has not been started yet.
\ No newline at end of file
+no-proxy-provider=Service token for service '%s' can not be converted back into a proxy because no proxy provider has been registered. This may indicate that an IoC Registry has not been started yet.
diff --git a/tapestry-ioc/src/main/resources/org/apache/tapestry5/ioc/util/UtilStrings.properties b/tapestry-ioc/src/main/resources/org/apache/tapestry5/ioc/util/UtilStrings.properties
index 1624cc0..df4ed5a 100644
--- a/tapestry-ioc/src/main/resources/org/apache/tapestry5/ioc/util/UtilStrings.properties
+++ b/tapestry-ioc/src/main/resources/org/apache/tapestry5/ioc/util/UtilStrings.properties
@@ -15,4 +15,4 @@
no-strategy-adapter=No adapter from type %s to type %s is available (registered types are %s).
stack-is-empty=Stack is empty.
invalid-time-interval-unit=Unknown time interval unit '%s' (in '%s'). Defined units: %s.
-invalid-time-interval-input=Unexpected string '%s' (in time interval '%s').
\ No newline at end of file
+invalid-time-interval-input=Unexpected string '%s' (in time interval '%s').
diff --git a/tapestry-ioc/src/site/apt/case.apt b/tapestry-ioc/src/site/apt/case.apt
index ae8acd8..f5b2833 100644
--- a/tapestry-ioc/src/site/apt/case.apt
+++ b/tapestry-ioc/src/site/apt/case.apt
@@ -22,4 +22,4 @@
Just case is ignored --
other punctuation, as well as whitespace, must exactly match.
- Under the covers, this is supported by the {{{../apidocs/org/apache/tapestry/ioc/CaseInsensitiveMap.html}CaseInsensitiveMap}} class.
\ No newline at end of file
+ Under the covers, this is supported by the {{{../apidocs/org/apache/tapestry5/ioc/CaseInsensitiveMap.html}CaseInsensitiveMap}} class.
\ No newline at end of file
diff --git a/tapestry-ioc/src/site/apt/coerce.apt b/tapestry-ioc/src/site/apt/coerce.apt
index 0546ea5..ea9671a 100644
--- a/tapestry-ioc/src/site/apt/coerce.apt
+++ b/tapestry-ioc/src/site/apt/coerce.apt
@@ -12,9 +12,9 @@
may also happen inside tapestry-ioc, such as when injecting a value, rather than a service, into a builder method.
Like everything else in Tapestry, type coercions are extensible. At the root is the
- {{{../apidocs/org/apache/tapestry/ioc/services/TypeCoercer.html}TypeCoercer}} service. Its configuration consists
+ {{{../apidocs/org/apache/tapestry5/ioc/services/TypeCoercer.html}TypeCoercer}} service. Its configuration consists
of a number of
- {{{../apidocs/org/apache/tapestry/ioc/services/CoercionTuple.html}CoercionTuple}}s. Each tuple defines how to coerce from one type to another.
+ {{{../apidocs/org/apache/tapestry5/ioc/services/CoercionTuple.html}CoercionTuple}}s. Each tuple defines how to coerce from one type to another.
The initial set of coercions is focused primarily on coercions between different numeric types:
[images/type-coercer.png] Default Type Coercions
diff --git a/tapestry-ioc/src/site/apt/command.apt b/tapestry-ioc/src/site/apt/command.apt
index 570c7ce..3d9ea12 100644
--- a/tapestry-ioc/src/site/apt/command.apt
+++ b/tapestry-ioc/src/site/apt/command.apt
@@ -32,7 +32,7 @@
Because this pattern is used so often inside Tapestry, a built-in service exists
to create implementations of the pattern as needed. The
- {{{../apidocs/org/apache/tapestry/ioc/services/ChainBuilder.html}ChainBuilder}}
+ {{{../apidocs/org/apache/tapestry5/ioc/services/ChainBuilder.html}ChainBuilder}}
service takes care of all the work:
+----+
diff --git a/tapestry-ioc/src/site/apt/configuration.apt b/tapestry-ioc/src/site/apt/configuration.apt
index aab48d5..7f4b47b 100644
--- a/tapestry-ioc/src/site/apt/configuration.apt
+++ b/tapestry-ioc/src/site/apt/configuration.apt
@@ -129,7 +129,7 @@
of the service.
On the contribution side, a service contribution method sees a
- {{{apidocs/org/apache/tapestry/ioc/Configuration.html}Configuration}} object:
+ {{{apidocs/org/apache/tapestry5/ioc/Configuration.html}Configuration}} object:
+------+
public static void contributeStartup(Configuration<Runnable> configuration)
@@ -188,7 +188,7 @@
For our service contribution methods, we must provide a parameter
of type
- {{{apidocs/org/apache/tapestry/ioc/OrderedConfiguration.html}OrderedConfiguration}}:
+ {{{apidocs/org/apache/tapestry5/ioc/OrderedConfiguration.html}OrderedConfiguration}}:
+------+
public static void contributeStartup(OrderedConfiguration<Runnable> configuration)
@@ -224,7 +224,7 @@
The value may not be null.
For mapped configurations where the key type is String, a
- {{{apidocs/org/apache/tapestry/ioc/util/CaseInsensitiveMap.html}CaseInsensitiveMap}}
+ {{{apidocs/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.html}CaseInsensitiveMap}}
will be automatically used (and passed to the service builder method), to help ensure that {{{case.html}case insensitivity}}
is automatic and pervasive.
@@ -236,7 +236,7 @@
other things to be injected.
- * {{{apidocs/org/apache/tapestry/ioc/ObjectLocator.html}ObjectLocator}}: access to other services visible
+ * {{{apidocs/org/apache/tapestry5/ioc/ObjectLocator.html}ObjectLocator}}: access to other services visible
to the contributing module
[]
diff --git a/tapestry-ioc/src/site/apt/cookbook/basics.apt b/tapestry-ioc/src/site/apt/cookbook/basics.apt
index 52916e0..72868f9 100644
--- a/tapestry-ioc/src/site/apt/cookbook/basics.apt
+++ b/tapestry-ioc/src/site/apt/cookbook/basics.apt
@@ -24,10 +24,10 @@
The simplest services don't have any special configuration or dependencies. They are defined as services so that
they can be shared.
- For example, the {{{../../apidocs/org/apache/tapestry/ioc/services/PropertyAccess.html}PropertyAccess}} service
+ For example, the {{{../../apidocs/org/apache/tapestry5/ioc/services/PropertyAccess.html}PropertyAccess}} service
is used in multiple places around the framework to access properties of objects (its a wrapper around
the Java Beans Introspector and a bit of reflection). This is defined in the
- {{{../../apidocs/org/apache/tapestry/ioc/services/TapestryIOCModule.html}TapestryIOCModule}}.
+ {{{../../apidocs/org/apache/tapestry5/ioc/services/TapestryIOCModule.html}TapestryIOCModule}}.
It's useful to share PropertyAccess, because it does a lot of useful caching internally.
@@ -43,7 +43,7 @@
}
+----+
- This example includes {{{../../apidocs/org/apache/tapestry/ioc/services/ExceptionAnalyzer.html}ExceptionAnalyzer}},
+ This example includes {{{../../apidocs/org/apache/tapestry5/ioc/services/ExceptionAnalyzer.html}ExceptionAnalyzer}},
because it has a dependency on PropertyAccess:
+----+
@@ -83,14 +83,14 @@
dependency injection occurs on the parameters of the service builder method.
The Tapestry web framework includes the concept of an "asset": a resource that may be inside a web application, or packaged
- inside a JAR. Assets are represented as the type {{{../../apidcos/org/apache/tapestry/Asset.html}Asset}}.
+ inside a JAR. Assets are represented as the type {{{../../apidcos/org/apache/tapestry5/Asset.html}Asset}}.
In fact, there are different implementations of this class: one for context resources (part of the web application), the other
for classpath resources (packaged inside a JAR). The Asset instances are created via
{{{../../apidocs/org/apache/tapesty/services/AssetFactory.html}AssetFactory}} services.
Tapestry defines two such services, in the
- {{{../../apidocs/org/apache/tapestry/services/TapestryModule.html}TapestryModule}}.
+ {{{../../apidocs/org/apache/tapestry5/services/TapestryModule.html}TapestryModule}}.
+---+
@Marker(ClasspathProvider.class)
@@ -119,7 +119,7 @@
What's important is that the services are differentiated not just in terms of their id (which is defined by the name of the method,
after stripping off "build"), but in terms of their <marker annotation>.
- The {{{../../apidocs/org/apache/tapestry/ioc/annotations/Marker.html}Marker}} annotation provides the discriminator. When
+ The {{{../../apidocs/org/apache/tapestry5/ioc/annotations/Marker.html}Marker}} annotation provides the discriminator. When
the service type is supplemented with the ClasspathProvider annotation, the ClasspathAssetFactory is injected. When the
service type is supplemented with the ContextProvider annotation, the ContextAssetFactory is injected.
diff --git a/tapestry-ioc/src/site/apt/cookbook/patterns.apt b/tapestry-ioc/src/site/apt/cookbook/patterns.apt
index 33b84b1..dab842e 100644
--- a/tapestry-ioc/src/site/apt/cookbook/patterns.apt
+++ b/tapestry-ioc/src/site/apt/cookbook/patterns.apt
@@ -15,7 +15,7 @@
Chain of Command Pattern
Let's look at another example, again from the Tapestry code base. The
- {{{../../apidocs/org/apache/tapestry/services/InjectionProvider.html}InjectProvider}} interface
+ {{{../../apidocs/org/apache/tapestry5/services/InjectionProvider.html}InjectProvider}} interface
is used to process the @Inject annotation on the fields of a Tapestry page or component.
Many different instances are combined together to form a
{{{../command.html}chain of command}}.
diff --git a/tapestry-ioc/src/site/apt/cookbook/servconf.apt b/tapestry-ioc/src/site/apt/cookbook/servconf.apt
index 63fb00f..674047f 100644
--- a/tapestry-ioc/src/site/apt/cookbook/servconf.apt
+++ b/tapestry-ioc/src/site/apt/cookbook/servconf.apt
@@ -24,7 +24,7 @@
The checksum is derived from the file contents; thus it can't be spoofed from the client unless the client already has the file contents.
This is controlled by the
- {{{../../apidocs/org/apache/tapestry/services/ResourceDigestGenerator.html}ResourceDigestGenerator}} service, which uses its
+ {{{../../apidocs/org/apache/tapestry5/services/ResourceDigestGenerator.html}ResourceDigestGenerator}} service, which uses its
configuration to determine which file extensions require an MD5 digest.
* Contributing to a Service
@@ -41,7 +41,7 @@
This is a <service contribution method>, a method that is invoked to provide values for a configuration. We'll see how the
service receives these contributions shortly. The
- {{{../../apidocs/org/apache/tapestry/ioc/Configuration.html}Configuration}} object is how
+ {{{../../apidocs/org/apache/tapestry5/ioc/Configuration.html}Configuration}} object is how
values are added to the service's configuration. Other parameters to a service configuration method are injected
much as with a service's constructor, or a service builder method.
@@ -102,7 +102,7 @@
{{{../pipeline.html}Pipeline}}.
Here, the example is the
- {{{../../apidocs/org/apache/tapestry/services/Dispatcher.html}Dispatcher}} interface; a Dispatcher inside Tapestry
+ {{{../../apidocs/org/apache/tapestry5/services/Dispatcher.html}Dispatcher}} interface; a Dispatcher inside Tapestry
is roughly equivalent to a servlet, though a touch more active. It is passed a Request and decides if the URL
for the Request is something it can handle; if so it will process the request, send a response, and return true.
@@ -129,7 +129,7 @@
}
+---+
- With an {{{../../apidcos/org/apache/tapestry/ioc/OrderedConfiguration.html}OrderedConfiguration}},
+ With an {{{../../apidcos/org/apache/tapestry5/ioc/OrderedConfiguration.html}OrderedConfiguration}},
each contribution gets a name, which must be unique. Here the names are RootPath, Asset, PageRender and ComponentAction.
The add() method takes a name, the contributed object for that name, and then zero or more optional constraints.
@@ -139,8 +139,8 @@
The ordering occurs on the complete set of contributions, from all modules.
Here, we need a specific order, used to make sure that the Dispatchers don't get confused about which URLs
- are appropriate ... for example, an asset URL might be /assets/tapestry/tapestry.js. This looks just like
- a component action URL (for page "assets/tapestry/tapestry" and component "js"). Given that software is totally lacking
+ are appropriate ... for example, an asset URL might be /assets/tapestry5/tapestry.js. This looks just like
+ a component action URL (for page "assets/tapestry5/tapestry" and component "js"). Given that software is totally lacking
in basic common-sense, we instead use careful ordering of the Dipstachers to ensure that AssetDispatcher is checked <before>
the ComponentAction dispatcher.
@@ -158,7 +158,7 @@
}
+----+
- {{{../../apidocs/org/apache/tapestry/ioc/services/ChainBuilder.html}ChainBuilder}} is a service that
+ {{{../../apidocs/org/apache/tapestry5/ioc/services/ChainBuilder.html}ChainBuilder}} is a service that
<builds other services>. Here it creates an object of type Dispatcher in terms of the list of Dispatchers.
This is one of the most common uses of service builder methods ... for when the service implementation
doesn't exist, but can be constructed at runtime.
@@ -171,7 +171,7 @@
Tapestry IoC's {{{../symbols.html}symbols}} mechanism allows configuration values to be defined and perhaps overridden, then
provided to services via injection, using
- the {{{../../apidocs/org/apache/tapestry/ioc/annotations/Value.html}Value}} annotation.
+ the {{{../../apidocs/org/apache/tapestry5/ioc/annotations/Value.html}Value}} annotation.
The first step is to contribute values.
@@ -186,8 +186,8 @@
configuration.add("tapestry.scriptaculous", "classpath:${tapestry.scriptaculous.path}");
configuration.add(
"tapestry.scriptaculous.path",
- "org/apache/tapestry/scriptaculous_1_7_1_beta_3");
- configuration.add("tapestry.jscalendar.path", "org/apache/tapestry/jscalendar-1.0");
+ "org/apache/tapestry5/scriptaculous_1_7_1_beta_3");
+ configuration.add("tapestry.jscalendar.path", "org/apache/tapestry5/jscalendar-1.0");
configuration.add("tapestry.jscalendar", "classpath:${tapestry.jscalendar.path}");
}
+---+
diff --git a/tapestry-ioc/src/site/apt/decorator.apt b/tapestry-ioc/src/site/apt/decorator.apt
index 48a7fff..79bbcfe 100644
--- a/tapestry-ioc/src/site/apt/decorator.apt
+++ b/tapestry-ioc/src/site/apt/decorator.apt
@@ -57,7 +57,7 @@
+---------------------+
package org.example.myapp.services;
-import org.apache.tapestry.ioc.services.LoggingDecorator;
+import org.apache.tapestry5.ioc.services.LoggingDecorator;
import org.slf4j.Logger;
public class MyAppModule
@@ -112,7 +112,7 @@
+---------------------+
package org.example.myapp.services;
-import org.apache.tapestry.ioc.services.LoggingDecorator;
+import org.apache.tapestry5.ioc.services.LoggingDecorator;
import org.slf4j.Logger;
public class MyAppModule
@@ -131,7 +131,7 @@
Targetting Multiple Services
By using the
- {{{../apidocs/org/apache/tapestry/ioc/annotations/Match.html}@Match annnotation}},
+ {{{../apidocs/org/apache/tapestry5/ioc/annotations/Match.html}@Match annnotation}},
you may identify which services are to be decorated.
The value specified in the Match annotation is one or more patterns. These patterns
@@ -176,7 +176,7 @@
In cases where multiple decorators will apply to a single service, you can control
the order in which decorators are applied using an additional annotation:
- {{{../apidocs/org/apache/tapestry/ioc/annotations/Order.html}@Order}}.
+ {{{../apidocs/org/apache/tapestry5/ioc/annotations/Order.html}@Order}}.
This annotation allows any number of {{{order.html}ordering constraints}}
to be specified for the decorator, to order it relative to
@@ -214,9 +214,9 @@
the service (because these interceptors can get chained, we talk about the "delegate" and not the "service").
Each method of the interceptor will take <advice>. Advice
- is provided by a {{{../apidocs/org/apache/tapestry/ioc/MethodAdvice.html}MethodAdvice}} instance.
+ is provided by a {{{../apidocs/org/apache/tapestry5/ioc/MethodAdvice.html}MethodAdvice}} instance.
The sole method, <<<advise()>>>, recieves an
- {{{../apidocs/org/apache/tapestry/ioc/Invocation.html}Invocation}}.
+ {{{../apidocs/org/apache/tapestry5/ioc/Invocation.html}Invocation}}.
MethodAdvice gives you a chance to see what the method invocation <is>; you can query
the name of the method, and the types and values of the parameters.
@@ -237,7 +237,7 @@
query or even replace the return value.
The
- {{{../apidocs/org/apache/tapestry/ioc/services/AspectDecorator.html}AspectDecorator}} service
+ {{{../apidocs/org/apache/tapestry5/ioc/services/AspectDecorator.html}AspectDecorator}} service
is how you put your MethodAdvise into action.
By way of an example, we'll show an implementation of the LoggingDecorator service:
diff --git a/tapestry-ioc/src/site/apt/module.apt b/tapestry-ioc/src/site/apt/module.apt
index 146a3ca..33d9ac1 100644
--- a/tapestry-ioc/src/site/apt/module.apt
+++ b/tapestry-ioc/src/site/apt/module.apt
@@ -83,7 +83,7 @@
+---+
package org.example.myapp.services;
-import org.apache.tapestry.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.ServiceBinder;
public class MyAppModule
{
@@ -158,7 +158,7 @@
* {{{http://www.slf4j.org/api/org/slf4j/Logger.html}org.slf4j.Logger}}: logger for the module (derived from the module's class name)
- * {{{../apidocs/org/apache/tapestry/ioc/ObjectLocator.html}ObjectLocator}}: access to other services
+ * {{{../apidocs/org/apache/tapestry5/ioc/ObjectLocator.html}ObjectLocator}}: access to other services
[]
@@ -235,7 +235,7 @@
or packages).
A better alternative is the
- {{{../apidocs/org/apache/tapestry/ioc/annotations/SubModule.html}@SubModule annotation}}.
+ {{{../apidocs/org/apache/tapestry5/ioc/annotations/SubModule.html}@SubModule annotation}}.
The value for this annotation is a list of <additional> classes to be treated as module builder classes,
exactly as if they were identified in the manifest. For example:
diff --git a/tapestry-ioc/src/site/apt/order.apt b/tapestry-ioc/src/site/apt/order.apt
index 29c5b88..b6b90df 100644
--- a/tapestry-ioc/src/site/apt/order.apt
+++ b/tapestry-ioc/src/site/apt/order.apt
@@ -27,7 +27,7 @@
control what other objects must come before a contribution, or come after.
The constraints are specified using the
- {{{../apidocs/org/apache/tapestry/ioc/annotations/Order.html}Order}} annotation (for
+ {{{../apidocs/org/apache/tapestry5/ioc/annotations/Order.html}Order}} annotation (for
service decorator methods), or as variable arguments at the end of the add() method
for ordered configurations.
diff --git a/tapestry-ioc/src/site/apt/pipeline.apt b/tapestry-ioc/src/site/apt/pipeline.apt
index f8e8d28..9c30645 100644
--- a/tapestry-ioc/src/site/apt/pipeline.apt
+++ b/tapestry-ioc/src/site/apt/pipeline.apt
@@ -62,7 +62,7 @@
+-----+
The
- {{{../apidocs/org/apache/tapestry/ioc/services/PipelineBuilder.html}PipelineBuilder}}
+ {{{../apidocs/org/apache/tapestry5/ioc/services/PipelineBuilder.html}PipelineBuilder}}
service is useful for constructing pipelines. The service is often injected
into a service builder method, along with an ordered configuration of services.
diff --git a/tapestry-ioc/src/site/apt/provider.apt b/tapestry-ioc/src/site/apt/provider.apt
index 5991ed6..ad8ee9f 100644
--- a/tapestry-ioc/src/site/apt/provider.apt
+++ b/tapestry-ioc/src/site/apt/provider.apt
@@ -4,7 +4,7 @@
Object Providers
- When you don't provide the {{{../apidocs/org/apache/tapestry/ioc/annotations/InjectService.html}InjectService}} annotation
+ When you don't provide the {{{../apidocs/org/apache/tapestry5/ioc/annotations/InjectService.html}InjectService}} annotation
on a parameter (to a service builder method or constructor), Tapestry will
resolve the parameter automatically.
@@ -12,13 +12,13 @@
be injected is not necessarily a service; it may be some arbitrary object.
If this sounds vague, its because there is not just one
- {{{../apidocs/org/apache/tapestry/ioc/ObjectProvider.html}ObjectProvider}}; there's a whole set of them,
+ {{{../apidocs/org/apache/tapestry5/ioc/ObjectProvider.html}ObjectProvider}}; there's a whole set of them,
forming a {{{command.html}chain of command}}. The commands in the chain may provide an object
based on the parameter type, or based on additional annotations on the parameter.
There are two built-in object providers:
- * Check for {{{../apidocs/org/apache/tapestry/ioc/annotations/Value.html}Value}} annotation
+ * Check for {{{../apidocs/org/apache/tapestry5/ioc/annotations/Value.html}Value}} annotation
* Check for a <unique> service in the Registry whose service interface matches the parameter type
diff --git a/tapestry-ioc/src/site/apt/run.apt b/tapestry-ioc/src/site/apt/run.apt
index 06bcbb0..a00b139 100644
--- a/tapestry-ioc/src/site/apt/run.apt
+++ b/tapestry-ioc/src/site/apt/run.apt
@@ -6,7 +6,7 @@
Primarily, you will use the IoC Registry as part of a Tapestry application.
In those situations, the
- {{{../apidocs/org/apache/tapestry/TapestryFilter.html}TapestryFilter}} will
+ {{{../apidocs/org/apache/tapestry5/TapestryFilter.html}TapestryFilter}} will
be responsible for starting and stopping the registry.
However, you may want to do some integration testing using the Registry
@@ -16,7 +16,7 @@
Building the Registry
The class
- {{{../apidocs/org/apache/tapestry/ioc/RegistryBuilder.html}RegistryBuilder}}
+ {{{../apidocs/org/apache/tapestry5/ioc/RegistryBuilder.html}RegistryBuilder}}
is used to create a Registry.
+---+
@@ -34,17 +34,17 @@
Using this approach, you will form a Registry containing
the builtin services from the
- {{{../apidocs/org/apache/tapestry/ioc/services/TapestryIoCModule.html}Tapestry IoC module}}, plus
+ {{{../apidocs/org/apache/tapestry5/ioc/services/TapestryIoCModule.html}Tapestry IoC module}}, plus
the modules you explicitly list.
The call to performRegistryStartup() is necessary to ensure that any services marked with the
- {{{../apidocs/org/apache/tapestry/ioc/annotations/EagerLoad.html}EagerLoad}} annotation are, in fact,
+ {{{../apidocs/org/apache/tapestry5/ioc/annotations/EagerLoad.html}EagerLoad}} annotation are, in fact,
loaded.
Building the Default Registry
The default registry is available by invoking the static method
- {{{../apidocs/org/apache/tapestry/ioc/IOCUtilities.html#buildDefaultRegistry()}IOCUtilities.buildDefaultRegistry()}}.
+ {{{../apidocs/org/apache/tapestry5/ioc/IOCUtilities.html#buildDefaultRegistry()}IOCUtilities.buildDefaultRegistry()}}.
This method builds a Registry using
{{{module.html#Autoloading modules}autoloading logic}}, where modules to load
are identified via a JAR Manifest entry.
@@ -57,7 +57,7 @@
Shutting down the Registry
The method
- {{{../apidocs/org/apache/tapestry/ioc/Registry.html#shutdown()}Registry.shutdown()}}
+ {{{../apidocs/org/apache/tapestry5/ioc/Registry.html#shutdown()}Registry.shutdown()}}
will shutdown the Registry. This immediately invalidates all service proxies.
Some services may have chosen to register for shutdown notification (for example,
to do cleanup work such as closing a database connection).
diff --git a/tapestry-ioc/src/site/apt/service.apt b/tapestry-ioc/src/site/apt/service.apt
index bcb134a..218dcc0 100644
--- a/tapestry-ioc/src/site/apt/service.apt
+++ b/tapestry-ioc/src/site/apt/service.apt
@@ -77,13 +77,13 @@
instantiate your services.
Every module may have an optional, static bind() method which is passed a
- {{{../apidocs/org/apache/tapestry/ioc/ServiceBinder.html}ServiceBinder}}. Services may be registered with
+ {{{../apidocs/org/apache/tapestry5/ioc/ServiceBinder.html}ServiceBinder}}. Services may be registered with
the container by "binding" a service interface to a service implementation:
+------+
package org.example.myapp.services;
-import org.apache.tapestry.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.ServiceBinder;
public class MyAppModule
{
@@ -179,7 +179,7 @@
it down to a <single> service. At this point, it is necessary to <disambiguate> the link between
the service interface and <one> service. One approach is to use
the
- {{{../apidocs/org/apache/tapestry/ioc/annotations/InjectService.html}InjectService}} annotation:
+ {{{../apidocs/org/apache/tapestry5/ioc/annotations/InjectService.html}InjectService}} annotation:
+-----------------------------------------------------------------------------------+
@@ -278,7 +278,7 @@
will be able to update all the uses of the annotation or interface.
With a service builder method, you use the
- {{{../apidocs/org/apache/tapestry/ioc/annotations/Marker.html}@Marker}} annotation:
+ {{{../apidocs/org/apache/tapestry5/ioc/annotations/Marker.html}@Marker}} annotation:
+---+
@Marker(Clustered.class)
@@ -300,7 +300,7 @@
+---+
package org.example.myapp.services;
-import org.apache.tapestry.ioc.annotation.InjectService;
+import org.apache.tapestry5.ioc.annotations.InjectService;
public class IndexerImpl implements Indexer
{
@@ -330,7 +330,7 @@
+---+
package org.example.myapp.services;
-import org.apache.tapestry.ioc.annotation.InjectService;
+import org.apache.tapestry5.ioc.annotations.InjectService;
public class IndexerImpl implements Indexer
{
@@ -360,7 +360,7 @@
more can be added.
Service lifecycle is specified using the
- {{{../apidocs/org/apache/tapestry/ioc/annotations/Scope.html}@Scope annotation}},
+ {{{../apidocs/org/apache/tapestry5/ioc/annotations/Scope.html}@Scope annotation}},
which is attached to a builder method. When this annotation is not present, the
default scope, "singleton" is used.
@@ -370,7 +370,7 @@
is created when the service is first referenced. By reference, we mean any situation in which
the service is requested by name, such as using the @InjectService annotation on a
service builder method, or by using the
- {{{../apidocs/org/apache/tapestry/ioc/Registry.html}Registry}} API from outside the
+ {{{../apidocs/org/apache/tapestry5/ioc/Registry.html}Registry}} API from outside the
container.
In any case, the service proxy will only create the service implementation when a method
@@ -434,7 +434,7 @@
Services are normally created only as needed (per the scope discussion above).
This can be tweaked slightly; by adding the
- {{{../apidocs/org/apache/tapestry/ioc/annotations/EagerLoad.html}EagerLoad}} annotation to
+ {{{../apidocs/org/apache/tapestry5/ioc/annotations/EagerLoad.html}EagerLoad}} annotation to
the service builder method, Tapestry will instantiate the service when the Registry is first created.
This will cause the service builder method to be invoked, as well as any service decorator methods.
@@ -475,7 +475,7 @@
* java.lang.Class: service interface implemented by the service to be constructed
- * {{{../apidocs/org/apache/tapestry/ioc/ServiceResources.html}ServiceResources}}: access to other services
+ * {{{../apidocs/org/apache/tapestry5/ioc/ServiceResources.html}ServiceResources}}: access to other services
[]
@@ -553,7 +553,7 @@
It doesn't work because type String always gets the service id, as a resource (as with the serviceId parameter).
In order to get this to work, we need to turn off the resource injection for the alertEmail parameter.
- That's what the {{{../apidocs/org/apache/tapestry/ioc/annotations/Inject.html}Inject}} annotation does:
+ That's what the {{{../apidocs/org/apache/tapestry5/ioc/annotations/Inject.html}Inject}} annotation does:
+-----------------------------------------------------------------------------------+
public static Indexer build(String serviceId, Log serviceLog,
@@ -577,18 +577,18 @@
A few services within the Tapestry IOC Module are "builtin"; there is no
service builder method
in the
- {{{../apidocs/org/apache/tapestry/ioc/services/TapestryIOCModule.html}TapestryIOCModule}} class.
+ {{{../apidocs/org/apache/tapestry5/ioc/services/TapestryIOCModule.html}TapestryIOCModule}} class.
*---------------------+-----------------------------------------------------------------------------------------+
| <<Service Id>> | <<Service Interface>> |
*---------------------+-----------------------------------------------------------------------------------------+
-| ClassFactory | {{{../apidocs/org/apache/tapestry/ioc/services/ClassFactory.html}ClassFactory}} |
+| ClassFactory | {{{../apidocs/org/apache/tapestry5/ioc/services/ClassFactory.html}ClassFactory}} |
*---------------------+-----------------------------------------------------------------------------------------+
-| LoggerSource | {{{../apidocs/org/apache/tapestry/ioc/LoggerSource.html}LoggerSource}} |
+| LoggerSource | {{{../apidocs/org/apache/tapestry5/ioc/LoggerSource.html}LoggerSource}} |
*---------------------+-----------------------------------------------------------------------------------------+
-| RegistryShutdownHub | {{{../apidocs/org/apache/tapestry/ioc/RegistryShutdownHub.html}RegistryShutdownHub}} |
+| RegistryShutdownHub | {{{../apidocs/org/apache/tapestry5/ioc/RegistryShutdownHub.html}RegistryShutdownHub}} |
*---------------------+-----------------------------------------------------------------------------------------+
-| PerthreadManager | {{{../apidocs/org/apache/tapestry/ioc/services/PerthreadManager.html}PerthreadManager}} |
+| PerthreadManager | {{{../apidocs/org/apache/tapestry5/ioc/services/PerthreadManager.html}PerthreadManager}} |
*---------------------+-----------------------------------------------------------------------------------------+
Consult the JavaDoc for each of these services to identify under what circumstances you'll need to use them.
diff --git a/tapestry-ioc/src/site/apt/shadow.apt b/tapestry-ioc/src/site/apt/shadow.apt
index 4a8a674..dd9ff82 100644
--- a/tapestry-ioc/src/site/apt/shadow.apt
+++ b/tapestry-ioc/src/site/apt/shadow.apt
@@ -5,7 +5,7 @@
Shadow Services
The
- {{{../apidocs/org/apache/tapestry/ioc/services/PropertyShadowBuilder.html}PropertyShadowBuilder}}
+ {{{../apidocs/org/apache/tapestry5/ioc/services/PropertyShadowBuilder.html}PropertyShadowBuilder}}
service is used to build a special, delegating kind of service implementation.
Effectively, it is used to allow a property of another service to be exposed as its own service.
diff --git a/tapestry-ioc/src/site/apt/strategy.apt b/tapestry-ioc/src/site/apt/strategy.apt
index 2f6396a..1e3597c 100644
--- a/tapestry-ioc/src/site/apt/strategy.apt
+++ b/tapestry-ioc/src/site/apt/strategy.apt
@@ -7,7 +7,7 @@
Another of the Gang Of Four patterns, the strategy pattern as implemented in Tapestry IoC is a kind of late binding.
The idea is that <adapters> for objects are accessed based on the <actual type> of an object. These adapters supply additional functionality. The adapters
- are located using an {{{../apidocs/org/apache/tapestry/util/StrategyRegistry.html}StrategyRegistry}}.
+ are located using an {{{../apidocs/org/apache/tapestry5/util/StrategyRegistry.html}StrategyRegistry}}.
The lookup of adapters is based on an inheritance search; thus providing an adapter for type java.util.Map will match any object that implements the Map interface.
The inheritance search works its way up the class hierarchy looking for a matching registration. If nothing is found, then all the interfaces directly or indirectly
@@ -17,7 +17,7 @@
As a special case, the value null is search for as if it was an instance of the class void.
- The {{{../apidocs/org/apache/tapestry/ioc/services/StrategyBuilder.html}StrategyBuilder}} service creates a service implementation around a strategy registry.
+ The {{{../apidocs/org/apache/tapestry5/ioc/services/StrategyBuilder.html}StrategyBuilder}} service creates a service implementation around a strategy registry.
+---+
public interface StrategyBuilder
diff --git a/tapestry-ioc/src/site/apt/symbols.apt b/tapestry-ioc/src/site/apt/symbols.apt
index fc3ae38..e83a841 100644
--- a/tapestry-ioc/src/site/apt/symbols.apt
+++ b/tapestry-ioc/src/site/apt/symbols.apt
@@ -11,8 +11,8 @@
name is segmented with periods.
These symbols are used inside the
- {{{../apidocs/org/apache/tapestry/ioc/annoations/Value.html}Value}} and
- {{{../apidocs/org/apache/tapestry/ioc/annoations/InjectService.html}InjectService}}
+ {{{../apidocs/org/apache/tapestry5/ioc/annoations/Value.html}Value}} and
+ {{{../apidocs/org/apache/tapestry5/ioc/annoations/InjectService.html}InjectService}}
annotations.
For example:
@@ -34,9 +34,9 @@
Symbol Resolution
Symbols are resolved by the
- {{{../apidocs/org/apache/tapestry/ioc/services/SymbolSource.html}SymbolSource}} service. The SymbolSource
+ {{{../apidocs/org/apache/tapestry5/ioc/services/SymbolSource.html}SymbolSource}} service. The SymbolSource
checks against an ordered list of
- {{{../apidocs/org/apache/tapestry/ioc/services/SymbolProvider.html}SymbolProvider}} objects.
+ {{{../apidocs/org/apache/tapestry5/ioc/services/SymbolProvider.html}SymbolProvider}} objects.
Additional symbol providers may be employed by contributing to the tapestry.ioc.SymbolSource service configuration,
which is an ordered list of SymbolProviders.
diff --git a/tapestry-ioc/src/site/apt/upgrade.apt b/tapestry-ioc/src/site/apt/upgrade.apt
index e89406f..6ca1827 100644
--- a/tapestry-ioc/src/site/apt/upgrade.apt
+++ b/tapestry-ioc/src/site/apt/upgrade.apt
@@ -14,11 +14,11 @@
Release 5.0.12
- Several methods of {{{../apidocs/org/apache/tapestry/ioc/services/ClassFabUtils.html}ClassFabUtils}}
+ Several methods of {{{../apidocs/org/apache/tapestry5/ioc/services/ClassFabUtils.html}ClassFabUtils}}
have been removed. The new method {{{castReference()}}} is an improved replacement for the removed
methods. These methods were largely used when decorating services, and the new
- {{{../apidocs/org/apache/tapestry/ioc/services/AspectDecorator.html}AspectDecorator}} is even easier.
+ {{{../apidocs/org/apache/tapestry5/ioc/services/AspectDecorator.html}AspectDecorator}} is even easier.
For {{{https://issues.apache.org/jira/browse/TAPESTRY-2421}TAPESTRY-2421}} (compatibility between
- Tapestry 4 and Tapestry 5), the org.apache.tapestry.ioc.annotations package was renamed
- to org.apache.tapestry.ioc.annotation.
\ No newline at end of file
+ Tapestry 4 and Tapestry 5), the org.apache.tapestry5.ioc.annotations package was renamed
+ to org.apache.tapestry5.ioc.annotations.
\ No newline at end of file
diff --git a/tapestry-ioc/src/test/conf/testng.xml b/tapestry-ioc/src/test/conf/testng.xml
index 1f786b9..21ce9d2 100644
--- a/tapestry-ioc/src/test/conf/testng.xml
+++ b/tapestry-ioc/src/test/conf/testng.xml
@@ -18,16 +18,16 @@
<suite name="Tapestry IOC" thread-count="10" annotations="1.5" verbose="2" parallel="tests">
<test name="Public APIs">
<packages>
- <package name="org.apache.tapestry.ioc"/>
- <package name="org.apache.tapestry.ioc.services"/>
- <package name="org.apache.tapestry.ioc.util"/>
+ <package name="org.apache.tapestry5.ioc"/>
+ <package name="org.apache.tapestry5.ioc.services"/>
+ <package name="org.apache.tapestry5.ioc.util"/>
</packages>
</test>
<test name="Internals">
<packages>
- <package name="org.apache.tapestry.ioc.internal"/>
- <package name="org.apache.tapestry.ioc.internal.services"/>
- <package name="org.apache.tapestry.ioc.internal.util"/>
+ <package name="org.apache.tapestry5.ioc.internal"/>
+ <package name="org.apache.tapestry5.ioc.internal.services"/>
+ <package name="org.apache.tapestry5.ioc.internal.util"/>
</packages>
</test>
</suite>
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AutobuildModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AutobuildModule.java
index 805fb93..120ed93 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AutobuildModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/AutobuildModule.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public class AutobuildModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
index 3378bb9..f7932b3 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BarneyModule.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.Match;
-import org.apache.tapestry.ioc.annotation.Order;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.annotations.Match;
+import org.apache.tapestry5.ioc.annotations.Order;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BaseLocatableTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BaseLocatableTest.java
index 977f61d..e77c68d 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BaseLocatableTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BaseLocatableTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
public class BaseLocatableTest extends IOCTestCase
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BlueMarker.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BlueMarker.java
index 6f09c71..ac1c33b 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BlueMarker.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/BlueMarker.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -22,7 +22,7 @@
import java.lang.annotation.Target;
@Target(
- {PARAMETER, FIELD})
+ { PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
public @interface BlueMarker
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ConcreteServiceBuilderModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ConcreteServiceBuilderModule.java
index 61b6a43..c67b48d 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ConcreteServiceBuilderModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ConcreteServiceBuilderModule.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public class ConcreteServiceBuilderModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
index 839bf66..378a838 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/CountingGreeterImpl.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public class CountingGreeterImpl implements Greeter
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/DecoratorList.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/DecoratorList.java
index 7d9acb8..0b2fa64 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/DecoratorList.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/DecoratorList.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
import java.util.List;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/DuplicateFredModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/DuplicateFredModule.java
index 5ad184a..2471e8d 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/DuplicateFredModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/DuplicateFredModule.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public class DuplicateFredModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/DuplicateServiceTypeModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/DuplicateServiceTypeModule.java
index f8a70a9..724c3a2 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/DuplicateServiceTypeModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/DuplicateServiceTypeModule.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public class DuplicateServiceTypeModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/EagerLoadModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/EagerLoadModule.java
index dd5b8f4..d69d8a0 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/EagerLoadModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/EagerLoadModule.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.EagerLoad;
+import org.apache.tapestry5.ioc.annotations.EagerLoad;
/**
* Used to test service eager loading.
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
index 3d915e8..1957999 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FailInConstructorRunnable.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public class FailInConstructorRunnable implements Runnable
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
index 6947d26..6a20f7d 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/FredModule.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.Match;
-import org.apache.tapestry.ioc.annotation.Order;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.annotations.Match;
+import org.apache.tapestry5.ioc.annotations.Order;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.Collection;
import java.util.Collections;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Greeter.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Greeter.java
index 276a5f7..4be0b86 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Greeter.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Greeter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public interface Greeter
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
index e33a2fd..b3605c5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/GreeterModule.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.InjectService;
-import org.apache.tapestry.ioc.annotation.Marker;
+import org.apache.tapestry5.ioc.annotations.InjectService;
+import org.apache.tapestry5.ioc.annotations.Marker;
public class GreeterModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/HelterModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/HelterModule.java
index d0b3f2d..3e1572d 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/HelterModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/HelterModule.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.SubModule;
+import org.apache.tapestry5.ioc.annotations.SubModule;
@SubModule(SkelterModule.class)
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Indirection.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Indirection.java
index 13bce89..322b7d0 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Indirection.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Indirection.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
* Used to demonstrate indirection via symbols.
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolder.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolder.java
index d714fb7..db73cec 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolder.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolder.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public interface IntHolder
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
index 22d45d3..c6a0274 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntHolderImpl.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public class IntHolderImpl implements IntHolder
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntegrationTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntegrationTest.java
index 508aa9f..e9b7175 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntegrationTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/IntegrationTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.internal.ExceptionInConstructorModule;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.*;
+import org.apache.tapestry5.ioc.internal.ExceptionInConstructorModule;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.*;
import org.easymock.EasyMock;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -456,7 +456,7 @@
catch (RuntimeException ex)
{
assertMessageContains(ex,
- "Class org.apache.tapestry.ioc.UnbuildablePingable does not contain a public constructor needed to autobuild.");
+ "Class org.apache.tapestry5.ioc.UnbuildablePingable does not contain a public constructor needed to autobuild.");
// Like to check that the message includes the source location
@@ -480,7 +480,7 @@
catch (RuntimeException ex)
{
assertMessageContains(ex,
- "Class org.apache.tapestry.ioc.UnbuildablePingable does not contain a public constructor needed to autobuild.");
+ "Class org.apache.tapestry5.ioc.UnbuildablePingable does not contain a public constructor needed to autobuild.");
}
r.shutdown();
@@ -499,7 +499,7 @@
}
catch (RuntimeException ex)
{
- assertMessageContains(ex, "Error invoking constructor org.apache.tapestry.ioc.FailInConstructorRunnable()",
+ assertMessageContains(ex, "Error invoking constructor org.apache.tapestry5.ioc.FailInConstructorRunnable()",
"Failure in Runnable constructor.");
// Like to check that the message includes the source location
@@ -560,7 +560,7 @@
catch (RuntimeException ex)
{
assertEquals(ex.getMessage(),
- "Service interface org.apache.tapestry.ioc.Pingable is matched by 2 services: Barney, Fred. Automatic dependency resolution requires that exactly one service implement the interface.");
+ "Service interface org.apache.tapestry5.ioc.Pingable is matched by 2 services: Barney, Fred. Automatic dependency resolution requires that exactly one service implement the interface.");
}
r.shutdown();
@@ -592,7 +592,7 @@
Greeter g = r.getService("Greeter", Greeter.class);
assertEquals(g.getGreeting(), "Hello");
- assertEquals(g.toString(), "<Proxy for Greeter(org.apache.tapestry.ioc.Greeter)>");
+ assertEquals(g.toString(), "<Proxy for Greeter(org.apache.tapestry5.ioc.Greeter)>");
r.shutdown();
}
@@ -605,7 +605,7 @@
Greeter g = r.getService("${greeter}", Greeter.class);
assertEquals(g.getGreeting(), "Hello");
- assertEquals(g.toString(), "<Proxy for HelloGreeter(org.apache.tapestry.ioc.Greeter)>");
+ assertEquals(g.toString(), "<Proxy for HelloGreeter(org.apache.tapestry5.ioc.Greeter)>");
r.shutdown();
}
@@ -637,9 +637,9 @@
catch (RuntimeException ex)
{
assertMessageContains(ex, "Error invoking service builder method",
- "Unable to locate a single service assignable to type org.apache.tapestry.ioc.Greeter with marker annotation org.apache.tapestry.ioc.RedMarker",
- "org.apache.tapestry.ioc.GreeterModule.buildRedGreeter1()",
- "org.apache.tapestry.ioc.GreeterModule.buildRedGreeter2()");
+ "Unable to locate a single service assignable to type org.apache.tapestry5.ioc.Greeter with marker annotation org.apache.tapestry5.ioc.RedMarker",
+ "org.apache.tapestry5.ioc.GreeterModule.buildRedGreeter1()",
+ "org.apache.tapestry5.ioc.GreeterModule.buildRedGreeter2()");
}
r.shutdown();
@@ -660,7 +660,7 @@
catch (RuntimeException ex)
{
assertMessageContains(ex, "Error invoking service builder method",
- " Unable to locate any service assignable to type org.apache.tapestry.ioc.Greeter with marker annotation org.apache.tapestry.ioc.YellowMarker.");
+ " Unable to locate any service assignable to type org.apache.tapestry5.ioc.Greeter with marker annotation org.apache.tapestry5.ioc.YellowMarker.");
}
r.shutdown();
@@ -749,7 +749,7 @@
assertEquals(CountingGreeterImpl.instantiationCount, 0);
assertEquals(g.toString(),
- "<Autobuild proxy org.apache.tapestry.ioc.CountingGreeterImpl(org.apache.tapestry.ioc.Greeter)>");
+ "<Autobuild proxy org.apache.tapestry5.ioc.CountingGreeterImpl(org.apache.tapestry5.ioc.Greeter)>");
assertEquals(CountingGreeterImpl.instantiationCount, 0);
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/MarkerModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/MarkerModule.java
index 5cc89d2..781d142 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/MarkerModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/MarkerModule.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.Marker;
+import org.apache.tapestry5.ioc.annotations.Marker;
public class MarkerModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/MasterModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/MasterModule.java
index 2db09b8..a26354b 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/MasterModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/MasterModule.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.SubModule;
+import org.apache.tapestry5.ioc.annotations.SubModule;
/**
- * Used by {@link org.apache.tapestry.ioc.RegistryBuilderTest}.
+ * Used by {@link org.apache.tapestry5.ioc.RegistryBuilderTest}.
*/
@SubModule(
{ FredModule.class, BarneyModule.class })
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NameListHolder.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NameListHolder.java
index 95399a1..e0c8cf9 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NameListHolder.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NameListHolder.java
@@ -1,25 +1,25 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc;
import java.util.List;
/**
- * Used for testing of ordered and unordered contributions. The names are contributed in from
- * multiple modules. For unordered contributions, the values are sorted alphabetically. For ordered
- * contributions, the values are ordered as per the contributions.
+ * Used for testing of ordered and unordered contributions. The names are contributed in from multiple modules. For
+ * unordered contributions, the values are sorted alphabetically. For ordered contributions, the values are ordered as
+ * per the contributions.
*/
public interface NameListHolder
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NonProxiedServiceModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NonProxiedServiceModule.java
index 1351bbb..f92f608 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NonProxiedServiceModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/NonProxiedServiceModule.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public class NonProxiedServiceModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/PerThreadModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/PerThreadModule.java
index 0a6f700..31065cc 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/PerThreadModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/PerThreadModule.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import static org.apache.tapestry.ioc.IOCConstants.PERTHREAD_SCOPE;
-import org.apache.tapestry.ioc.annotation.Scope;
+import static org.apache.tapestry5.ioc.IOCConstants.PERTHREAD_SCOPE;
+import org.apache.tapestry5.ioc.annotations.Scope;
public class PerThreadModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Pingable.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Pingable.java
index d81957b..6770951 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Pingable.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Pingable.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
* Interface used as a stand-in for testing for more complicated services.
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
index 74eec14..1fea4ef 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RecursiveConstructorModule.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.InjectService;
+import org.apache.tapestry5.ioc.annotations.InjectService;
/**
- * Used by {@link org.apache.tapestry.ioc.IntegrationTest}.
+ * Used by {@link org.apache.tapestry5.ioc.IntegrationTest}.
*/
public class RecursiveConstructorModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
index ea7f14d..80d274e 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedGreeterImpl.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.Marker;
+import org.apache.tapestry5.ioc.annotations.Marker;
@Marker(RedMarker.class)
public class RedGreeterImpl implements Greeter
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedMarker.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedMarker.java
index 6e4b0b7..6080d7a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedMarker.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RedMarker.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -22,7 +22,7 @@
import java.lang.annotation.Target;
@Target(
- {PARAMETER, FIELD})
+ { PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
public @interface RedMarker
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTest.java
index 5bdfdfc..1a54113 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.util.Arrays;
@@ -62,7 +62,7 @@
// This proves that the IOC works, the service builder method was invoked, that the
// ClassFactory service was accessed and used.
- assertEquals(service.toString(), "<Proxy for Square(org.apache.tapestry.ioc.Square)>");
+ assertEquals(service.toString(), "<Proxy for Square(org.apache.tapestry5.ioc.Square)>");
registry.shutdown();
}
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
index f03e1c8..9b8732f 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/RegistryBuilderTestModule.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public class RegistryBuilderTestModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderAutobuilderModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderAutobuilderModule.java
index f10416d..e4e9ed3 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderAutobuilderModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/ServiceBuilderAutobuilderModule.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public class ServiceBuilderAutobuilderModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Sizer.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Sizer.java
index 7425abd..59c8a55 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Sizer.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Sizer.java
@@ -1,22 +1,22 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc;
/**
- * Encapsulates a strategy for determining the size of an object. Different implementations are
- * mapped to different types.
+ * Encapsulates a strategy for determining the size of an object. Different implementations are mapped to different
+ * types.
*/
public interface Sizer
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SkelterModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SkelterModule.java
index c6f4352..4bdee3d 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SkelterModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/SkelterModule.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.SubModule;
+import org.apache.tapestry5.ioc.annotations.SubModule;
@SubModule(HelterModule.class)
public class SkelterModule
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Square.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Square.java
index 56c5433..17ef106 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Square.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/Square.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
- * Used by {@link org.apache.tapestry.ioc.RegistryBuilderTest}.
+ * Used by {@link org.apache.tapestry5.ioc.RegistryBuilderTest}.
*/
public interface Square
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
index 5caef20..8f514f0 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StaticModule.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
import java.util.Collection;
import java.util.Collections;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolder.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolder.java
index 5abfa6b..4435f3d 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolder.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolder.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
*
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
index 8e1a411..f480e80 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringHolderImpl.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
*
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringTransformer.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringTransformer.java
index 194ec3e..c338806 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringTransformer.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/StringTransformer.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
- * Used by {@link org.apache.tapestry.ioc.IntegrationTest}.
+ * Used by {@link org.apache.tapestry5.ioc.IntegrationTest}.
*/
public interface StringTransformer
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
index c27d6f4..a1edc1a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnbuildablePingable.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
/**
* Used to test failure to autobuild a service because of a lack of a public constructor.
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
index 326fcde..2dfbd8e 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownColorGreeterImpl.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
public class UnknownColorGreeterImpl implements Greeter
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownScopeModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownScopeModule.java
index ed4b8b5..166ee21 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownScopeModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/UnknownScopeModule.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
-import org.apache.tapestry.ioc.annotation.Scope;
+import org.apache.tapestry5.ioc.annotations.Scope;
public class UnknownScopeModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/YellowMarker.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/YellowMarker.java
index 1381921..a32d25d 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/YellowMarker.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/YellowMarker.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
+package org.apache.tapestry5.ioc;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -22,7 +22,7 @@
import java.lang.annotation.Target;
@Target(
- {PARAMETER, FIELD})
+ { PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
public @interface YellowMarker
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ArrayDecoratorMethodModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ArrayDecoratorMethodModule.java
index 8c55b70..4ef5e66 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ArrayDecoratorMethodModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ArrayDecoratorMethodModule.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.DefaultModuleDefImplTest}.
*/
public class ArrayDecoratorMethodModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/BuilderMethodModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/BuilderMethodModule.java
index 81aa221..053fa3b 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/BuilderMethodModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/BuilderMethodModule.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
public class BuilderMethodModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ComplexAutobuildModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ComplexAutobuildModule.java
index b0b27da..0302bdb 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ComplexAutobuildModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ComplexAutobuildModule.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ServiceBinder;
-import org.apache.tapestry.ioc.StringHolder;
-import org.apache.tapestry.ioc.StringHolderImpl;
+import org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.StringHolder;
+import org.apache.tapestry5.ioc.StringHolderImpl;
public class ComplexAutobuildModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ContributionDefImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ContributionDefImplTest.java
index 6c71d91..5330b7d 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ContributionDefImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ContributionDefImplTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotation.InjectService;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.annotations.InjectService;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.isA;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImplTest.java
index 2897933..af3b757 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DefaultModuleDefImplTest.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.DecoratorDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import static org.apache.tapestry.ioc.internal.IOCMessages.buildMethodConflict;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.DecoratorDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import static org.apache.tapestry5.ioc.internal.IOCMessages.buildMethodConflict;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryImpl;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import static org.easymock.EasyMock.and;
import static org.easymock.EasyMock.contains;
import org.slf4j.Logger;
@@ -385,7 +385,7 @@
catch (RuntimeException ex)
{
assertEquals(ex.getMessage(),
- "Class org.apache.tapestry.ioc.internal.RunnableServiceImpl (implementation of service \'Runnable\') does not contain any public constructors.");
+ "Class org.apache.tapestry5.ioc.internal.RunnableServiceImpl (implementation of service \'Runnable\') does not contain any public constructors.");
}
verify();
@@ -421,7 +421,7 @@
logger
.debug(contains(
- "Invoking constructor org.apache.tapestry.ioc.internal.MultipleConstructorsAutobuildService(StringHolder)"));
+ "Invoking constructor org.apache.tapestry5.ioc.internal.MultipleConstructorsAutobuildService(StringHolder)"));
train_getServiceId(resources, "StringHolder");
train_getLogger(resources, logger);
@@ -464,7 +464,7 @@
assertTrue(ex
.getMessage()
.matches(
- "Error invoking service binder method org.apache.tapestry.ioc.internal.ExceptionInBindMethod.bind\\(ServiceBinder\\) " + "\\(at ExceptionInBindMethod.java:\\d+\\): Really, how often is this going to happen\\?"));
+ "Error invoking service binder method org.apache.tapestry5.ioc.internal.ExceptionInBindMethod.bind\\(ServiceBinder\\) " + "\\(at ExceptionInBindMethod.java:\\d+\\): Really, how often is this going to happen\\?"));
}
verify();
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DefaultServiceIdModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DefaultServiceIdModule.java
index 7eab8be..4d75d58 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DefaultServiceIdModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/DefaultServiceIdModule.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
public class DefaultServiceIdModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationModule.java
index 4532d16..d2ec410 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationModule.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.ServiceBinder;
public class EagerLoadViaAnnotationModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
index 694d4bc..9c51680 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/EagerLoadViaAnnotationServiceImpl.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.annotation.EagerLoad;
+import org.apache.tapestry5.ioc.annotations.EagerLoad;
@EagerLoad
public class EagerLoadViaAnnotationServiceImpl implements Runnable
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInBindMethod.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInBindMethod.java
index f575737..a2e1f13 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInBindMethod.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInBindMethod.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.ServiceBinder;
public class ExceptionInBindMethod
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorModule.java
index 850dda6..4818545 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorModule.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.Pingable;
-import org.apache.tapestry.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.Pingable;
+import org.apache.tapestry5.ioc.ServiceBinder;
public class ExceptionInConstructorModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
index 7e84409..f4c9013 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExceptionInConstructorServiceImpl.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.Pingable;
+import org.apache.tapestry5.ioc.Pingable;
public class ExceptionInConstructorServiceImpl implements Pingable
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
index b18dbd9..8d367c5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ExtraPublicConstructorsModule.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.annotation.InjectService;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.annotations.InjectService;
+import org.apache.tapestry5.ioc.services.ClassFactory;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.ModuleImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.ModuleImplTest}.
*/
public class ExtraPublicConstructorsModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/FieService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/FieService.java
index 2b63f10..73c742b 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/FieService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/FieService.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
* A placeholder for a real service interface.
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/FoeService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/FoeService.java
index 929d26e..93b4be6 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/FoeService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/FoeService.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
* A placeholder for a real service interface.
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/GlobPatternMatcherTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/GlobPatternMatcherTest.java
index 7f64c3e..ac5a5a8 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/GlobPatternMatcherTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/GlobPatternMatcherTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilderTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilderTest.java
index 365180f..bd82fc5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilderTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/InterceptorStackBuilderTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceDecorator;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ServiceDecorator;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
import org.testng.annotations.Test;
import static java.util.Arrays.asList;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/LoggerSourceImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/LoggerSourceImplTest.java
index 2dd5f13..e59f38c 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/LoggerSourceImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/LoggerSourceImplTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.LoggerSource;
+import org.apache.tapestry5.ioc.LoggerSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MappedConfigurationModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MappedConfigurationModule.java
index e5a3cad..4aafe20 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MappedConfigurationModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MappedConfigurationModule.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.MappedConfiguration;
+import org.apache.tapestry5.ioc.MappedConfiguration;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImpl}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.DefaultModuleDefImpl}.
*/
public class MappedConfigurationModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleBuilderWithId.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleBuilderWithId.java
index ef4fe6a..fcff4a5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleBuilderWithId.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleBuilderWithId.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.DefaultModuleDefImplTest}.
*/
public class ModuleBuilderWithId
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleImplTest.java
index 7822397..047ba80 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleImplTest.java
@@ -12,17 +12,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.RegistryBuilder;
-import org.apache.tapestry.ioc.def.DecoratorDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import org.apache.tapestry.ioc.internal.services.ClassFactoryImpl;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.RegistryShutdownListener;
-import org.apache.tapestry.ioc.services.Status;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.RegistryBuilder;
+import org.apache.tapestry5.ioc.def.DecoratorDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.internal.services.ClassFactoryImpl;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.RegistryShutdownListener;
+import org.apache.tapestry5.ioc.services.Status;
import static org.easymock.EasyMock.contains;
import static org.easymock.EasyMock.isA;
import org.slf4j.Logger;
@@ -155,7 +155,7 @@
catch (RuntimeException ex)
{
assertEquals(ex.getMessage(),
- "Module builder class org.apache.tapestry.ioc.internal.PrivateConstructorModule " + "does not contain any public constructors.");
+ "Module builder class org.apache.tapestry5.ioc.internal.PrivateConstructorModule " + "does not contain any public constructors.");
}
verify();
@@ -209,7 +209,7 @@
UpcaseService us = registry.getService(UpcaseService.class);
assertEquals(us.upcase("hello"), "HELLO");
- assertEquals(us.toString(), "<Proxy for Upcase(org.apache.tapestry.ioc.internal.UpcaseService)>");
+ assertEquals(us.toString(), "<Proxy for Upcase(org.apache.tapestry5.ioc.internal.UpcaseService)>");
ToStringService ts = registry.getService(ToStringService.class);
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleImplTestModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleImplTestModule.java
index 9b8ddba..1229ae3 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleImplTestModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ModuleImplTestModule.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.annotation.InjectService;
+import org.apache.tapestry5.ioc.annotations.InjectService;
/**
* Module builder used by {@link ModuleImplTest}.
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
index 15ca944..dda2326 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MultipleConstructorsAutobuildService.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.StringHolder;
-import org.apache.tapestry.ioc.annotation.InjectService;
+import org.apache.tapestry5.ioc.StringHolder;
+import org.apache.tapestry5.ioc.annotations.InjectService;
public class MultipleConstructorsAutobuildService implements StringHolder
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MutlipleAutobuildServiceConstructorsModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MutlipleAutobuildServiceConstructorsModule.java
index 1fa1707..96083d4 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MutlipleAutobuildServiceConstructorsModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/MutlipleAutobuildServiceConstructorsModule.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ServiceBinder;
-import org.apache.tapestry.ioc.StringHolder;
+import org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.StringHolder;
public class MutlipleAutobuildServiceConstructorsModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoDelegateDecoratorMethodModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoDelegateDecoratorMethodModule.java
index 6005f96..ebb99af 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoDelegateDecoratorMethodModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoDelegateDecoratorMethodModule.java
@@ -1,27 +1,27 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.internal;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.ioc.internal;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.DefaultModuleDefImplTest}.
*/
public class NoDelegateDecoratorMethodModule
{
/**
- * Decorator methods need to define a parameter of type Object which is the delegate object.
- * Typically, it is a parameterized type, but it has to be there.
+ * Decorator methods need to define a parameter of type Object which is the delegate object. Typically, it is a
+ * parameterized type, but it has to be there.
*/
public Object decorateNoDelegate()
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoUsableContributionParameterModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoUsableContributionParameterModule.java
index 06185dd..215367c 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoUsableContributionParameterModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NoUsableContributionParameterModule.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.annotation.InjectService;
+import org.apache.tapestry5.ioc.annotations.InjectService;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImpl}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.DefaultModuleDefImpl}.
*/
public class NoUsableContributionParameterModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonStaticBindMethodModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonStaticBindMethodModule.java
index e3c1707..bfff2ff 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonStaticBindMethodModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/NonStaticBindMethodModule.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ServiceBinder;
-import org.apache.tapestry.ioc.StringHolder;
-import org.apache.tapestry.ioc.StringHolderImpl;
+import org.apache.tapestry5.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.StringHolder;
+import org.apache.tapestry5.ioc.StringHolderImpl;
public class NonStaticBindMethodModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/OrderedConfigurationModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/OrderedConfigurationModule.java
index 7d36409..6d13573 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/OrderedConfigurationModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/OrderedConfigurationModule.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.OrderedConfiguration;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImpl}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.DefaultModuleDefImpl}.
*/
public class OrderedConfigurationModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/PrimitiveDecoratorMethodModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/PrimitiveDecoratorMethodModule.java
index e78c7cb..82587fd 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/PrimitiveDecoratorMethodModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/PrimitiveDecoratorMethodModule.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.DefaultModuleDefImplTest}.
*/
public class PrimitiveDecoratorMethodModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/PrivateConstructorModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/PrivateConstructorModule.java
index 7108e2f..33b5977 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/PrivateConstructorModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/PrivateConstructorModule.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.ModuleImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.ModuleImplTest}.
*/
public class PrivateConstructorModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ReadManifest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ReadManifest.java
index 4a2e0ac..66f3a2f 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ReadManifest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ReadManifest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
import java.io.InputStream;
import static java.lang.String.format;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RecursiveServiceCreationCheckWrapperTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RecursiveServiceCreationCheckWrapperTest.java
index 765146b..c5b70f6 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RecursiveServiceCreationCheckWrapperTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RecursiveServiceCreationCheckWrapperTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.def.ServiceDef;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.def.ServiceDef;
import org.slf4j.Logger;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
index b2bc4c6..75b5bb5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/RunnableServiceImpl.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
* This service implementation is not instantiable, which triggers an exception.
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodFixture.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodFixture.java
index a77691f..833352d 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodFixture.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodFixture.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ServiceResources;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.annotation.InjectService;
-import org.apache.tapestry.ioc.annotation.Value;
+import org.apache.tapestry5.ioc.ServiceResources;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.InjectService;
+import org.apache.tapestry5.ioc.annotations.Value;
import org.slf4j.Logger;
import org.testng.Assert;
@@ -26,7 +26,7 @@
import java.util.List;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.ServiceBuilderMethodInvokerTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.ServiceBuilderMethodInvokerTest}.
*/
public class ServiceBuilderMethodFixture extends Assert
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvokerTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvokerTest.java
index ecf5dec..d655dfa 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvokerTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceBuilderMethodInvokerTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
-import static org.apache.tapestry.ioc.internal.AbstractServiceCreator.findParameterizedTypeFromGenericType;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ServiceBuilderResources;
+import static org.apache.tapestry5.ioc.internal.AbstractServiceCreator.findParameterizedTypeFromGenericType;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.isA;
import org.slf4j.Logger;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorFixture.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorFixture.java
index cea830e..cc85bbc 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorFixture.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorFixture.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
import org.testng.Assert;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.ServiceDecoratorImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.ServiceDecoratorImplTest}.
*/
public class ServiceDecoratorFixture extends Assert
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImplTest.java
index 036e86c..d7862a0 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceDecoratorImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ModuleBuilderSource;
-import org.apache.tapestry.ioc.ServiceResources;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.ModuleBuilderSource;
+import org.apache.tapestry5.ioc.ServiceResources;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.slf4j.Logger;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdConflictMethodModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdConflictMethodModule.java
index b2b9f9a..e0fb89c 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdConflictMethodModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceIdConflictMethodModule.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.DefaultModuleDefImplTest}.
*/
public class ServiceIdConflictMethodModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceProxySerializationTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceProxySerializationTest.java
index 4044065..a10aa01 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceProxySerializationTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ServiceProxySerializationTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.io.*;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/SimpleModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/SimpleModule.java
index 6e2e0ef..bf684a0 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/SimpleModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/SimpleModule.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.Configuration;
-import org.apache.tapestry.ioc.annotation.EagerLoad;
-import org.apache.tapestry.ioc.annotation.Scope;
+import org.apache.tapestry5.ioc.Configuration;
+import org.apache.tapestry5.ioc.annotations.EagerLoad;
+import org.apache.tapestry5.ioc.annotations.Scope;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.DefaultModuleDefImplTest}.
*/
public class SimpleModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/SingletonServiceLifecycleTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/SingletonServiceLifecycleTest.java
index 6b6f0ee..4cd84ca 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/SingletonServiceLifecycleTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/SingletonServiceLifecycleTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceLifecycle;
-import org.apache.tapestry.ioc.ServiceResources;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ServiceLifecycle;
+import org.apache.tapestry5.ioc.ServiceResources;
import org.testng.annotations.Test;
public class SingletonServiceLifecycleTest extends IOCInternalTestCase
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
index dc28abd..42db921 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToStringService.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.SingletonServiceLifecycleTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.SingletonServiceLifecycleTest}.
*/
public interface ToStringService
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
index aa5d643..19d7d24 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ToUpperCaseStringHolder.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.StringHolder;
+import org.apache.tapestry5.ioc.StringHolder;
public class ToUpperCaseStringHolder implements StringHolder
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TooManyContributionParametersModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TooManyContributionParametersModule.java
index 0fc0b0a..590f53b 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TooManyContributionParametersModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/TooManyContributionParametersModule.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.Configuration;
-import org.apache.tapestry.ioc.OrderedConfiguration;
+import org.apache.tapestry5.ioc.Configuration;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImpl}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.DefaultModuleDefImpl}.
*/
public class TooManyContributionParametersModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UninstantiableAutobuildServiceModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UninstantiableAutobuildServiceModule.java
index 2b661c5..5fc15da 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UninstantiableAutobuildServiceModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UninstantiableAutobuildServiceModule.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.ServiceBinder;
+import org.apache.tapestry5.ioc.ServiceBinder;
public class UninstantiableAutobuildServiceModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseService.java
index 464f044..3c93ccf 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseService.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.SingletonServiceLifecycleTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.SingletonServiceLifecycleTest}.
*/
public interface UpcaseService
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
index 1f2a76b..ed369d2 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/UpcaseServiceImpl.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
*
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ValidatingConfigurationWrapperTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ValidatingConfigurationWrapperTest.java
index 202ccfd..8dbedc1 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ValidatingConfigurationWrapperTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ValidatingConfigurationWrapperTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.Configuration;
-import org.apache.tapestry.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.Configuration;
+import org.apache.tapestry5.ioc.def.ContributionDef;
import org.slf4j.Logger;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapperTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapperTest.java
index a6e69cd..48ab6dc 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapperTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ValidatingMappedConfigurationWrapperTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
import org.slf4j.Logger;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapperTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapperTest.java
index 1437c1e..964a3bf 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapperTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/ValidatingOrderedConfigurationWrapperTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
-import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
+import org.apache.tapestry5.ioc.def.ContributionDef;
import org.slf4j.Logger;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/VoidBuilderMethodModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/VoidBuilderMethodModule.java
index bc4e3b3..ae1dbd4 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/VoidBuilderMethodModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/VoidBuilderMethodModule.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.DefaultModuleDefImplTest}.
*/
public class VoidBuilderMethodModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/VoidDecoratorMethodModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/VoidDecoratorMethodModule.java
index ad72037..bb1ba8a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/VoidDecoratorMethodModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/VoidDecoratorMethodModule.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal;
+package org.apache.tapestry5.ioc.internal;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.DefaultModuleDefImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.DefaultModuleDefImplTest}.
*/
public class VoidDecoratorMethodModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AbstractIntWrapper.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AbstractIntWrapper.java
index b8a9b72..e63db8b 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AbstractIntWrapper.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AbstractIntWrapper.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.services.ClassFabImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.services.ClassFabImplTest}.
*/
public abstract class AbstractIntWrapper
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AbstractInvocationTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AbstractInvocationTest.java
index fb3fdd1..70afe96 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AbstractInvocationTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AbstractInvocationTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Invocation;
-import org.apache.tapestry.ioc.test.TestBase;
+import org.apache.tapestry5.ioc.Invocation;
+import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.Test;
import java.lang.reflect.Method;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AnnotatedBean.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AnnotatedBean.java
index 101f90b..622ab43 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AnnotatedBean.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AnnotatedBean.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.annotation.Scope;
+import org.apache.tapestry5.ioc.annotations.Scope;
public class AnnotatedBean
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ArraysSubject.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ArraysSubject.java
index 73da7b2..d7c0871 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ArraysSubject.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ArraysSubject.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface ArraysSubject
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ArraysSubjectImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ArraysSubjectImpl.java
index 23398f4..2982679 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ArraysSubjectImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ArraysSubjectImpl.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public class ArraysSubjectImpl implements ArraysSubject
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImplTest.java
index 9804bac..6416da8 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/AspectInterceptorBuilderImplTest.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Invocation;
-import org.apache.tapestry.ioc.MethodAdvice;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.AspectDecorator;
-import org.apache.tapestry.ioc.services.AspectInterceptorBuilder;
+import org.apache.tapestry5.ioc.Invocation;
+import org.apache.tapestry5.ioc.MethodAdvice;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.AspectDecorator;
+import org.apache.tapestry5.ioc.services.AspectInterceptorBuilder;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
/**
- * Tests a few edge and error cases not covered by {@link org.apache.tapestry.ioc.internal.services.LoggingDecoratorImplTest}.
+ * Tests a few edge and error cases not covered by {@link org.apache.tapestry5.ioc.internal.services.LoggingDecoratorImplTest}.
*/
public class AspectInterceptorBuilderImplTest extends IOCInternalTestCase
{
@@ -96,7 +96,7 @@
catch (IllegalArgumentException ex)
{
assertEquals(ex.getMessage(),
- "Method public abstract void java.lang.Runnable.run() is not defined for interface interface org.apache.tapestry.ioc.internal.services.AspectInterceptorBuilderImplTest$Subject.");
+ "Method public abstract void java.lang.Runnable.run() is not defined for interface interface org.apache.tapestry5.ioc.internal.services.AspectInterceptorBuilderImplTest$Subject.");
}
@@ -128,7 +128,7 @@
catch (IllegalArgumentException ex)
{
assertEquals(ex.getMessage(),
- "Method public abstract void org.apache.tapestry.ioc.internal.services.AspectInterceptorBuilderImplTest$Subject.advised() has already been advised.");
+ "Method public abstract void org.apache.tapestry5.ioc.internal.services.AspectInterceptorBuilderImplTest$Subject.advised() has already been advised.");
}
verify();
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/BeanWithIndexedProperty.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/BeanWithIndexedProperty.java
index d214d77..62e3af0 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/BeanWithIndexedProperty.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/BeanWithIndexedProperty.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public class BeanWithIndexedProperty
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilderTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilderTest.java
index dcd8e4b..0a536da 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilderTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/BridgeBuilderTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.ClassFactory;
import org.slf4j.Logger;
import org.testng.annotations.Test;
@@ -63,7 +63,7 @@
assertEquals(
bridge.toString(),
- "<PipelineBridge from org.apache.tapestry.ioc.internal.services.StandardService to org.apache.tapestry.ioc.internal.services.StandardFilter>");
+ "<PipelineBridge from org.apache.tapestry5.ioc.internal.services.StandardService to org.apache.tapestry5.ioc.internal.services.StandardFilter>");
verify();
}
@@ -143,7 +143,7 @@
logger
.error("Method void extraFilterMethod() of filter interface "
- + "org.apache.tapestry.ioc.internal.services.ExtraFilterMethod does not have a matching method "
+ + "org.apache.tapestry5.ioc.internal.services.ExtraFilterMethod does not have a matching method "
+ "in java.io.Serializable.");
replay();
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImplTest.java
index 56085f2..a754bc7 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ChainBuilderImplTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.ChainBuilder;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.ChainBuilder;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ChainCommand.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ChainCommand.java
index 3a32c86..68ef8e3 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ChainCommand.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ChainCommand.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
/**
- * Used with {@link org.apache.tapestry.ioc.internal.services.ChainBuilderImplTest}.
+ * Used with {@link org.apache.tapestry5.ioc.internal.services.ChainBuilderImplTest}.
*/
public interface ChainCommand
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassFabImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassFabImplTest.java
index fb4a927..19748ae 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassFabImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassFabImplTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
import javassist.CtClass;
-import org.apache.tapestry.ioc.BaseLocatable;
-import org.apache.tapestry.ioc.internal.services.LoggingDecoratorImplTest.ToStringService;
-import org.apache.tapestry.ioc.services.ClassFab;
-import org.apache.tapestry.ioc.services.MethodSignature;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.BaseLocatable;
+import org.apache.tapestry5.ioc.internal.services.LoggingDecoratorImplTest.ToStringService;
+import org.apache.tapestry5.ioc.services.ClassFab;
+import org.apache.tapestry5.ioc.services.MethodSignature;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.slf4j.LoggerFactory;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassFactoryImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassFactoryImplTest.java
index 9c020bf..ee86fc5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassFactoryImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassFactoryImplTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.util.LocationImpl;
-import org.apache.tapestry.ioc.services.ClassFab;
-import org.apache.tapestry.ioc.services.ClassFabUtils;
-import org.apache.tapestry.ioc.services.ClassFactory;
-import org.apache.tapestry.ioc.services.MethodSignature;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.util.LocationImpl;
+import org.apache.tapestry5.ioc.services.ClassFab;
+import org.apache.tapestry5.ioc.services.ClassFabUtils;
+import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.MethodSignature;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.lang.reflect.Constructor;
@@ -100,7 +100,7 @@
Location l = factory.getMethodLocation(m);
assertEquals(
l.toString(),
- "org.apache.tapestry.ioc.internal.services.LineNumberBean.fred() (at LineNumberBean.java:25)");
+ "org.apache.tapestry5.ioc.internal.services.LineNumberBean.fred() (at LineNumberBean.java:25)");
assertEquals(l.getLine(), 25);
m = target.getMethod("betty", String.class, int.class);
@@ -109,13 +109,13 @@
assertEquals(
factory.getMethodLocation(m).toString(),
- "org.apache.tapestry.ioc.internal.services.LineNumberBean.betty(String, int) (at LineNumberBean.java:29)");
+ "org.apache.tapestry5.ioc.internal.services.LineNumberBean.betty(String, int) (at LineNumberBean.java:29)");
m = target.getDeclaredMethod("wilma", int[].class, Double[][][].class);
assertEquals(
factory.getMethodLocation(m).toString(),
- "org.apache.tapestry.ioc.internal.services.LineNumberBean.wilma(int[], Double[][][]) (at LineNumberBean.java:34)");
+ "org.apache.tapestry5.ioc.internal.services.LineNumberBean.wilma(int[], Double[][][]) (at LineNumberBean.java:34)");
}
private void addRunMethod(ClassFab cf)
@@ -136,7 +136,7 @@
.getConstructorLocation(cc)
.toString()
.matches(
- "org.apache.tapestry.ioc.internal.services.LineNumberBean\\(String, int\\) \\(at LineNumberBean.java:(19|20)\\)"));
+ "org.apache.tapestry5.ioc.internal.services.LineNumberBean\\(String, int\\) \\(at LineNumberBean.java:(19|20)\\)"));
}
/**
@@ -152,8 +152,8 @@
}
/**
- * Import a class where the bytecode is not available, to ensure that the super-class (from an
- * available class loader) is returned.
+ * Import a class where the bytecode is not available, to ensure that the super-class (from an available class
+ * loader) is returned.
*/
@Test
public void import_proxy_class() throws Exception
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImplTest.java
index ddc8c75..96ff0bc 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ClassNameLocatorImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.ioc.services.ClassNameLocator;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.ioc.services.ClassNameLocator;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -77,11 +77,11 @@
ClassNameLocator locator = new ClassNameLocatorImpl();
Collection<String> names = locator
- .locateClassNames("org.apache.tapestry.ioc.services");
+ .locateClassNames("org.apache.tapestry5.ioc.services");
- assertInList(names, "org.apache.tapestry.ioc.services", "SymbolSource", "TapestryIOCModule");
+ assertInList(names, "org.apache.tapestry5.ioc.services", "SymbolSource", "TapestryIOCModule");
- assertNotInList(names, "org.apache.tapestry.ioc.services", "TapestryIOCModule$1");
+ assertNotInList(names, "org.apache.tapestry5.ioc.services", "TapestryIOCModule$1");
}
@Test
@@ -89,15 +89,15 @@
{
ClassNameLocator locator = new ClassNameLocatorImpl();
- Collection<String> names = locator.locateClassNames("org.apache.tapestry");
+ Collection<String> names = locator.locateClassNames("org.apache.tapestry5");
assertInList(
names,
- "org.apache.tapestry",
+ "org.apache.tapestry5",
"ioc.Orderable",
"ioc.services.ChainBuilder");
- assertNotInList(names, "org.apache.tapestry.ioc", "services.TapestryIOCModule$1");
+ assertNotInList(names, "org.apache.tapestry5.ioc", "services.TapestryIOCModule$1");
}
void assertInList(Collection<String> names, String packageName, String... classNames)
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImplTest.java
index 9b02c37..6ed7ba6 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/DefaultImplementationBuilderImplTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.DefaultImplementationBuilder;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.DefaultImplementationBuilder;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImplTest.java
index f7e6cbe..5334d6f 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExceptionAnalyzerImplTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
-import org.apache.tapestry.ioc.services.ExceptionAnalysis;
-import org.apache.tapestry.ioc.services.ExceptionAnalyzer;
-import org.apache.tapestry.ioc.services.ExceptionInfo;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.ioc.services.ExceptionAnalysis;
+import org.apache.tapestry5.ioc.services.ExceptionAnalyzer;
+import org.apache.tapestry5.ioc.services.ExceptionInfo;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImplTest.java
index d359575..f09653f 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExceptionTrackerImplTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.services.ExceptionTracker;
+import org.apache.tapestry5.ioc.services.ExceptionTracker;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExtraFilterMethod.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExtraFilterMethod.java
index 738d2e5..4b43650 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExtraFilterMethod.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExtraFilterMethod.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface ExtraFilterMethod
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExtraServiceMethod.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExtraServiceMethod.java
index a2d9dac..daf2bbc 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExtraServiceMethod.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ExtraServiceMethod.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface ExtraServiceMethod
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/FilterMethodAnalyzerTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/FilterMethodAnalyzerTest.java
index 877fb79..b1f2354 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/FilterMethodAnalyzerTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/FilterMethodAnalyzerTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.MethodSignature;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.MethodSignature;
import org.testng.annotations.Test;
import java.lang.reflect.Method;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/GrandparentInterface.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/GrandparentInterface.java
index 973215f..0a30fd8 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/GrandparentInterface.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/GrandparentInterface.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface GrandparentInterface
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreatorTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreatorTest.java
index 520c7fd..06681cf 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreatorTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/JustInTimeObjectCreatorTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.internal.ServiceActivityTracker;
-import org.apache.tapestry.ioc.services.Status;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.internal.ServiceActivityTracker;
+import org.apache.tapestry5.ioc.services.Status;
import org.testng.annotations.Test;
public class JustInTimeObjectCreatorTest extends IOCInternalTestCase
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/KindOf.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/KindOf.java
index ecd3f01..6261f21 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/KindOf.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/KindOf.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
/**
* Converts an object to a string describing the kind of the object.
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/LineNumberBean.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/LineNumberBean.java
index cd6cb86..d36a434 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/LineNumberBean.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/LineNumberBean.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public class LineNumberBean
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImplTest.java
index 9d59a61..497b59f 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/LoggingDecoratorImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.AspectDecorator;
-import org.apache.tapestry.ioc.services.LoggingDecorator;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.AspectDecorator;
+import org.apache.tapestry5.ioc.services.LoggingDecorator;
import org.slf4j.Logger;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
@@ -27,7 +27,7 @@
* Use the LoggingDecorator in a number of ways to verify its behavior. In some ways we are testing the code dynamically
* generated by the LoggingDecorator as much as we are testing the decorator itself -- one proves the other.
* <p/>
- * And now this test is used to integration test {@link org.apache.tapestry.ioc.internal.services.AspectDecoratorImpl}
+ * And now this test is used to integration test {@link org.apache.tapestry5.ioc.internal.services.AspectDecoratorImpl}
* as well.
*/
public class LoggingDecoratorImplTest extends IOCInternalTestCase
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImplTest.java
index e3d0914..768f81c 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/MasterObjectProviderImplTest.java
@@ -12,13 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.services.MasterObjectProvider;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
+import org.apache.tapestry5.ioc.services.MasterObjectProvider;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.util.Arrays;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/MiddleFilter.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/MiddleFilter.java
index 6cffae4..fc47fe9 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/MiddleFilter.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/MiddleFilter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface MiddleFilter
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/MiddleService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/MiddleService.java
index 0fd151e..251ebf5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/MiddleService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/MiddleService.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface MiddleService
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ParentInterface.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ParentInterface.java
index 2f3fd7d..1756ae2 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ParentInterface.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ParentInterface.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface ParentInterface extends GrandparentInterface
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImplTest.java
index 29223dc..4c7f697 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImplTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.services.ThreadCleanupListener;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.services.ThreadCleanupListener;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.slf4j.Logger;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImplTest.java
index 5fab89a..a4fec05 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PipelineBuilderImplTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.ioc.services.PipelineBuilder;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.services.PipelineBuilder;
import org.slf4j.Logger;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImplTest.java
index 2661382..2034cbc 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/PropertyAccessImplTest.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.internal.util.Pair;
-import org.apache.tapestry.ioc.internal.util.StringLongPair;
-import org.apache.tapestry.ioc.services.ClassPropertyAdapter;
-import org.apache.tapestry.ioc.services.PropertyAccess;
-import org.apache.tapestry.ioc.services.PropertyAdapter;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.internal.util.Pair;
+import org.apache.tapestry5.ioc.internal.util.StringLongPair;
+import org.apache.tapestry5.ioc.services.ClassPropertyAdapter;
+import org.apache.tapestry5.ioc.services.PropertyAccess;
+import org.apache.tapestry5.ioc.services.PropertyAdapter;
import org.testng.annotations.Test;
import java.awt.*;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImplTest.java
index 524dd05..86f67c5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/RegistryShutdownHubImplTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.RegistryShutdownListener;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.RegistryShutdownListener;
import static org.easymock.EasyMock.contains;
import static org.easymock.EasyMock.same;
import org.slf4j.Logger;
@@ -47,8 +47,8 @@
}
/**
- * Shows that multiple listener will be notified, and that an error in one doesn't prevent
- * others from being notified.
+ * Shows that multiple listener will be notified, and that an error in one doesn't prevent others from being
+ * notified.
*/
@Test
public void notification_error()
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/RegistryStartupTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/RegistryStartupTest.java
index 38b6f0e..f4d1c68 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/RegistryStartupTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/RegistryStartupTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.slf4j.Logger;
import org.testng.annotations.Test;
@@ -109,7 +109,7 @@
}
catch (IllegalStateException ex)
{
- assertMessageContains(ex, "Method org.apache.tapestry.ioc.internal.services.RegistryStartup.run(",
+ assertMessageContains(ex, "Method org.apache.tapestry5.ioc.internal.services.RegistryStartup.run(",
"may no longer be invoked.");
}
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SampleFilter.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SampleFilter.java
index afc5f91..4a08816 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SampleFilter.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SampleFilter.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.services.FilterMethodAnalyzer}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.services.FilterMethodAnalyzer}.
*/
public interface SampleFilter
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SampleService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SampleService.java
index d13a45c..2a8f6c9 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SampleService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SampleService.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.services.FilterMethodAnalyzer}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.services.FilterMethodAnalyzer}.
*/
public interface SampleService
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SimpleService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SimpleService.java
index 151ab64..0b78c78 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SimpleService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SimpleService.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
/**
- * Used by {@link org.apache.tapestry.ioc.internal.services.ClassFabImplTest}.
+ * Used by {@link org.apache.tapestry5.ioc.internal.services.ClassFabImplTest}.
*/
public interface SimpleService
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardFilter.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardFilter.java
index 73b60ee..86f6cec 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardFilter.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardFilter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface StandardFilter
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardService.java
index 17e7a60..3180f7e 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StandardService.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface StandardService
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
index bdd1610..2787917 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StartupModule.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.OrderedConfiguration;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
public class StartupModule
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImplTest.java
index 6d1c7d3..a634912 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StrategyBuilderImplTest.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.services.StrategyBuilder;
-import org.apache.tapestry.ioc.util.StrategyRegistry;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.services.StrategyBuilder;
+import org.apache.tapestry5.ioc.util.StrategyRegistry;
import org.testng.annotations.Test;
import java.util.Collections;
@@ -54,7 +54,7 @@
assertEquals(service.kindOf(Collections.EMPTY_MAP), "MAP");
assertEquals(service.kindOf(Collections.EMPTY_LIST), "LIST");
- assertEquals(service.toString(), "<Strategy for org.apache.tapestry.ioc.internal.services.KindOf>");
+ assertEquals(service.toString(), "<Strategy for org.apache.tapestry5.ioc.internal.services.KindOf>");
try
{
@@ -64,7 +64,7 @@
catch (RuntimeException ex)
{
assertEquals(ex.getMessage(),
- "No adapter from type void to type org.apache.tapestry.ioc.internal.services.KindOf is available (registered types are java.util.List, java.util.Map).");
+ "No adapter from type void to type org.apache.tapestry5.ioc.internal.services.KindOf is available (registered types are java.util.List, java.util.Map).");
}
}
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StringLocationTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StringLocationTest.java
index 0214c89..da79b65 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StringLocationTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/StringLocationTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry5.ioc.Location;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SubInterface.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SubInterface.java
index a842e57..484e2b9 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SubInterface.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SubInterface.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface SubInterface extends ParentInterface
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProviderTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProviderTest.java
index 2d1645f..523138a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProviderTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolObjectProviderTest.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.annotation.IntermediateType;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.ObjectProvider;
+import org.apache.tapestry5.ioc.annotations.IntermediateType;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.math.BigInteger;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImplTest.java
index 1cbe5c3..49751d7 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/SymbolSourceImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.SymbolProvider;
-import org.apache.tapestry.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.SymbolProvider;
+import org.apache.tapestry5.ioc.services.SymbolSource;
import org.testng.annotations.Test;
import java.util.Arrays;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TargetBean.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TargetBean.java
index b49922d..fcf731a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TargetBean.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TargetBean.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
/**
* Used by {@link ClassFactoryImplTest}.
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImplTest.java
index f30b960..eafc707 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ThreadLocaleImplTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.ThreadLocale;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.ThreadLocale;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringFilter.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringFilter.java
index f2dce1c..00822b5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringFilter.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringFilter.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface ToStringFilter
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
index 5687ffd..b8e0484 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ToStringService.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
public interface ToStringService
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java
index a24640d..616c869 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.ioc.util.TimeInterval;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.ioc.util.TimeInterval;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProviderTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProviderTest.java
index 676682f..7c4d7b5 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProviderTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/ValueObjectProviderTest.java
@@ -12,15 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.services;
+package org.apache.tapestry5.ioc.internal.services;
-import org.apache.tapestry.ioc.AnnotationProvider;
-import org.apache.tapestry.ioc.ObjectLocator;
-import org.apache.tapestry.ioc.annotation.IntermediateType;
-import org.apache.tapestry.ioc.annotation.Value;
-import org.apache.tapestry.ioc.services.SymbolSource;
-import org.apache.tapestry.ioc.services.TypeCoercer;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.AnnotationProvider;
+import org.apache.tapestry5.ioc.ObjectLocator;
+import org.apache.tapestry5.ioc.annotations.IntermediateType;
+import org.apache.tapestry5.ioc.annotations.Value;
+import org.apache.tapestry5.ioc.services.SymbolSource;
+import org.apache.tapestry5.ioc.services.TypeCoercer;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.math.BigDecimal;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Bar.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Bar.java
index 9636cb2..5f8b966 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Bar.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Bar.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BarImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BarImpl.java
index 142fc2b..e1aa3b7 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BarImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BarImpl.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BaseGenericBean.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BaseGenericBean.java
index e16cb32..dc4c2c7 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BaseGenericBean.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/BaseGenericBean.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
public class BaseGenericBean<T>
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ClasspathResourceTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ClasspathResourceTest.java
index c87c6e5..73d80de 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ClasspathResourceTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ClasspathResourceTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Resource;
+import org.apache.tapestry5.ioc.Resource;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -29,7 +29,7 @@
{
private static final String RESOURCE_TXT_CONTENT = "content from resource.txt";
- private static final String FOLDER = "org/apache/tapestry/ioc/internal/util";
+ private static final String FOLDER = "org/apache/tapestry5/ioc/internal/util";
private static final String PATH = FOLDER + "/resource.txt";
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/CollectionFactoryTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/CollectionFactoryTest.java
index baf1bf7..a452bd6 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/CollectionFactoryTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/CollectionFactoryTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.*;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrierTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrierTest.java
index 75d3743..9b6726b 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrierTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentBarrierTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import org.apache.tapestry.ioc.test.TestBase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
+import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.Test;
import java.util.List;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
index 79832bd..675504f 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTarget.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
import java.util.concurrent.TimeUnit;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
index 38f0526..d0cd4d6 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/ConcurrentTargetWrapper.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
public class ConcurrentTargetWrapper implements Runnable
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DefenseTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DefenseTest.java
index 71be6ac..554ceae 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DefenseTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/DefenseTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import static org.apache.tapestry.ioc.internal.util.Defense.*;
-import org.apache.tapestry.ioc.test.TestBase;
+import static org.apache.tapestry5.ioc.internal.util.Defense.*;
+import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.Test;
public class DefenseTest extends TestBase
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Foo.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Foo.java
index a7c153f..cc16b96 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Foo.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Foo.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBar.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBar.java
index 989a08e..a2cf157 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBar.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBar.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBarImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBarImpl.java
index 2095e80..502edfc 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBarImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooBarImpl.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooImpl.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooImpl.java
index d9de03e..8c8de28 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooImpl.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FooImpl.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/GenericUtilsTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/GenericUtilsTest.java
index 6723e66..5223868 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/GenericUtilsTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/GenericUtilsTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/IdAllocatorTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/IdAllocatorTest.java
index e55167b..d3b7a18 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/IdAllocatorTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/IdAllocatorTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearchTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearchTest.java
index dd5a813..401249c 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearchTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InheritanceSearchTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.test.TestBase;
+import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.Test;
import java.io.Serializable;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InjectoBean.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InjectoBean.java
index cbb2058..f0d7a78 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InjectoBean.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InjectoBean.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.annotation.Inject;
+import org.apache.tapestry5.ioc.annotations.Inject;
public class InjectoBean
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java
index 2203b84..3e2cd8a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Locatable;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.annotation.Inject;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import static org.apache.tapestry.ioc.internal.util.InternalUtils.toList;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.Locatable;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import static org.apache.tapestry5.ioc.internal.util.InternalUtils.toList;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -324,7 +324,7 @@
catch (IllegalArgumentException ex)
{
assertEquals(ex.getMessage(),
- "Marker annotation class org.apache.tapestry.ioc.internal.util.NotRetainedRuntime is not valid because it is not visible at runtime. Add a @RetentionPolicy(RUNTIME) to the class.");
+ "Marker annotation class org.apache.tapestry5.ioc.internal.util.NotRetainedRuntime is not valid because it is not visible at runtime. Add a @RetentionPolicy(RUNTIME) to the class.");
}
}
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocalizedNameGeneratorTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocalizedNameGeneratorTest.java
index 653c6cc..c4f236a 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocalizedNameGeneratorTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocalizedNameGeneratorTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.util.Locale;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocationImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocationImplTest.java
index 20e2b6e..492fddc 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocationImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/LocationImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.Resource;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.Location;
+import org.apache.tapestry5.ioc.Resource;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.util.Random;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImplTest.java
index 05cacd2..81bc3fe 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessageFormatterImplTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessagesImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessagesImplTest.java
index 148060f..9643e42 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessagesImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/MessagesImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.MessageFormatter;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.MessageFormatter;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
public class MessagesImplTest extends IOCTestCase
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NonGenericBean.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NonGenericBean.java
index 8b76496..8cce49f 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NonGenericBean.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NonGenericBean.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
public class NonGenericBean
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NotRetainedRuntime.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NotRetainedRuntime.java
index c90efe2..ac3eced 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NotRetainedRuntime.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/NotRetainedRuntime.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
@@ -21,7 +21,7 @@
/**
* Used for testing; this annotation is NOT retained at runtime.
*/
-@Target({ElementType.PARAMETER, ElementType.FIELD})
+@Target({ ElementType.PARAMETER, ElementType.FIELD })
public @interface NotRetainedRuntime
{
}
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockSubject.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockSubject.java
index 810668f..5ac1042 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockSubject.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockSubject.java
@@ -15,7 +15,7 @@
/**
*
*/
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
@@ -34,4 +34,4 @@
{
lock.lock();
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockTest.java
index 29a2d49..3a2bad7 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OneShotLockTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
public class OneShotLockTest extends IOCTestCase
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OrdererTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OrdererTest.java
index 8c69535..4a2844b 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OrdererTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/OrdererTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
-import org.apache.tapestry.ioc.Orderable;
-import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry5.ioc.Orderable;
+import org.apache.tapestry5.ioc.internal.IOCInternalTestCase;
import org.slf4j.Logger;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java
index 08500b0..00722f4 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/Pair.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
public class Pair<K, V>
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringBean.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringBean.java
index da39a54..1b13856 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringBean.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringBean.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
public class StringBean extends BaseGenericBean<String>
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java
index f98b2f8..0071beb 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/StringLongPair.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
public class StringLongPair extends Pair<String, Long>
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/TargetMessages.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/TargetMessages.java
index 4b7c5f2..0c8fadc 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/TargetMessages.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/TargetMessages.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.internal.util;
+package org.apache.tapestry5.ioc.internal.util;
/**
- * Used with {@link org.apache.tapestry.ioc.internal.util.MessagesImplTest}.
+ * Used with {@link org.apache.tapestry5.ioc.internal.util.MessagesImplTest}.
*/
public class TargetMessages
{
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/ClassFabUtilsTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/ClassFabUtilsTest.java
index b11824a..05ef1b8 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/ClassFabUtilsTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/ClassFabUtilsTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodIteratorTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodIteratorTest.java
index b95da2e..de777f7 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodIteratorTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodIteratorTest.java
@@ -1,20 +1,20 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
-import org.apache.tapestry.ioc.test.IOCTestCase;
+package org.apache.tapestry5.ioc.services;
+
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.io.IOException;
@@ -139,7 +139,7 @@
MethodSignature actual = mi.next();
- assertEquals(new MethodSignature(void.class, "open", null, new Class[]{IOException.class}), actual);
+ assertEquals(new MethodSignature(void.class, "open", null, new Class[] { IOException.class }), actual);
assertEquals(false, mi.hasNext());
}
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodSignatureTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodSignatureTest.java
index 544a436..6429998 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodSignatureTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/MethodSignatureTest.java
@@ -1,20 +1,20 @@
-// Copyright 2006 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.ioc.services;
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
-import org.apache.tapestry.ioc.test.IOCTestCase;
+package org.apache.tapestry5.ioc.services;
+
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.io.IOException;
@@ -86,8 +86,8 @@
@Test
public void equals_with_parameters_mismatch()
{
- MethodSignature m1 = new MethodSignature(void.class, "foo", new Class[]{String.class}, null);
- MethodSignature m2 = new MethodSignature(void.class, "foo", new Class[]{Boolean.class}, null);
+ MethodSignature m1 = new MethodSignature(void.class, "foo", new Class[] { String.class }, null);
+ MethodSignature m2 = new MethodSignature(void.class, "foo", new Class[] { Boolean.class }, null);
assertEquals(false, m1.equals(m2));
}
@@ -155,7 +155,7 @@
public void overriding_signature_parameters_mismatch()
{
MethodSignature m1 = new MethodSignature(void.class, "foo", null, null);
- MethodSignature m2 = new MethodSignature(void.class, "foo", new Class[]{String.class}, null);
+ MethodSignature m2 = new MethodSignature(void.class, "foo", new Class[] { String.class }, null);
assertEquals(m1.isOverridingSignatureOf(m2), false);
}
@@ -163,8 +163,8 @@
@Test
public void overriding_signature()
{
- MethodSignature m1 = new MethodSignature(void.class, "close", null, new Class[]{Exception.class});
- MethodSignature m2 = new MethodSignature(void.class, "close", null, new Class[]{RuntimeException.class});
+ MethodSignature m1 = new MethodSignature(void.class, "close", null, new Class[] { Exception.class });
+ MethodSignature m2 = new MethodSignature(void.class, "close", null, new Class[] { RuntimeException.class });
assertEquals(m1.isOverridingSignatureOf(m2), true);
assertEquals(m2.isOverridingSignatureOf(m1), false);
@@ -177,7 +177,7 @@
public void overriding_signature_with_no_exceptions()
{
MethodSignature m1 = new MethodSignature(void.class, "close", null, null);
- MethodSignature m2 = new MethodSignature(void.class, "close", null, new Class[]{RuntimeException.class});
+ MethodSignature m2 = new MethodSignature(void.class, "close", null, new Class[] { RuntimeException.class });
assertEquals(m1.isOverridingSignatureOf(m2), false);
assertEquals(m2.isOverridingSignatureOf(m1), true);
@@ -190,9 +190,9 @@
public void overriding_signature_with_multiple_matched_exceptions()
{
MethodSignature m1 = new MethodSignature(void.class, "close", null,
- new Class[]{SQLException.class, NumberFormatException.class});
+ new Class[] { SQLException.class, NumberFormatException.class });
MethodSignature m2 = new MethodSignature(void.class, "close", null,
- new Class[]{SQLException.class, IOException.class});
+ new Class[] { SQLException.class, IOException.class });
assertEquals(m1.isOverridingSignatureOf(m2), false);
assertEquals(m2.isOverridingSignatureOf(m1), false);
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilderImplTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilderImplTest.java
index 4879104..f99a8a6 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilderImplTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/PropertyShadowBuilderImplTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.services;
+package org.apache.tapestry5.ioc.services;
-import org.apache.tapestry.ioc.Registry;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.Registry;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/BodyBuilderTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/BodyBuilderTest.java
index 213a361..b190a67 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/BodyBuilderTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/BodyBuilderTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
public class BodyBuilderTest extends IOCTestCase
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMapTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMapTest.java
index 24f3db2..4cf13ec 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMapTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMapTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -103,8 +103,7 @@
}
/**
- * Add a large number of keys which should stress the code that adds and expands values into the
- * map.
+ * Add a large number of keys which should stress the code that adds and expands values into the map.
*/
@Test
public void expansion_of_internal_entry_array()
@@ -150,7 +149,7 @@
}
@Test(expectedExceptions =
- {ConcurrentModificationException.class})
+ { ConcurrentModificationException.class })
public void iterator_fail_fast_after_remove()
{
Map<String, String> map = newCaseInsensitiveMap();
@@ -170,7 +169,7 @@
}
@Test(expectedExceptions =
- {ConcurrentModificationException.class})
+ { ConcurrentModificationException.class })
public void iterator_fail_fast_on_next()
{
Map<String, String> map = newCaseInsensitiveMap();
@@ -271,7 +270,7 @@
}
@Test(expectedExceptions =
- {NoSuchElementException.class})
+ { NoSuchElementException.class })
public void next_after_last_entry_is_failure()
{
Map<String, String> map = newCaseInsensitiveMap();
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/ExceptionUtilsTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/ExceptionUtilsTest.java
index 93af037..4d07193 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/ExceptionUtilsTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/ExceptionUtilsTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.internal.util.TapestryException;
+import org.apache.tapestry5.ioc.internal.util.TapestryException;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StackTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StackTest.java
index 9b80ad5..a06857b 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StackTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StackTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newStack;
-import org.apache.tapestry.ioc.test.TestBase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newStack;
+import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.Test;
public class StackTest extends TestBase
@@ -73,7 +73,7 @@
Object[] snapshot = stack.getSnapshot();
- assertArraysEqual(snapshot, new Object[]{fred, barney});
+ assertArraysEqual(snapshot, new Object[] { fred, barney });
assertEquals(stack.pop(), barney);
assertEquals(stack.peek(), fred);
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StrategyRegistryTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StrategyRegistryTest.java
index a3fba88..4a5b322 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StrategyRegistryTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/StrategyRegistryTest.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.ioc.test.IOCTestCase;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.testng.annotations.Test;
import java.util.*;
diff --git a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/TimeIntervalTest.java b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/TimeIntervalTest.java
index e1ade74..0e3aa08 100644
--- a/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/TimeIntervalTest.java
+++ b/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/TimeIntervalTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc.util;
+package org.apache.tapestry5.ioc.util;
-import org.apache.tapestry.ioc.test.TestBase;
+import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
diff --git a/tapestry-ioc/src/test/resources/org/apache/tapestry5/ioc/internal/util/TargetStrings.properties b/tapestry-ioc/src/test/resources/org/apache/tapestry5/ioc/internal/util/TargetStrings.properties
index 21dfbc8..37bf17e 100644
--- a/tapestry-ioc/src/test/resources/org/apache/tapestry5/ioc/internal/util/TargetStrings.properties
+++ b/tapestry-ioc/src/test/resources/org/apache/tapestry5/ioc/internal/util/TargetStrings.properties
@@ -14,4 +14,4 @@
no-args=No arguments.
something-failed=Something failed: %s
-result=The result is '%s'.
\ No newline at end of file
+result=The result is '%s'.
diff --git a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringModuleDef.java b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringModuleDef.java
index 16ba48c..7d493a2 100644
--- a/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringModuleDef.java
+++ b/tapestry-spring/src/main/java/org/apache/tapestry5/internal/spring/SpringModuleDef.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.spring;
+package org.apache.tapestry5.internal.spring;
-import org.apache.tapestry.ioc.IOCConstants;
-import org.apache.tapestry.ioc.ObjectCreator;
-import org.apache.tapestry.ioc.ServiceBuilderResources;
-import org.apache.tapestry.ioc.def.ContributionDef;
-import org.apache.tapestry.ioc.def.DecoratorDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
-import org.apache.tapestry.ioc.def.ServiceDef;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
+import org.apache.tapestry5.ioc.IOCConstants;
+import org.apache.tapestry5.ioc.ObjectCreator;
+import org.apache.tapestry5.ioc.ServiceBuilderResources;
+import org.apache.tapestry5.ioc.def.ContributionDef;
+import org.apache.tapestry5.ioc.def.DecoratorDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
+import org.apache.tapestry5.ioc.def.ServiceDef;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newCaseInsensitiveMap;
import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.WebApplicationContext;
diff --git a/tapestry-spring/src/main/java/org/apache/tapestry5/spring/SpringMessages.java b/tapestry-spring/src/main/java/org/apache/tapestry5/spring/SpringMessages.java
index 9808465..fee90c4 100644
--- a/tapestry-spring/src/main/java/org/apache/tapestry5/spring/SpringMessages.java
+++ b/tapestry-spring/src/main/java/org/apache/tapestry5/spring/SpringMessages.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.spring;
+package org.apache.tapestry5.spring;
-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;
import org.springframework.web.context.ContextLoaderListener;
class SpringMessages
diff --git a/tapestry-spring/src/main/java/org/apache/tapestry5/spring/TapestrySpringFilter.java b/tapestry-spring/src/main/java/org/apache/tapestry5/spring/TapestrySpringFilter.java
index c470f94..45c4249 100644
--- a/tapestry-spring/src/main/java/org/apache/tapestry5/spring/TapestrySpringFilter.java
+++ b/tapestry-spring/src/main/java/org/apache/tapestry5/spring/TapestrySpringFilter.java
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.spring;
+package org.apache.tapestry5.spring;
-import org.apache.tapestry.TapestryFilter;
-import org.apache.tapestry.internal.spring.SpringModuleDef;
-import org.apache.tapestry.ioc.def.ModuleDef;
+import org.apache.tapestry5.TapestryFilter;
+import org.apache.tapestry5.internal.spring.SpringModuleDef;
+import org.apache.tapestry5.ioc.def.ModuleDef;
import org.springframework.context.ApplicationContext;
import org.springframework.web.context.WebApplicationContext;
import javax.servlet.ServletContext;
/**
- * Adds a {@link ModuleDef} that contains all the beans defined by the Spring
- * {@link ApplicationContext}, as if they were Tapestry IoC services. This is done using a filter,
- * so that the Spring beans can be "mixed into" the Tapestry IoC Registry before it even starts up.
+ * Adds a {@link ModuleDef} that contains all the beans defined by the Spring {@link ApplicationContext}, as if they
+ * were Tapestry IoC services. This is done using a filter, so that the Spring beans can be "mixed into" the Tapestry
+ * IoC Registry before it even starts up.
*/
public class TapestrySpringFilter extends TapestryFilter
{
@@ -47,6 +47,6 @@
if (springContext == null) throw new RuntimeException(SpringMessages.missingContext());
return new ModuleDef[]
- {new SpringModuleDef(springContext)};
+ { new SpringModuleDef(springContext) };
}
}
diff --git a/tapestry-spring/src/site/apt/index.apt b/tapestry-spring/src/site/apt/index.apt
index 2e6ed53..5e55ff6 100644
--- a/tapestry-spring/src/site/apt/index.apt
+++ b/tapestry-spring/src/site/apt/index.apt
@@ -42,7 +42,7 @@
<filter>
<filter-name>app</filter-name>
<!-- Special filter that adds in a T5 IoC module derived from the Spring WebApplicationContext. -->
- <filter-class>org.apache.tapestry.spring.TapestrySpringFilter</filter-class>
+ <filter-class>org.apache.tapestry5.spring.TapestrySpringFilter</filter-class>
</filter>
+---+
@@ -68,7 +68,7 @@
* Injecting beans
Inside your component classes, you may use the
- {{{http://tapestry.apache.org/tapestry5/tapestry-core/apidocs/org/apache/tapestry/ioc/annotations/Inject.html}Inject}} annotation. Typically, just the field
+ {{{http://tapestry.apache.org/tapestry5/tapestry-core/apidocs/org/apache/tapestry5/ioc/annotations/Inject.html}Inject}} annotation. Typically, just the field
type is sufficient to identify the Spring bean to inject:
+----+
@@ -78,7 +78,7 @@
If you have multiple beans that implement the same interface (for instance, if you have wrapped your bean using a transaction interceptor), you must disambiguate. The easiest way
to accomplish this is to add a
- {{{http://tapestry.apache.org/tapestry5/tapestry-core/apidocs/org/apache/tapestry/annotations/Service.html}Service}}
+ {{{http://tapestry.apache.org/tapestry5/tapestry-core/apidocs/org/apache/tapestry5/annotations/Service.html}Service}}
annotation to identify the name of the
Spring bean:
diff --git a/tapestry-spring/src/test/conf/testng.xml b/tapestry-spring/src/test/conf/testng.xml
index 002055e..5e08722 100644
--- a/tapestry-spring/src/test/conf/testng.xml
+++ b/tapestry-spring/src/test/conf/testng.xml
@@ -18,7 +18,7 @@
<suite name="Tapesty Spring Integration" parallel="false" thread-count="10" annotations="1.5" verbose="2">
<test name="Tapestry Spring Integration">
<packages>
- <package name="org.apache.tapestry.spring"/>
+ <package name="org.apache.tapestry5.spring"/>
</packages>
</test>
</suite>
diff --git a/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringFilterTest.java b/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringFilterTest.java
index 5ab409e..e4deee2 100644
--- a/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringFilterTest.java
+++ b/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringFilterTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.spring;
+package org.apache.tapestry5.spring;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.springframework.web.context.WebApplicationContext;
import org.testng.annotations.Test;
diff --git a/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java b/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
index 263515f..9345f54 100644
--- a/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
+++ b/tapestry-spring/src/test/java/org/apache/tapestry5/spring/TapestrySpringIntegrationTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.spring;
+package org.apache.tapestry5.spring;
-import org.apache.tapestry.test.AbstractIntegrationTestSuite;
+import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
import org.testng.annotations.Test;
public class TapestrySpringIntegrationTest extends AbstractIntegrationTestSuite
diff --git a/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java b/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java
index e4a3273..2abda16 100644
--- a/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java
+++ b/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java
@@ -14,9 +14,9 @@
package org.example.testapp.pages;
-import org.apache.tapestry.annotation.Retain;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.internal.util.InternalUtils;
+import org.apache.tapestry5.annotations.Retain;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.example.testapp.services.Upcase;
import org.springframework.web.context.WebApplicationContext;
diff --git a/tapestry-spring/src/test/resources/log4j.properties b/tapestry-spring/src/test/resources/log4j.properties
index f6ebbaf..17c9f25 100644
--- a/tapestry-spring/src/test/resources/log4j.properties
+++ b/tapestry-spring/src/test/resources/log4j.properties
@@ -21,11 +21,11 @@
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=[%p] %c{1} %m%n
-log4j.category.org.apache.tapestry.TapestryFilter=info
+log4j.category.org.apache.tapestry5.TapestryFilter=info
log4j.category.org.apache.tapestry=error
log4j.category.tapestry=error
log4j.category.tapestry.ioc.ClassFactory=error
log4j.category.app=info
-log4j.category.org.apache.tapestry.integration.app1=error
-log4j.category.org.apache.tapestry.corelib=error
+log4j.category.org.apache.tapestry5.integration.app1=error
+log4j.category.org.apache.tapestry5.corelib=error
diff --git a/tapestry-spring/src/test/webapp/WEB-INF/web.xml b/tapestry-spring/src/test/webapp/WEB-INF/web.xml
index 402d3f8..f0a9751 100644
--- a/tapestry-spring/src/test/webapp/WEB-INF/web.xml
+++ b/tapestry-spring/src/test/webapp/WEB-INF/web.xml
@@ -25,7 +25,7 @@
<filter>
<filter-name>app</filter-name>
<!-- Special filter that adds in a T5 IoC module derived from the Spring WebApplicationContext. -->
- <filter-class>org.apache.tapestry.spring.TapestrySpringFilter</filter-class>
+ <filter-class>org.apache.tapestry5.spring.TapestrySpringFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>app</filter-name>
diff --git a/tapestry-test/pom.xml b/tapestry-test/pom.xml
index 77d7a29..dbd6ab5 100644
--- a/tapestry-test/pom.xml
+++ b/tapestry-test/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-test</artifactId>
@@ -61,4 +62,4 @@
</plugin>
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
index 76bc889..dacf4f5 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/AbstractIntegrationTestSuite.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.test;
+package org.apache.tapestry5.test;
import com.thoughtworks.selenium.CommandProcessor;
import com.thoughtworks.selenium.DefaultSelenium;
@@ -36,7 +36,7 @@
* instance it creates. It also extends the normal exception reporting for any failed command or query to produce a more
* detailed report to the main console.
*
- * @see org.apache.tapestry.test.JettyRunner
+ * @see org.apache.tapestry5.test.JettyRunner
*/
public class AbstractIntegrationTestSuite extends Assert implements Selenium
{
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java
index a21322b..6c060f8 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/ErrorReportingCommandProcessor.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.test;
+package org.apache.tapestry5.test;
import com.thoughtworks.selenium.CommandProcessor;
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/JettyRunner.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/JettyRunner.java
index 19c6e75..6c433ac 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/JettyRunner.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/JettyRunner.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.test;
+package org.apache.tapestry5.test;
import org.mortbay.http.NCSARequestLog;
import org.mortbay.http.SocketListener;
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/RandomDataSource.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/RandomDataSource.java
index 4c86139..3cc930a 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/RandomDataSource.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/RandomDataSource.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.test;
+package org.apache.tapestry5.test;
import java.io.*;
import static java.lang.String.format;
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/TapestryTestConstants.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/TapestryTestConstants.java
index 832e6e8..e0a8973 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/TapestryTestConstants.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/TapestryTestConstants.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.test;
+package org.apache.tapestry5.test;
import java.io.File;
@@ -23,10 +23,9 @@
*/
public static final String CURRENT_DIR_PATH = System.getProperty("user.dir");
/**
- * The Surefire plugin sets basedir but DOES NOT change the current working directory.
- * When building across modules, basedir changes for each module, but user.dir does not.
- * This value should be used when referecing local files. Outside of surefire, the
- * "basedir" property will not be set, and the current working directory will be the
+ * The Surefire plugin sets basedir but DOES NOT change the current working directory. When building across modules,
+ * basedir changes for each module, but user.dir does not. This value should be used when referecing local files.
+ * Outside of surefire, the "basedir" property will not be set, and the current working directory will be the
* default.
*/
public static final String MODULE_BASE_DIR_PATH = System.getProperty("basedir", CURRENT_DIR_PATH);
diff --git a/tapestry-test/src/site/apt/index.apt b/tapestry-test/src/site/apt/index.apt
index a042828..2ed141c 100644
--- a/tapestry-test/src/site/apt/index.apt
+++ b/tapestry-test/src/site/apt/index.apt
@@ -18,7 +18,7 @@
Usage and Configuration
The core part of this library is a base class for you to extend your tests cases from:
- {{{../apidocs/org/apache/tapestry/test/AbstractIntegrationTestSuite.html}AbstractIntegrationTestSuite}}.
+ {{{../apidocs/org/apache/tapestry5/test/AbstractIntegrationTestSuite.html}AbstractIntegrationTestSuite}}.
This class is responsible for starting an instance of Jetty to server your web application, as well
as a copy of Selenium Server. It also implements the
@@ -32,9 +32,9 @@
----
-package org.apache.tapestry.spring;
+package org.apache.tapestry5.spring;
-import org.apache.tapestry.test.AbstractIntegrationTestSuite;
+import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
import org.testng.annotations.Test;
public class TapestrySpringIntegrationTest extends AbstractIntegrationTestSuite
diff --git a/tapestry-tutorial1/pom.xml b/tapestry-tutorial1/pom.xml
index 005cc55..e96b451 100644
--- a/tapestry-tutorial1/pom.xml
+++ b/tapestry-tutorial1/pom.xml
@@ -139,7 +139,7 @@
<artifactId>tapestry-component-report</artifactId>
<version>${project.version}</version>
<configuration>
- <rootPackage>org.apache.tapestry.tutorial</rootPackage>
+ <rootPackage>org.apache.tapestry5.tutorial</rootPackage>
</configuration>
</plugin>
</plugins>
diff --git a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/data/Honorific.java b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/data/Honorific.java
index a1dc38f..344b595 100644
--- a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/data/Honorific.java
+++ b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/data/Honorific.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.tutorial.data;
+package org.apache.tapestry5.tutorial.data;
public enum Honorific
{
diff --git a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/entities/Address.java b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/entities/Address.java
index 3d175f4..ed06b1f 100644
--- a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/entities/Address.java
+++ b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/entities/Address.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.tutorial.entities;
+package org.apache.tapestry5.tutorial.entities;
-import org.apache.tapestry.beaneditor.NonVisual;
-import org.apache.tapestry.beaneditor.Validate;
-import org.apache.tapestry.tutorial.data.Honorific;
+import org.apache.tapestry5.beaneditor.NonVisual;
+import org.apache.tapestry5.beaneditor.Validate;
+import org.apache.tapestry5.tutorial.data.Honorific;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
diff --git a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/GameOver.java b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/GameOver.java
index 6607694..535d04f 100644
--- a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/GameOver.java
+++ b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/GameOver.java
@@ -25,10 +25,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.Property;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
public class GameOver
{
diff --git a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Guess.java b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Guess.java
index 0a7bbfd..bf4bc5a 100644
--- a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Guess.java
+++ b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Guess.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.Property;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
public class Guess
{
diff --git a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Index.java b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Index.java
index a9a30e5..ed9e4a8 100644
--- a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Index.java
+++ b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/Index.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.tutorial.entities.Address;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.tutorial.entities.Address;
import org.hibernate.Session;
import java.util.List;
@@ -44,4 +44,4 @@
{
return session.createCriteria(Address.class).list();
}
-}
\ No newline at end of file
+}
diff --git a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/address/CreateAddress.java b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/address/CreateAddress.java
index e910bad..59abace 100644
--- a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/address/CreateAddress.java
+++ b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/pages/address/CreateAddress.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.tutorial.pages.address;
+package org.apache.tapestry5.tutorial.pages.address;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.hibernate.annotations.CommitAfter;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.tutorial.entities.Address;
-import org.apache.tapestry.tutorial.pages.Index;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.hibernate.annotations.CommitAfter;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.tutorial.entities.Address;
+import org.apache.tapestry5.tutorial.pages.Index;
import org.hibernate.Session;
public class CreateAddress
diff --git a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/AppModule.java b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/AppModule.java
index 626bd6f..e8fa771 100644
--- a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/AppModule.java
+++ b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/AppModule.java
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.tutorial.services;
+package org.apache.tapestry5.tutorial.services;
-import org.apache.tapestry.SymbolConstants;
-import org.apache.tapestry.ioc.MappedConfiguration;
-import org.apache.tapestry.ioc.OrderedConfiguration;
-import org.apache.tapestry.ioc.annotation.Marker;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.RequestFilter;
-import org.apache.tapestry.services.RequestHandler;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry5.SymbolConstants;
+import org.apache.tapestry5.ioc.MappedConfiguration;
+import org.apache.tapestry5.ioc.OrderedConfiguration;
+import org.apache.tapestry5.ioc.annotations.Marker;
+import org.apache.tapestry5.services.Request;
+import org.apache.tapestry5.services.RequestFilter;
+import org.apache.tapestry5.services.RequestHandler;
+import org.apache.tapestry5.services.Response;
import org.slf4j.Logger;
import java.io.IOException;
diff --git a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/Local.java b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/Local.java
index 8b1dfa9..af5deee 100644
--- a/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/Local.java
+++ b/tapestry-tutorial1/src/main/java/org/apache/tapestry5/tutorial/services/Local.java
@@ -15,7 +15,7 @@
/**
*
*/
-package org.apache.tapestry.tutorial.services;
+package org.apache.tapestry5.tutorial.services;
import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
@@ -25,9 +25,9 @@
import java.lang.annotation.Target;
@Target(
- {PARAMETER, FIELD})
+ { PARAMETER, FIELD })
@Retention(RUNTIME)
@Documented
public @interface Local
{
-}
\ No newline at end of file
+}
diff --git a/tapestry-tutorial1/src/main/resources/log4j.properties b/tapestry-tutorial1/src/main/resources/log4j.properties
index cfe2113..a735071 100644
--- a/tapestry-tutorial1/src/main/resources/log4j.properties
+++ b/tapestry-tutorial1/src/main/resources/log4j.properties
@@ -21,17 +21,17 @@
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
log4j.appender.A1.layout.ConversionPattern=[%p] %c{1} %m%n
-log4j.category.org.apache.tapestry.TapestryFilter=info
-log4j.category.org.apache.tapestry.services.TapestryModule.ComponentClassResolver=info
+log4j.category.org.apache.tapestry5.TapestryFilter=info
+log4j.category.org.apache.tapestry5.services.TapestryModule.ComponentClassResolver=info
log4j.category.org.apache.tapestry=error
log4j.category.tapestry=error
-log4j.category.org.apache.tapestry.tutorial=error
+log4j.category.org.apache.tapestry5.tutorial=error
log4j.category.app=error
log4j.category.app.TimingFilter=info
# Turning on debug mode for a page or component will show all of the code changes that occur when the
# class is loaded. Turning on debug mode for a page will enable verbose output about rendering
# the page (and its components).
-# log4j.category.org.apache.tapestry.tutorial.pages.Index=debug
+# log4j.category.org.apache.tapestry5.tutorial.pages.Index=debug
diff --git a/tapestry-tutorial1/src/main/resources/org/apache/tapestry5/tutorial/pages/address/CreateAddress.properties b/tapestry-tutorial1/src/main/resources/org/apache/tapestry5/tutorial/pages/address/CreateAddress.properties
index c2bbfb1..93ce181 100644
--- a/tapestry-tutorial1/src/main/resources/org/apache/tapestry5/tutorial/pages/address/CreateAddress.properties
+++ b/tapestry-tutorial1/src/main/resources/org/apache/tapestry5/tutorial/pages/address/CreateAddress.properties
@@ -25,4 +25,4 @@
submit-label=Create Address
zip-regexp=\\d{5}(-\\d{4})?
-zip-regexp-message=Zip Codes are five or nine digits. Example: 02134 or 90125-1655.
\ No newline at end of file
+zip-regexp-message=Zip Codes are five or nine digits. Example: 02134 or 90125-1655.
diff --git a/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml b/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml
index 6732c5a..bc21a02 100644
--- a/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml
+++ b/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml
@@ -24,15 +24,15 @@
<!-- The only significant configuration for Tapestry 5, this informs Tapestry
of where to look for pages, components and mixins. -->
<param-name>tapestry.app-package</param-name>
- <param-value>org.apache.tapestry.tutorial</param-value>
+ <param-value>org.apache.tapestry5.tutorial</param-value>
</context-param>
<filter>
<filter-name>app</filter-name>
- <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+ <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>app</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
</web-app>
-
\ No newline at end of file
+
diff --git a/tapestry-tutorial1/src/site/apt/first.apt b/tapestry-tutorial1/src/site/apt/first.apt
index 89273e5..22eb84b 100644
--- a/tapestry-tutorial1/src/site/apt/first.apt
+++ b/tapestry-tutorial1/src/site/apt/first.apt
@@ -12,7 +12,7 @@
Maven uses the group id and artifact id to provide a unique identity for the application, and Tapestry needs to have a base package name so it knows where to look for pages and components.
- For this example, we'll use the group id <<org.apache.tapestry>> and the artifact id <<tapestry-tutorial1>>, and we'll use <<org.apache.tapestry.tutorial>> as the base package.
+ For this example, we'll use the group id <<org.apache.tapestry>> and the artifact id <<tapestry-tutorial1>>, and we'll use <<org.apache.tapestry5.tutorial>> as the base package.
Our final command line is thus:
@@ -22,7 +22,7 @@
-DarchetypeArtifactId=quickstart
-DgroupId=org.apache.tapestry
-DartifactId=tutorial1
- -DpackageName=org.apache.tapestry.tutorial
+ -DpackageName=org.apache.tapestry5.tutorial
----
We've shown this as several lines, but it would normally be entered as a single long line.
@@ -126,11 +126,11 @@
<!-- The only significant configuration for Tapestry 5, this informs Tapestry
of where to look for pages, components and mixins. -->
<param-name>tapestry.app-package</param-name>
- <param-value>org.apache.tapestry.tutorial</param-value>
+ <param-value>org.apache.tapestry5.tutorial</param-value>
</context-param>
<filter>
<filter-name>app</filter-name>
- <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+ <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>app</filter-name>
@@ -216,12 +216,12 @@
re-used to generate the HTML sent to the browser, which results in the updated time showing up in the web browser.
The final piece of the puzzle is the Java class for the page. Tapestry has very specific rules for where page classes go. Remember the package name (configured inside web.xml)? Tapestry adds a
- sub-package, "pages", to it and the Java class goes there. Thus the full Java class name is org.apache.tapestry.tutorial.pages.Index.
+ sub-package, "pages", to it and the Java class goes there. Thus the full Java class name is org.apache.tapestry5.tutorial.pages.Index.
- <<src/main/java/org/apache/tapestry/tutorial/pages/Index.java>>
+ <<src/main/java/org/apache/tapestry5/tutorial/pages/Index.java>>
---
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
import java.util.Date;
@@ -240,7 +240,7 @@
That's pretty darn simple: No classes to extend, no interfaces to implement, just a very pure POJO (Plain Old Java Object). You do have to meet the Tapestry framework
halfway:
- * You need to put the Java class in the expected package, org.apache.tapestry.tutorial.pages
+ * You need to put the Java class in the expected package, org.apache.tapestry5.tutorial.pages
* The class must be public
diff --git a/tapestry-tutorial1/src/site/apt/forms.apt b/tapestry-tutorial1/src/site/apt/forms.apt
index 7a2ce57..926747e 100644
--- a/tapestry-tutorial1/src/site/apt/forms.apt
+++ b/tapestry-tutorial1/src/site/apt/forms.apt
@@ -15,12 +15,12 @@
as we'll see shortly, a handy one).
- <<src/main/java/org/apache/tapestry/tutorial/entities/Address.java:>>
+ <<src/main/java/org/apache/tapestry5/tutorial/entities/Address.java:>>
----
-package org.apache.tapestry.tutorial.entities;
+package org.apache.tapestry5.tutorial.entities;
-import org.apache.tapestry.tutorial.data.Honorific;
+import org.apache.tapestry5.tutorial.data.Honorific;
public class Address
{
@@ -148,10 +148,10 @@
It's just a collection of getter and setter methods. We also need to define the enum type, Honorific:
- <<src/main/java/org/apache/tapestry/tutorial/data/Honorific.java:>>
+ <<src/main/java/org/apache/tapestry5/tutorial/data/Honorific.java:>>
---
-package org.apache.tapestry.tutorial.data;
+package org.apache.tapestry5.tutorial.data;
public enum Honorific
{
@@ -198,10 +198,10 @@
And the corresponding class:
- <<src/main/java/org/apache/tapestry/tutorial1/pages/address/CreateAddress.java:>>
+ <<src/main/java/org/apache/tapestry5/tutorial1/pages/address/CreateAddress.java:>>
----
-package org.apache.tapestry.tutorial.pages.address;
+package org.apache.tapestry5.tutorial.pages.address;
public class CreateAddress
{
@@ -211,7 +211,7 @@
So ... why is the class named "CreateAddress" and not simply "Create"? Actually, we could have named it "Create", and
the application would still work, but the longer <class> name is equally valid. Tapestry noticed the redundancy in the
- class name: <<<org.apache.tapestry.tutorial.pages.>>><address><<<.Create>>><Address> and just stripped it out.
+ class name: <<<org.apache.tapestry5.tutorial.pages.>>><address><<<.Create>>><Address> and just stripped it out.
Eventually, your application will probably have more entities: perhaps you'll have a "user/Create" page and a "payment/Create" page and an "account/Create" page.
Now, you <could> have a bunch of different classes named <<<Create>>> spread across a number of different packages. That's legal Java, but it isn't ideal. You may find yourself
@@ -220,7 +220,7 @@
Tapestry is encouraging you to use a more descriptive name: <<<Create>>><Address> not just <<<Create>>>, but it isn't making you pay the cost (in terms of longer,
uglier URLs). The URL to access the page will still be http://localhost:8080/tutorial1/address/create.
- Another note: Index pages work in folders as well. A class named org.apache.tapestry.tutorial.pages.address.AddressIndex would be given the name
+ Another note: Index pages work in folders as well. A class named org.apache.tapestry5.tutorial.pages.address.AddressIndex would be given the name
"address/Index". However, Tapestry has special rules for pages named "Index" and the render URL would be
http://localhost:8080/tutorial1/address/ . In other words, you can place Index pages in any folder and Tapestry will
build a short URL for that page ... and you <don't> have to keep naming the classes Index (it's confusing to have many classes with the same
@@ -308,7 +308,7 @@
All it takes is to create a message entry with a particular name: the name of the property suffixed with "-label". As elsewhere, Tapestry is forgiving of case.
- <<src/main/resources/org/apache/tapestry/tutorial/pages/address/CreateAddress.properties:>>
+ <<src/main/resources/org/apache/tapestry5/tutorial/pages/address/CreateAddress.properties:>>
----
street1-label=Street 1
@@ -381,7 +381,7 @@
Before we worry about storing the Address object, we should make sure that the user provides reasonable values. For example,several of the fields should be required,
and phone numbers and email address have specific formats.
- The BeanEditForm checks for a Tapestry-specific annotation, @org.apache.tapestry.beaneditor.Validate, on the getter <or> setter method of each property.
+ The BeanEditForm checks for a Tapestry-specific annotation, @org.apache.tapestry5.beaneditor.Validate, on the getter <or> setter method of each property.
Update the getter methods for the lastName, firstName, street1, city, state and zip fields,
adding a @Validate annotation to each:
diff --git a/tapestry-tutorial1/src/site/apt/forms2.apt b/tapestry-tutorial1/src/site/apt/forms2.apt
index 431683c..75ff193 100644
--- a/tapestry-tutorial1/src/site/apt/forms2.apt
+++ b/tapestry-tutorial1/src/site/apt/forms2.apt
@@ -166,14 +166,14 @@
annotations can be applied to fields or to accessor methods, but the Tapestry annotations we use below
are for methods only.
- <<src/main/java/org/apache/tapestry/tutorial/entities/Address.java:>>
+ <<src/main/java/org/apache/tapestry5/tutorial/entities/Address.java:>>
----
-package org.apache.tapestry.tutorial.entities;
+package org.apache.tapestry5.tutorial.entities;
-import org.apache.tapestry.beaneditor.NonVisual;
-import org.apache.tapestry.beaneditor.Validate;
-import org.apache.tapestry.tutorial.data.Honorific;
+import org.apache.tapestry5.beaneditor.NonVisual;
+import org.apache.tapestry5.beaneditor.Validate;
+import org.apache.tapestry5.tutorial.data.Honorific;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
@@ -345,17 +345,17 @@
[]
- <<src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java:>>
+ <<src/main/java/org/apache/tapestry5/tutorial/pages/address/CreateAddress.java:>>
----
-package org.apache.tapestry.tutorial.pages.address;
+package org.apache.tapestry5.tutorial.pages.address;
-import org.apache.tapestry.annotation.InjectPage;
-import org.apache.tapestry.annotation.Property;
-import org.apache.tapestry.hibernate.annotations.CommitAfter;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.tutorial.entities.Address;
-import org.apache.tapestry.tutorial.pages.Index;
+import org.apache.tapestry5.annotations.InjectPage;
+import org.apache.tapestry5.annotations.Property;
+import org.apache.tapestry5.hibernate.annotations.CommitAfter;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.tutorial.entities.Address;
+import org.apache.tapestry5.tutorial.pages.Index;
import org.hibernate.Session;
public class CreateAddress
@@ -379,7 +379,7 @@
}
----
- The {{{../apidocs/org/apache/tapestry/ioc/annotations/Inject.html}Inject}} annotation tells Tapestry to inject a service into the
+ The {{{../apidocs/org/apache/tapestry5/ioc/annotations/Inject.html}Inject}} annotation tells Tapestry to inject a service into the
annotated field;
Tapestry includes a sophisticated
Inversion of Control container (similar in many ways to Spring) that is very good at locating available services
@@ -390,7 +390,7 @@
of the request. If we make changes to persistent objects, such as adding a new Address object,
then it is necessary to commit the transaction.
- The {{{../apidocs/org/apache/tapestry/hibernate/annotations/CommitAfter.html}CommitAfter}} annotation can be applied to any component method; if the method completes normally, the transaction
+ The {{{../apidocs/org/apache/tapestry5/hibernate/annotations/CommitAfter.html}CommitAfter}} annotation can be applied to any component method; if the method completes normally, the transaction
will be committed (and a new transaction started to replace the committed transaction).
After persisting the new address, we return to the main Index page of the application.
@@ -407,7 +407,7 @@
[index-grid-v1.png] Adding the Grid to the Index page
So, how is this implemented? Primarily, its accomplished by the
- {{{../tapestry-core/ref/org/apache/tapestry/corelib/components/Grid.html}Grid}} component.
+ {{{../tapestry-core/ref/org/apache/tapestry5/corelib/components/Grid.html}Grid}} component.
The Grid component is based on the same concepts as the BeanEditForm component; it can pull apart
a bean into columns. The columns are sortable, and when there are more entries than will fit on a single
@@ -423,7 +423,7 @@
And all we have to do is supply the addresses property in the Java code:
- <<src/main/java/org/apache/tapestry/tutorial/pages/Index.java (partial):>>
+ <<src/main/java/org/apache/tapestry5/tutorial/pages/Index.java (partial):>>
----
@Inject
diff --git a/tapestry-tutorial1/src/site/apt/hilo.apt b/tapestry-tutorial1/src/site/apt/hilo.apt
index b5e9c30..48aed3e 100644
--- a/tapestry-tutorial1/src/site/apt/hilo.apt
+++ b/tapestry-tutorial1/src/site/apt/hilo.apt
@@ -73,7 +73,7 @@
On the Java side, the Guess page needs to have a target property:
----
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
public class Guess
{
@@ -101,14 +101,14 @@
Let's start with the code, and break it down:
- <<src/main/java/org/apache/tapestry/tutorial/pages/Index.java>>
+ <<src/main/java/org/apache/tapestry5/tutorial/pages/Index.java>>
----
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
import java.util.Random;
-import org.apache.tapestry.annotation.InjectPage;
+import org.apache.tapestry5.annotations.InjectPage;
public class Start
{
@@ -134,7 +134,7 @@
The Tapestry way is very object oriented: everything is done in terms of objects and methods and properties of those objects.
This communication starts with the connection between the two pages: in this case, the
- {{{../apidocs/org/apache/tapestry/annotations/InjectPage.html}InjectPage}} annotation allows another page in the application
+ {{{../apidocs/org/apache/tapestry5/annotations/InjectPage.html}InjectPage}} annotation allows another page in the application
to be injected into the Index page.
Injection can be a somewhat nebulous concept. In terms of Tapestry, it means that some cooperating object needed by one class is provided to it. The other
@@ -249,7 +249,7 @@
at the end of that request, the value was lost, and in the subsequent render request for the Guess page,
the value was zero.
- Fortunately, it is very easy to transcend this behavior. We'll use an annotation, {{{../apidocs/org/apache/tapestry/annotations/Persist.html}Persist}},
+ Fortunately, it is very easy to transcend this behavior. We'll use an annotation, {{{../apidocs/org/apache/tapestry5/annotations/Persist.html}Persist}},
on the instance variable:
----
@@ -393,10 +393,10 @@
</html>
---
- <<src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java:>>
+ <<src/main/java/org/apache/tapestry5/tutorial/pages/GameOver.java:>>
---
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
public class GameOver
{
@@ -459,13 +459,13 @@
Lastly, we need to make some changes to the GameOver class.
- <<src/main/java/org/apache/tapestry/tutorial/GameOver.java:>>
+ <<src/main/java/org/apache/tapestry5/tutorial/GameOver.java:>>
---
-package org.apache.tapestry.tutorial.pages;
+package org.apache.tapestry5.tutorial.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.annotation.Property;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.annotations.Property;
public class GameOver
{
diff --git a/tapestry-tutorial1/src/test/conf/testng.xml b/tapestry-tutorial1/src/test/conf/testng.xml
index da08806..20aba12 100644
--- a/tapestry-tutorial1/src/test/conf/testng.xml
+++ b/tapestry-tutorial1/src/test/conf/testng.xml
@@ -18,7 +18,7 @@
<suite name="Tapestry Tutorial #1" annotations="1.5" verbose="2">
<test name="Services">
<packages>
- <package name="org.apache.tapestry.tutorial.services"/>
+ <package name="org.apache.tapestry5.tutorial.services"/>
</packages>
</test>
</suite>
diff --git a/tapestry-tutorial1/src/test/java/org/apache/tapestry5/tutorial/services/AppSuite.java b/tapestry-tutorial1/src/test/java/org/apache/tapestry5/tutorial/services/AppSuite.java
index 6daf26f..b8dd41b 100644
--- a/tapestry-tutorial1/src/test/java/org/apache/tapestry5/tutorial/services/AppSuite.java
+++ b/tapestry-tutorial1/src/test/java/org/apache/tapestry5/tutorial/services/AppSuite.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.tutorial.services;
+package org.apache.tapestry5.tutorial.services;
-import org.apache.tapestry.ioc.test.TestBase;
+import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.Test;
public class AppSuite extends TestBase
diff --git a/tapestry-upload/pom.xml b/tapestry-upload/pom.xml
index b02f288..197706e 100644
--- a/tapestry-upload/pom.xml
+++ b/tapestry-upload/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-upload</artifactId>
@@ -85,7 +86,7 @@
<archive>
<manifestEntries>
<Tapestry-Module-Classes>
- org.apache.tapestry.upload.services.UploadModule
+ org.apache.tapestry5.upload.services.UploadModule
</Tapestry-Module-Classes>
</manifestEntries>
</archive>
@@ -117,7 +118,7 @@
<artifactId>tapestry-component-report</artifactId>
<version>${project.version}</version>
<configuration>
- <rootPackage>org.apache.tapestry.upload</rootPackage>
+ <rootPackage>org.apache.tapestry5.upload</rootPackage>
<apidocs>../apidocs</apidocs>
</configuration>
</plugin>
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
index 340851a..7b779b3 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/components/Upload.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.components;
+package org.apache.tapestry5.upload.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.annotation.Environmental;
-import org.apache.tapestry.annotation.Mixin;
-import org.apache.tapestry.annotation.Parameter;
-import org.apache.tapestry.corelib.base.AbstractField;
-import org.apache.tapestry.corelib.mixins.RenderDisabled;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.services.FieldValidatorDefaultSource;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.upload.services.MultipartDecoder;
-import org.apache.tapestry.upload.services.UploadedFile;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.annotations.Environmental;
+import org.apache.tapestry5.annotations.Mixin;
+import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.corelib.base.AbstractField;
+import org.apache.tapestry5.corelib.mixins.RenderDisabled;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.services.FieldValidatorDefaultSource;
+import org.apache.tapestry5.services.FormSupport;
+import org.apache.tapestry5.upload.services.MultipartDecoder;
+import org.apache.tapestry5.upload.services.UploadedFile;
import java.util.Locale;
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImpl.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImpl.java
index 8fedfb4..9283cf5 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImpl.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImpl.java
@@ -12,20 +12,20 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.FileItemFactory;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.tapestry.ioc.annotation.Inject;
-import org.apache.tapestry.ioc.annotation.Symbol;
-import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.ioc.services.ThreadCleanupListener;
-import org.apache.tapestry.upload.services.MultipartDecoder;
-import org.apache.tapestry.upload.services.UploadSymbols;
-import org.apache.tapestry.upload.services.UploadedFile;
+import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.annotations.Symbol;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.services.ThreadCleanupListener;
+import org.apache.tapestry5.upload.services.MultipartDecoder;
+import org.apache.tapestry5.upload.services.UploadSymbols;
+import org.apache.tapestry5.upload.services.UploadedFile;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilter.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilter.java
index 497c490..65dddbc 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilter.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilter.java
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.tapestry.services.HttpServletRequestFilter;
-import org.apache.tapestry.services.HttpServletRequestHandler;
-import org.apache.tapestry.upload.services.MultipartDecoder;
+import org.apache.tapestry5.services.HttpServletRequestFilter;
+import org.apache.tapestry5.services.HttpServletRequestHandler;
+import org.apache.tapestry5.upload.services.MultipartDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParameterValue.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParameterValue.java
index 37aee84..ab2cd87 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParameterValue.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParameterValue.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
import java.util.List;
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapper.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapper.java
index 0c261d3..92ecfe4 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapper.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapper.java
@@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-import org.apache.tapestry.services.Dispatcher;
+import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
+import org.apache.tapestry5.services.Dispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadMessages.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadMessages.java
index d44397c..3fdb625 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadMessages.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadMessages.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
-import org.apache.tapestry.ioc.Messages;
-import org.apache.tapestry.ioc.internal.util.MessagesImpl;
-import org.apache.tapestry.upload.services.UploadedFile;
+import org.apache.tapestry5.ioc.Messages;
+import org.apache.tapestry5.ioc.internal.util.MessagesImpl;
+import org.apache.tapestry5.upload.services.UploadedFile;
import java.io.File;
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadedFileItem.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadedFileItem.java
index cc15bde..57e2931 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadedFileItem.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/internal/services/UploadedFileItem.java
@@ -12,18 +12,18 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.io.FilenameUtils;
-import org.apache.tapestry.upload.services.UploadedFile;
+import org.apache.tapestry5.upload.services.UploadedFile;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
/**
- * Implentation of {@link org.apache.tapestry.upload.services.UploadedFile} for FileItems.
+ * Implentation of {@link org.apache.tapestry5.upload.services.UploadedFile} for FileItems.
*/
public class UploadedFileItem implements UploadedFile
{
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/MultipartDecoder.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/MultipartDecoder.java
index ce2ab96..1193f28 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/MultipartDecoder.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/MultipartDecoder.java
@@ -1,24 +1,24 @@
-// Copyright 2007 The Apache Software Foundation
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package org.apache.tapestry.upload.services;
+// Copyright 2007 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry5.upload.services;
import javax.servlet.http.HttpServletRequest;
/**
- * Responsible for detecting and processing file upload requests, using Jakarta Commons FileUpload.
- * Implementations of this service typically use the threaded service lifecycle model.
+ * Responsible for detecting and processing file upload requests, using Jakarta Commons FileUpload. Implementations of
+ * this service typically use the threaded service lifecycle model.
*/
public interface MultipartDecoder
{
@@ -30,9 +30,8 @@
UploadedFile getFileUpload(String parameterName);
/**
- * Decodes the request, returning a new {@link javax.servlet.http.HttpServletRequest}
- * implementation that will allow access to the form fields submitted in the request (but omits
- * uploaded files).
+ * Decodes the request, returning a new {@link javax.servlet.http.HttpServletRequest} implementation that will allow
+ * access to the form fields submitted in the request (but omits uploaded files).
*
* @param request The incoming servlet request
* @return decoded http request
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadModule.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadModule.java
index 289c208..5eebc74 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadModule.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadModule.java
@@ -12,19 +12,19 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.services;
+package org.apache.tapestry5.upload.services;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.io.FileCleaner;
-import org.apache.tapestry.ioc.*;
-import org.apache.tapestry.ioc.annotation.Scope;
-import org.apache.tapestry.ioc.services.PerthreadManager;
-import org.apache.tapestry.ioc.services.RegistryShutdownHub;
-import org.apache.tapestry.ioc.services.RegistryShutdownListener;
-import org.apache.tapestry.services.HttpServletRequestFilter;
-import org.apache.tapestry.services.LibraryMapping;
-import org.apache.tapestry.upload.internal.services.MultipartDecoderImpl;
-import org.apache.tapestry.upload.internal.services.MultipartServletRequestFilter;
+import org.apache.tapestry5.ioc.*;
+import org.apache.tapestry5.ioc.annotations.Scope;
+import org.apache.tapestry5.ioc.services.PerthreadManager;
+import org.apache.tapestry5.ioc.services.RegistryShutdownHub;
+import org.apache.tapestry5.ioc.services.RegistryShutdownListener;
+import org.apache.tapestry5.services.HttpServletRequestFilter;
+import org.apache.tapestry5.services.LibraryMapping;
+import org.apache.tapestry5.upload.internal.services.MultipartDecoderImpl;
+import org.apache.tapestry5.upload.internal.services.MultipartServletRequestFilter;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -37,7 +37,7 @@
{
// Add the component to the "core" library.
- configuration.add(new LibraryMapping("core", "org.apache.tapestry.upload"));
+ configuration.add(new LibraryMapping("core", "org.apache.tapestry5.upload"));
}
@Scope(IOCConstants.PERTHREAD_SCOPE)
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadSymbols.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadSymbols.java
index 1ff64a1..28c014a 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadSymbols.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadSymbols.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.services;
+package org.apache.tapestry5.upload.services;
/**
* Configuration symbols.
diff --git a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadedFile.java b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadedFile.java
index 7140c1e..fbc543f 100755
--- a/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadedFile.java
+++ b/tapestry-upload/src/main/java/org/apache/tapestry5/upload/services/UploadedFile.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.services;
+package org.apache.tapestry5.upload.services;
-import org.apache.tapestry.upload.components.Upload;
+import org.apache.tapestry5.upload.components.Upload;
import java.io.File;
import java.io.InputStream;
diff --git a/tapestry-upload/src/test/conf/testng.xml b/tapestry-upload/src/test/conf/testng.xml
index 6ea8a59..6e63873 100755
--- a/tapestry-upload/src/test/conf/testng.xml
+++ b/tapestry-upload/src/test/conf/testng.xml
@@ -19,10 +19,10 @@
<test name="Tapesty Upload Component">
<parameter name="tapestry.integration-webapp" value="src/test/webapp"/>
<packages>
- <package name="org.apache.tapestry.upload.components"/>
- <package name="org.apache.tapestry.upload.internal.services"/>
+ <package name="org.apache.tapestry5.upload.components"/>
+ <package name="org.apache.tapestry5.upload.internal.services"/>
<!-- One day might be able to run this too -->
- <!--package name="org.apache.tapestry.upload.integration"/-->
+ <!--package name="org.apache.tapestry5.upload.integration"/-->
</packages>
</test>
</suite>
diff --git a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/RunJettyUpload.java b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/RunJettyUpload.java
index 3ce7482..141ae19 100644
--- a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/RunJettyUpload.java
+++ b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/RunJettyUpload.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload;
+package org.apache.tapestry5.upload;
-import org.apache.tapestry.test.JettyRunner;
+import org.apache.tapestry5.test.JettyRunner;
import java.io.File;
diff --git a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/components/UploadTest.java b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/components/UploadTest.java
index a1a6006..b433305 100755
--- a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/components/UploadTest.java
+++ b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/components/UploadTest.java
@@ -12,14 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.components;
+package org.apache.tapestry5.upload.components;
-import org.apache.tapestry.*;
-import org.apache.tapestry.dom.Element;
-import org.apache.tapestry.services.FormSupport;
-import org.apache.tapestry.test.TapestryTestCase;
-import org.apache.tapestry.upload.services.MultipartDecoder;
-import org.apache.tapestry.upload.services.UploadedFile;
+import org.apache.tapestry5.*;
+import org.apache.tapestry5.dom.Element;
+import org.apache.tapestry5.services.FormSupport;
+import org.apache.tapestry5.test.TapestryTestCase;
+import org.apache.tapestry5.upload.services.MultipartDecoder;
+import org.apache.tapestry5.upload.services.UploadedFile;
import static org.easymock.EasyMock.expectLastCall;
import org.testng.annotations.Test;
@@ -145,7 +145,7 @@
}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
@Test
public void process_submission_extracts_value_from_decoder() throws Exception
{
@@ -171,7 +171,7 @@
assertSame(component.getValue(), uploadedFile);
}
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({ "unchecked" })
@Test
public void process_submission_ignores_null_value() throws Exception
{
@@ -222,7 +222,7 @@
verify();
}
- @SuppressWarnings({"unchecked", "ThrowableInstanceNeverThrown"})
+ @SuppressWarnings({ "unchecked", "ThrowableInstanceNeverThrown" })
@Test
public void process_submission_tracks_validator_errors() throws Exception
{
diff --git a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/integration/UploadIntegrationTest.java b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/integration/UploadIntegrationTest.java
index 3f9fa0e..f700840 100755
--- a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/integration/UploadIntegrationTest.java
+++ b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/integration/UploadIntegrationTest.java
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.integration;
+package org.apache.tapestry5.upload.integration;
-import org.apache.tapestry.test.AbstractIntegrationTestSuite;
+import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
import org.example.upload.pages.Start;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
diff --git a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java
index af4af5d..3be251d 100755
--- a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java
+++ b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartDecoderImplTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
import javax.servlet.http.HttpServletRequest;
diff --git a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilterTest.java b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilterTest.java
index 4a2d532..7a615de 100755
--- a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilterTest.java
+++ b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/MultipartServletRequestFilterTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
-import org.apache.tapestry.services.HttpServletRequestHandler;
-import org.apache.tapestry.test.TapestryTestCase;
-import org.apache.tapestry.upload.services.MultipartDecoder;
+import org.apache.tapestry5.services.HttpServletRequestHandler;
+import org.apache.tapestry5.test.TapestryTestCase;
+import org.apache.tapestry5.upload.services.MultipartDecoder;
import org.testng.annotations.Test;
import javax.servlet.http.HttpServletRequest;
diff --git a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParameterValueTest.java b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParameterValueTest.java
index 914adf9..2315e8d 100755
--- a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParameterValueTest.java
+++ b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParameterValueTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
import static org.testng.Assert.*;
import org.testng.annotations.Test;
@@ -31,7 +31,7 @@
public void multiReturnsArrayWithConstructedParameterByDefault() throws Exception
{
ParameterValue value = new ParameterValue("foo");
- assertEquals(value.multi(), new String[]{"foo"});
+ assertEquals(value.multi(), new String[] { "foo" });
}
@Test
@@ -46,7 +46,7 @@
{
ParameterValue value = new ParameterValue("foo");
value.add("blah");
- assertEquals(value.multi(), new String[]{"foo", "blah"});
+ assertEquals(value.multi(), new String[] { "foo", "blah" });
}
@Test
diff --git a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapperTest.java b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapperTest.java
index 7335002..ace5481 100755
--- a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapperTest.java
+++ b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/ParametersServletRequestWrapperTest.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
import static org.easymock.EasyMock.*;
import static org.testng.Assert.*;
@@ -126,7 +126,7 @@
wrapper.addParameter("foo", "blah");
wrapper.addParameter("foo", "another");
- assertEquals(wrapper.getParameterValues("foo"), new String[]{"blah", "another"});
+ assertEquals(wrapper.getParameterValues("foo"), new String[] { "blah", "another" });
verify(request);
}
@@ -166,7 +166,7 @@
Map parameters = wrapper.getParameterMap();
assertEquals(parameters.size(), 2);
assertEquals(parameters.get("single"), "blah");
- assertEquals((String[]) parameters.get("multi"), new String[]{"one", "two"});
+ assertEquals((String[]) parameters.get("multi"), new String[] { "one", "two" });
verify(request);
}
diff --git a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/StubFileItem.java b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/StubFileItem.java
index 968ff21..a5284c0 100755
--- a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/StubFileItem.java
+++ b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/StubFileItem.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
import org.apache.commons.fileupload.FileItem;
diff --git a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/UploadedFileItemTest.java b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/UploadedFileItemTest.java
index c9f0ef2..abdaf4a 100755
--- a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/UploadedFileItemTest.java
+++ b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/internal/services/UploadedFileItemTest.java
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.upload.internal.services;
+package org.apache.tapestry5.upload.internal.services;
import org.apache.commons.fileupload.FileItem;
import org.apache.commons.io.input.NullInputStream;
-import org.apache.tapestry.test.TapestryTestCase;
+import org.apache.tapestry5.test.TapestryTestCase;
import org.testng.annotations.Test;
import java.io.File;
diff --git a/tapestry-upload/src/test/java/org/example/upload/pages/Start.java b/tapestry-upload/src/test/java/org/example/upload/pages/Start.java
index 6d387e4..4074daa 100755
--- a/tapestry-upload/src/test/java/org/example/upload/pages/Start.java
+++ b/tapestry-upload/src/test/java/org/example/upload/pages/Start.java
@@ -14,8 +14,8 @@
package org.example.upload.pages;
-import org.apache.tapestry.annotation.Persist;
-import org.apache.tapestry.upload.services.UploadedFile;
+import org.apache.tapestry5.annotations.Persist;
+import org.apache.tapestry5.upload.services.UploadedFile;
import java.io.File;
diff --git a/tapestry-upload/src/test/java/org/example/upload/services/AppModule.java b/tapestry-upload/src/test/java/org/example/upload/services/AppModule.java
index b7d9c35..0568318 100755
--- a/tapestry-upload/src/test/java/org/example/upload/services/AppModule.java
+++ b/tapestry-upload/src/test/java/org/example/upload/services/AppModule.java
@@ -14,8 +14,8 @@
package org.example.upload.services;
-import org.apache.tapestry.ioc.annotation.SubModule;
-import org.apache.tapestry.upload.services.UploadModule;
+import org.apache.tapestry5.ioc.annotations.SubModule;
+import org.apache.tapestry5.upload.services.UploadModule;
/**
* The SubModule is not normally needed, except that during tests of tapestry-upload, the necessary JAR Manifest does
diff --git a/tapestry-upload/src/test/webapp/WEB-INF/web.xml b/tapestry-upload/src/test/webapp/WEB-INF/web.xml
index 613fdd2..d2f1c4e 100755
--- a/tapestry-upload/src/test/webapp/WEB-INF/web.xml
+++ b/tapestry-upload/src/test/webapp/WEB-INF/web.xml
@@ -26,7 +26,7 @@
</context-param>
<filter>
<filter-name>app</filter-name>
- <filter-class>org.apache.tapestry.TapestryFilter</filter-class>
+ <filter-class>org.apache.tapestry5.TapestryFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>app</filter-name>
