Author: hlship
Date: Wed May 21 16:02:34 2008
New Revision: 658924
URL: http://svn.apache.org/viewvc?rev=658924&view=rev
Log:
TAPESTRY-2421: Allow Tapestry4/Tapestry5 to be deployed in the same WAR
Modified:
tapestry/tapestry5/trunk/pom.xml
tapestry/tapestry5/trunk/src/site/apt/tomcat.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/assets.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/inject.apt
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/request.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt
tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/provider.apt
tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt
Modified: tapestry/tapestry5/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/pom.xml?rev=658924&r1=658923&r2=658924&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/pom.xml (original)
+++ tapestry/tapestry5/trunk/pom.xml Wed May 21 16:02:34 2008
@@ -91,19 +91,19 @@
<name>Tapestry User List</name>
<subscribe>[EMAIL PROTECTED]</subscribe>
<unsubscribe>[EMAIL PROTECTED]</unsubscribe>
-
<archive>http://markmail.org/search/list:org.apache.tapestry5.users</archive>
+
<archive>http://markmail.org/search/list:org.apache.tapestry.users</archive>
</mailingList>
<mailingList>
<name>Tapestry Developer List</name>
<subscribe>[EMAIL PROTECTED]</subscribe>
<unsubscribe>[EMAIL PROTECTED]</unsubscribe>
-
<archive>http://markmail.org/search/list:org.apache.tapestry5.dev</archive>
+
<archive>http://markmail.org/search/list:org.apache.tapestry.dev</archive>
</mailingList>
<mailingList>
<name>Tapestry Commits List</name>
<subscribe>[EMAIL PROTECTED]</subscribe>
<unsubscribe>[EMAIL PROTECTED]</unsubscribe>
-
<archive>http://markmail.org/search/list:org.apache.tapestry5.commits</archive>
+
<archive>http://markmail.org/search/list:org.apache.tapestry.commits</archive>
</mailingList>
</mailingLists>
Modified: tapestry/tapestry5/trunk/src/site/apt/tomcat.apt
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/src/site/apt/tomcat.apt?rev=658924&r1=658923&r2=658924&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/src/site/apt/tomcat.apt (original)
+++ tapestry/tapestry5/trunk/src/site/apt/tomcat.apt Wed May 21 16:02:34 2008
@@ -14,7 +14,7 @@
classes and resource files in
WEB-INF/classes, they are instead placed inside an additional JAR inside
WEB-INF/lib. This keeps Tapestry happy at runtime.
- The {{{http://tapestry.apache.org/tapestry5/tapestry-simple}tapestry-simple
archetype}} configures your project's Maven pom.xml file to make use of this
+ The {{{quickstart/}quickstart archetype}} configures your project's Maven
pom.xml file to make use of this
option.
Tapestry 5 has been tested with Tomcat 5.5.20.
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=658924&r1=658923&r2=658924&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 Wed
May 21 16:02:34 2008
@@ -52,7 +52,7 @@
Symbols For Assets
- {{{http://tapestry.apache.org/tapestry5/tapestry-ioc/symbols.html}Symbols}}
inside the annotation value are
+ {{{../../tapestry-ioc/symbols.html}Symbols}} inside the annotation value are
expanded. This allows you to define a symbol and reference it as part of the
path. For example, you could contribute
a symbol named "skin.root" as "context:/skins/basic" and then reference an
asset from within it:
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=658924&r1=658923&r2=658924&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 Wed
May 21 16:02:34 2008
@@ -5,7 +5,7 @@
Injection with Components
A key concept in Tapestry is the use of <injection>. The
- {{{http://tapestry.apache.org/tapestry5/tapestry-ioc/index.html}Tapestry IoC
container}} makes use of one form
+ {{{../../tapestry-ioc/index.html}Tapestry IoC container}} makes use of one
form
of injection, via parameters to service builder methods.
For components, Tapestry takes a completely different tack: injection
directly into
@@ -130,6 +130,6 @@
Annonymous injection is controlled by the
{{{../../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.
+ {{{../../tapestry-ioc/command.html}chain of command}} for handling component
injections.
\ No newline at end of file
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=658924&r1=658923&r2=658924&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 Wed
May 21 16:02:34 2008
@@ -133,7 +133,7 @@
Request Service
The Request service is a
- {{{http://tapestry.apache.org/tapestry5/tapestry-ioc/shadow.html}shadow}}
+ {{{../../tapestry-ioc/shadow.html}shadow}}
of the RequestGlobals services' request property. That is, any methods
invoked
on this service are delegated to the request object stored inside the
RequestGlobals.
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt?rev=658924&r1=658923&r2=658924&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/coerce.apt Wed May 21
16:02:34 2008
@@ -8,7 +8,7 @@
of a different type with similar content: a common example is coercing a
string into an integer or a double.
Although these types of coercions happens more inside
- tapestry-core (inlcuding coercions of
{{{http://tapestry.apache.org/tapestry5/tapestry-core/guide/coercion.html}component
parameters}}), this
+ tapestry-core (inlcuding coercions of
{{{../tapestry-core/guide/coercion.html}component parameters}}), this
may also happen inside tapestry-ioc, such as when injecting a value, rather
than a service, into a builder method.
Like everything else in Tapestry, type coercions are extensible. At the
root is the
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/provider.apt
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/provider.apt?rev=658924&r1=658923&r2=658924&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/provider.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/site/apt/provider.apt Wed May 21
16:02:34 2008
@@ -57,9 +57,9 @@
Alias Object Provider
- The {{{http://tapestry.apache.org/tapestry5/tapestry-core/}tapestry-core}}
module
+ The {{{../tapestry-core/}tapestry-core}} module
defines the
- {{{http://tapestry.apache.org/tapestry5/tapestry-core/guide/alias.html}Alias
object provider}},
+ {{{../tapestry-core/guide/alias.html}Alias object provider}},
which is used as a way to override services or
disambiguate services (when multiple services implement the same interface).
Modified: tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt?rev=658924&r1=658923&r2=658924&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt Wed May 21
16:02:34 2008
@@ -68,7 +68,7 @@
* Injecting beans
Inside your component classes, you may use the
-
{{{http://tapestry.apache.org/tapestry5/tapestry-core/apidocs/org/apache/tapestry5/ioc/annotations/Inject.html}Inject}}
annotation. Typically, just the field
+ {{{../apidocs/org/apache/tapestry5/ioc/annotations/Inject.html}Inject}}
annotation. Typically, just the field
type is sufficient to identify the Spring bean to inject:
+----+
@@ -78,7 +78,7 @@
If you have multiple beans that implement the same interface (for instance,
if you have wrapped your bean using a transaction interceptor), you must
disambiguate. The easiest way
to accomplish this is to add a
-
{{{http://tapestry.apache.org/tapestry5/tapestry-core/apidocs/org/apache/tapestry5/annotations/Service.html}Service}}
+ {{{../apidocs/org/apache/tapestry5/annotations/Service.html}Service}}
annotation to identify the name of the
Spring bean:
