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/16 18:04:16 UTC
svn commit: r657115 - in
/tapestry/tapestry5/trunk/tapestry-core/src/site/apt: ./ guide/
Author: hlship
Date: Fri May 16 09:04:15 2008
New Revision: 657115
URL: http://svn.apache.org/viewvc?rev=657115&view=rev
Log:
TAPESTR-2421: Allow Tapestry4/Tapestry5 to be deployed in the same WAR
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/ajax.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/appstate.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/assets.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/component-classes.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/conf.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/css.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/env.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/event.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/inject.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/layout.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/lifecycle.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/localization.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/logging.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/mixins.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/pagenav.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/parameters.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/persist.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/rendering.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/request.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/secure.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/templates.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade4.apt
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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 2008
@@ -111,7 +111,7 @@
* Injecting RenderSupport
RenderSupport is an <environmental> object, so you will normally inject it via the
- {{{../../apidocs/org/apache/tapestry/annotations/Environmental.html}Environmental}} annotation:
+ {{{../../apidocs/org/apache/tapestry/annotation/Environmental.html}Environmental}} annotation:
+---+
@Environmental
@@ -142,7 +142,7 @@
IncludeJavaScriptLibrary Annotation
The
- {{{../../apidocs/org/apache/tapestry/annotations/IncludeJavaScriptLibrary.html}IncludeJavaScriptLibrary}} annotation
+ {{{../../apidocs/org/apache/tapestry/annotation/IncludeJavaScriptLibrary.html}IncludeJavaScriptLibrary}} annotation
is the easy way to include one or more JavaScript libraries.
The previous example could be re-written as:
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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 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/annotations/ApplicationState.html}ApplicationState}} annotation.
+ {{{../../apidocs/org/apache/tapestry/annotation/ApplicationState.html}ApplicationState}} annotation.
Example:
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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 2008
@@ -19,7 +19,7 @@
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/annotations/Path.html}Path}} annotation.
+ {{{../../apidocs/org/apache/tapestry/annotation/Path.html}Path}} annotation.
+----+
@Inject
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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 2008
@@ -34,7 +34,7 @@
package org.example.myapp.components;
import org.apache.tapestry.MarkupWriter;
-import org.apache.tapestry.annotations.BeginRender;
+import org.apache.tapestry.annotation.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/annotations/BeginRender.html}BeginRender}} annotation is
+ {{{../../apidocs/org/apache/tapestry/annotation/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/annotations/Property.html}Property}} annotation on the field.
+ the {{{../../apidocs/org/apache/tapestry/annotation/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/annotations/Retain.html}Retain}} annotation to the field. You should take
+ {{{../../apidocs/org/apache/tapestry/annotation/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/annotations/Parameter.html}Parameter}} annotation.
+ the {{{.../apidocs/org/apache/tapestry/annotation/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/annotations/Component.html}Component}} annotation to define the component type
+ {{{../../apidocs/org/apache/tapestry/annotation/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.annotations.Component;
-import org.apache.tapestry.annotations.Property;
+import org.apache.tapestry.annotation.Component;
+import org.apache.tapestry.annotation.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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 2008
@@ -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/annotations/Secure.html}@Secure}}
+ If true, then the page may only be accessed via HTTPS. The {{{../../apidocs/org/apache/tapestry/annotation/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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 2008
@@ -42,7 +42,7 @@
Using the IncludeStylesheet Annotation
Another approach to adding a stylesheet is to include an
- {{{../../apidocs/org/apache/tapestry/annotations/IncludeStylesheet.html}IncludeStylesheet}} annotation on your component class:
+ {{{../../apidocs/org/apache/tapestry/annotation/IncludeStylesheet.html}IncludeStylesheet}} annotation on your component class:
+---+
@IncludeStylesheet("context:css/myapp.css")
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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 2008
@@ -24,7 +24,7 @@
Using the @Environmental annotation
- The {{{../../apidocs/org/apache/tapestry/annotations/Environmental.html}Environmental}} annotation
+ The {{{../../apidocs/org/apache/tapestry/annotation/Environmental.html}Environmental}} annotation
is used to dynamically connect to a Environmental service provided by an enclosing component.
A very common Environmental is
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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 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/annotations/OnEvent.html}OnEvent annotation}}. Event handler methods
+ {{{../../apidocs/org/apache/tapestry/annotation/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
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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 2008
@@ -13,7 +13,7 @@
Inject Annotation
- The {{{../../apidocs/org/apache/tapestry/ioc/annotations/Inject.html}Inject annotation}} is used to identify fields that will contain injected services and other resources.
+ The {{{../../apidocs/org/apache/tapestry/ioc/annotation/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,7 +34,7 @@
* Asset Injection
When the
- {{{../../apidocs/org/apache/tapestry/annotations/Path.html}Path}} annotation is also present, then the injected value
+ {{{../../apidocs/org/apache/tapestry/annotation/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.
@@ -44,7 +44,7 @@
For field type {{{../../apidocs/org/apache/tapestry/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/annotations/Id.html}Id}} annotation can be supplied:
+ {{{../../apidocs/org/apache/tapestry/annotation/Id.html}Id}} annotation can be supplied:
+---+
@Inject
@@ -96,7 +96,7 @@
Explicit Service Injection
- Here, a specific object is requested. A {{{../../apidocs/org/apache/tapestry/annotations/Service.html}Service}} annotation
+ Here, a specific object is requested. A {{{../../apidocs/org/apache/tapestry/annotation/Service.html}Service}} annotation
is used to identify the service name.
Example:
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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 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/annotations/IncludeStylesheet.html}@IncludeStylesheet}}
+ {{{../../apidocs/org/apache/tapestry/annotation/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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 2008
@@ -136,11 +136,11 @@
The annotations / method names are:
- * {{{../../apidocs/org/apache/tapestry/annotations/PageLoaded.html}PageLoaded}} annotation, or method name "pageLoaded"
+ * {{{../../apidocs/org/apache/tapestry/annotation/PageLoaded.html}PageLoaded}} annotation, or method name "pageLoaded"
- * {{{../../apidocs/org/apache/tapestry/annotations/PageAttached.html}PageAttached}} annotation, or method name "pageAttached"
+ * {{{../../apidocs/org/apache/tapestry/annotation/PageAttached.html}PageAttached}} annotation, or method name "pageAttached"
- * {{{../../apidocs/org/apache/tapestry/annotations/PageDetached.html}PageDetached}} annotation, or method name "pageDetached"
+ * {{{../../apidocs/org/apache/tapestry/annotation/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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 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/annotations/Meta.html}Meta}} annotation.
+ {{{../../apidocs/org/apache/tapestry/annotation/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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 2008
@@ -37,7 +37,7 @@
@Log annotation
- You may mark any component method with the {{{../../apidocs/org/apache/tapestry/annotations/Log.html}Log}} annotation.
+ You may mark any component method with the {{{../../apidocs/org/apache/tapestry/annotation/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.
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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 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/annotations/Component.html}Component annotation}}
+ Alternately, when the {{{../../apidocs/org/apache/tapestry/annotation/Component.html}Component annotation}}
is used to define the component type, you may specify the mixins in two ways:
- * The {{{../../apidocs/org/apache/tapestry/annotations/Mixins.html}Mixins annotation}} allows a list
+ * The {{{../../apidocs/org/apache/tapestry/annotation/Mixins.html}Mixins annotation}} allows a list
of mixin names to be specified.
- * The {{{../../apidocs/org/apache/tapestry/annotations/MixinClasses.html}MixinClasses annotation}}
+ * The {{{../../apidocs/org/apache/tapestry/annotation/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/annotations/Mixin.html}Mixin annotation}}. This annotation
+ {{{../../apidocs/org/apache/tapestry/annotation/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/annotations/MixinAfter.html}MixinAfter}} are ordered
+ {{{../../apidocs/org/apache/tapestry/annotation/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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 2008
@@ -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/annotations/InjectPage.html}InjectPage}} annotation.
+ A page may be injected via the {{{../../apidocs/org/apache/tapestry/annotation/InjectPage.html}InjectPage}} annotation.
Often, you will configure the page in some way before returning the page (examples below).
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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 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/annotations/Parameter.html}Parameter}} annotation
+ {{{../../apidocs/org/apache/tapestry/annotation/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.annotations.AfterRender;
-import org.apache.tapestry.annotations.Parameter;
-import org.apache.tapestry.annotations.SetupRender;
+import org.apache.tapestry.annotation.AfterRender;
+import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry.annotation.SetupRender;
public class Count
{
@@ -258,14 +258,14 @@
\<input\> will support informal parameters.
Only components whose class is annotated with
- {{{../apidocs/org/apache/tapestry/annotations/SupportsInformalParameters.html}SupportsInformalParameters}}
+ {{{../apidocs/org/apache/tapestry/annotation/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/annotations/Component.html}Component}} annotation, then the default binding
+ {{{../../apidocs/org/apache/tapestry/annotation/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,7 +273,7 @@
Supporting Informal Parameters
<<Only>> components which area annotated with
- {{{../apidocs/org/apache/tapestry/annotations/SupportsInformalParameters.html}SupportsInformalParameters}}
+ {{{../apidocs/org/apache/tapestry/annotation/SupportsInformalParameters.html}SupportsInformalParameters}}
may have informal parameters. Tapestry silently drops informal parameters that are specified for components
that do not have this annotation.
@@ -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/annotations/Inject.html}Inject}} annotation:
+ {{{../../apidocs/org/apache/tapestry/ioc/annotation/Inject.html}Inject}} annotation:
+---+
public class MyComponent
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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 2008
@@ -13,7 +13,7 @@
to it in later requests.
This is accomplished with the
- {{{../../apidocs/org/apache/tapestry/annotations/Persist.html}Persist annotation}}.
+ {{{../../apidocs/org/apache/tapestry/annotation/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/annotations/Meta.html}Meta}} annotation.
+ {{{../../apidocs/org/apache/tapestry/annotation/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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 2008
@@ -65,9 +65,9 @@
+---+
package org.example.app.components;
-import org.apache.tapestry.annotations.Parameter;
-import org.apache.tapestry.annotations.AfterRender;
-import org.apache.tapestry.annotations.SetupRender;
+import org.apache.tapestry.annotation.Parameter;
+import org.apache.tapestry.annotation.AfterRender;
+import org.apache.tapestry.annotation.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/annotations/SetupRender.html}SetupRender}}
+* {{{../../apidocs/org/apache/tapestry/annotation/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/annotations/BeginRender.html}BeginRender}}
+* {{{../../apidocs/org/apache/tapestry/annotation/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/annotations/BeforeRenderTemplate.html}BeforeRenderTemplate}}
+* {{{../../apidocs/org/apache/tapestry/annotation/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/annotations/BeforeRenderBody.html}BeforeRenderBody}}
+* {{{../../apidocs/org/apache/tapestry/annotation/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/annotations/AfterRenderBody.html}AfterRenderBody}}
+* {{{../../apidocs/org/apache/tapestry/annotation/AfterRenderBody.html}AfterRenderBody}}
Phase that is executed after the body is rendered; this only occurs for components with a
body.
-* {{{../../apidocs/org/apache/tapestry/annotations/AfterRender.html}AfterRender}}
+* {{{../../apidocs/org/apache/tapestry/annotation/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/annotations/CleanupRender.html}CleanupRender}}
+* {{{../../apidocs/org/apache/tapestry/annotation/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.annotations.Parameter;
+import org.apache.tapestry.annotation.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/annotations/Component.html}Component}} annotation, or may have been passed to the
+ {{{.../apidocs/org/apache/tapestry/annotation/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/annotations/MixinAfter.html}MixinAfter}} are ordered
+ {{{../../apidocs/org/apache/tapestry/annotation/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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 2008
@@ -33,7 +33,7 @@
The terminator for the pipeline does two things:
- * It stores the request and response into the {{{../../apidocs/org/apache/tapestry/services/RequestGlobals.html}RequestGlobals}}
+ * It stores the request and response into the {{{../../apidocs/org/apache/tapestry5/services/RequestGlobals.html}RequestGlobals}}
service. This is a threaded service that stores per-thread/per-request information.
* It wraps the request and response as a
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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 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/annotations/Secure.html}Secure}} annotation to the page class:
+ the {{{../../apidocs/org/apache/tapestry/annotation/Secure.html}Secure}} annotation to the page class:
----
@Secure
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=657115&r1=657114&r2=657115&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 Fri May 16 09:04:15 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/annotations/Component.html}Component}} annotation (and using the t:id attribute on the element in the template).
+ {{{../../apidocs/org/apache/tapestry/annotation/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/upgrade.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt?rev=657115&r1=657114&r2=657115&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade.apt Fri May 16 09:04:15 2008
@@ -30,6 +30,20 @@
{{{../apidocs/org/apache/tapestry/MarkupUtils.html}MarkupUtils}} and
{{{../apidocs/org/apache/tapestry/VersionUtils.html}VersionUtils}}.
+ Because of naming conflicts, several classes and interfaces were moved under an
+ org.apache.tapestry5 package:
+
+ * {{{../apidocs/org/apache/tapestry5/services/ApplicationInitializer.html}ApplicationInitializer}} and
+ {{{../apidocs/org/apache/tapestry5/services/ApplicationInitializerFilter.html}ApplicationInitializerFilter}}.
+
+ * {{{../apidocs/org/apache/tapestry5/services/ComponentMessagesSource.html}ComponentMessagesSource}}.
+
+ * {{{../apidocs/org/apache/tapestry5/services/RequestGlobals.html}RequestGlobals}}.
+
+ * {{{../apidocs/org/apache/tapestry5/json/JSONObject.html}JSONObject}} (and the other JSON classes).
+
+ []
+
* TapestryModule
Many of the internal services of Tapestry have been split off into their own module,
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade4.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade4.apt?rev=657115&r1=657114&r2=657115&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade4.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/upgrade4.apt Fri May 16 09:04:15 2008
@@ -13,4 +13,8 @@
In other cases, core concepts remain, but the details, names, and implementations
have changed.
+ As part of {{{https://issues.apache.org/jira/browse/TAPESTRY-2421}TAPESTRY-2421}}, we've done
+ some judicous renaming so that Tapestry 4 and Tapestry 5 applications can run inside the same WAR.
+
+
More to come ...
\ No newline at end of file