svn commit: r658398 [3/4] - in /tapestry/tapestry5/trunk: ./ quickstart/src/main/resources/META-INF/ quickstart/src/main/resources/archetype-resources/src/main/java/pages/ quickstart/src/main/resources/archetype-resources/src/main/java/services/ quicks...

[hl...@apache.org]

Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/validation.apt Tue May 20 12:14:45 2008
@@ -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":

Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt Tue May 20 12:14:45 2008
@@ -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.

Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt Tue May 20 12:14:45 2008
@@ -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

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/app.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/app.properties?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/app.properties (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/app.properties Tue May 20 12:14:45 2008
@@ -14,4 +14,4 @@
 
 app-catalog-status=Application Catalog Working
 
-viewlink-label=View
\ No newline at end of file
+viewlink-label=View

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/web.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/web.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/web.xml Tue May 20 12:14:45 2008
@@ -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>

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/app3/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app3/WEB-INF/web.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app3/WEB-INF/web.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app3/WEB-INF/web.xml Tue May 20 12:14:45 2008
@@ -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>

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/app4/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app4/WEB-INF/web.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app4/WEB-INF/web.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app4/WEB-INF/web.xml Tue May 20 12:14:45 2008
@@ -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>

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml Tue May 20 12:14:45 2008
@@ -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>

Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/resources/log4j.properties?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/resources/log4j.properties (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/resources/log4j.properties Tue May 20 12:14:45 2008
@@ -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
 
 
 

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/pom.xml Tue May 20 12:14:45 2008
@@ -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>

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/userguide.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/userguide.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/userguide.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/userguide.apt Tue May 20 12:14:45 2008
@@ -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.

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/testng.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/conf/testng.xml Tue May 20 12:14:45 2008
@@ -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>

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java Tue May 20 12:14:45 2008
@@ -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;
 

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CommitAfterDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CommitAfterDemo.java?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CommitAfterDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CommitAfterDemo.java Tue May 20 12:14:45 2008
@@ -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;

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java Tue May 20 12:14:45 2008
@@ -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;
 

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java Tue May 20 12:14:45 2008
@@ -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;

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java Tue May 20 12:14:45 2008
@@ -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;
 

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/AppModule.java Tue May 20 12:14:45 2008
@@ -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

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAO.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAO.java?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAO.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAO.java Tue May 20 12:14:45 2008
@@ -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;

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/resources/log4j.properties?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/resources/log4j.properties (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/resources/log4j.properties Tue May 20 12:14:45 2008
@@ -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

Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/WEB-INF/web.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/WEB-INF/web.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/webapp/WEB-INF/web.xml Tue May 20 12:14:45 2008
@@ -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>

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/case.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/case.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/case.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/case.apt Tue May 20 12:14:45 2008
@@ -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

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt Tue May 20 12:14:45 2008
@@ -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  

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/command.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/command.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/command.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/command.apt Tue May 20 12:14:45 2008
@@ -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:
   
 +----+

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/configuration.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/configuration.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/configuration.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/configuration.apt Tue May 20 12:14:45 2008
@@ -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
   
   []

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/basics.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/basics.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/basics.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/basics.apt Tue May 20 12:14:45 2008
@@ -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.
 

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/patterns.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/patterns.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/patterns.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/patterns.apt Tue May 20 12:14:45 2008
@@ -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}}.

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/servconf.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/servconf.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/servconf.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/cookbook/servconf.apt Tue May 20 12:14:45 2008
@@ -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}");
   }
 +---+

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/decorator.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/decorator.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/decorator.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/decorator.apt Tue May 20 12:14:45 2008
@@ -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:

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/module.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/module.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/module.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/module.apt Tue May 20 12:14:45 2008
@@ -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:

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/order.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/order.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/order.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/order.apt Tue May 20 12:14:45 2008
@@ -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.
   

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/pipeline.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/pipeline.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/pipeline.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/pipeline.apt Tue May 20 12:14:45 2008
@@ -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.
   

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/provider.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/provider.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/provider.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/provider.apt Tue May 20 12:14:45 2008
@@ -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
   

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/run.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/run.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/run.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/run.apt Tue May 20 12:14:45 2008
@@ -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).

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/service.apt Tue May 20 12:14:45 2008
@@ -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.

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/shadow.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/shadow.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/shadow.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/shadow.apt Tue May 20 12:14:45 2008
@@ -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.

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/strategy.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/strategy.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/strategy.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/strategy.apt Tue May 20 12:14:45 2008
@@ -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

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/symbols.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/symbols.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/symbols.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/symbols.apt Tue May 20 12:14:45 2008
@@ -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.

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/upgrade.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/upgrade.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/upgrade.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/upgrade.apt Tue May 20 12:14:45 2008
@@ -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

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/conf/testng.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/conf/testng.xml Tue May 20 12:14:45 2008
@@ -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>

Modified: tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt Tue May 20 12:14:45 2008
@@ -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:
   

Modified: tapestry/tapestry5/trunk/tapestry-spring/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/test/conf/testng.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/test/conf/testng.xml Tue May 20 12:14:45 2008
@@ -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>

Modified: tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java Tue May 20 12:14:45 2008
@@ -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;
 

Modified: tapestry/tapestry5/trunk/tapestry-spring/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/test/resources/log4j.properties?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/test/resources/log4j.properties (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/test/resources/log4j.properties Tue May 20 12:14:45 2008
@@ -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

Modified: tapestry/tapestry5/trunk/tapestry-spring/src/test/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/test/webapp/WEB-INF/web.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/test/webapp/WEB-INF/web.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/test/webapp/WEB-INF/web.xml Tue May 20 12:14:45 2008
@@ -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>

Modified: tapestry/tapestry5/trunk/tapestry-test/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/pom.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-test/pom.xml Tue May 20 12:14:45 2008
@@ -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>

Modified: tapestry/tapestry5/trunk/tapestry-test/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/site/apt/index.apt?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/site/apt/index.apt Tue May 20 12:14:45 2008
@@ -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

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml Tue May 20 12:14:45 2008
@@ -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>

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/resources/log4j.properties?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/resources/log4j.properties (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/resources/log4j.properties Tue May 20 12:14:45 2008
@@ -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

Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/webapp/WEB-INF/web.xml Tue May 20 12:14:45 2008
@@ -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
+