You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/05/20 21:15:32 UTC

svn commit: r658398 [2/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...

Modified: tapestry/tapestry5/trunk/build.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.xml?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/build.xml (original)
+++ tapestry/tapestry5/trunk/build.xml Tue May 20 12:14:45 2008
@@ -207,4 +207,4 @@
         <antcall target="assemble"/>
     </target>
 
-</project>
\ No newline at end of file
+</project>

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

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

Modified: tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java?rev=658398&r1=658397&r2=658398&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java (original)
+++ tapestry/tapestry5/trunk/quickstart/src/main/resources/archetype-resources/src/main/java/pages/Index.java Tue May 20 12:14:45 2008
@@ -11,4 +11,4 @@
 	{ 
 		return new Date(); 
 	}
-}
\ No newline at end of file
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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