Author: jkuhnert
Date: Wed Jan 23 13:04:28 2008
New Revision: 614669
URL: http://svn.apache.org/viewvc?rev=614669&view=rev
Log:
-) Re-fixed Shell to have jsManager available.
-) Set explicit maven-clean-plugin version for [EMAIL PROTECTED] maven...
Modified:
tapestry/tapestry4/trunk/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.jwc
Modified: tapestry/tapestry4/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?rev=614669&r1=614668&r2=614669&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Wed Jan 23 13:04:28 2008
@@ -295,6 +295,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
+ <version>2.2</version>
<inherited>true</inherited>
</plugin>
<plugin>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.jwc?rev=614669&r1=614668&r2=614669&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.jwc
Wed Jan 23 13:04:28 2008
@@ -158,7 +158,7 @@
Sets the tapestry path, needed for dojo to properly detect and
find tapestry js modules
when overriding the default dojo bundled with tapestry.
</description>
- </parameter>
+ </parameter>ey
<parameter name="dojoSource" default-value="ognl:jsManager.firstAsset">
<description>
@@ -185,11 +185,6 @@
</description>
</parameter>
- <inject property="valueConverter"
object="service:tapestry.coerce.ValueConverter" />
- <inject property="pageService" object="engine-service:page" />
- <inject property="applicationSpecification"
object="infrastructure:applicationSpecification" />
- <inject property="baseTagWriter"
object="service:tapestry.url.BaseTagWriter" />
-
<bean name="coreAjaxDelegate"
class="org.apache.tapestry.dojo.AjaxShellDelegate">
<set name="dojoSource" value="dojoSource" />
<set name="dojoFormSource" value="dojoFormSource" />
@@ -206,5 +201,11 @@
<set name="parseWidgets" value="parseWidgets" />
<set name="searchIds" value="searchIds" />
</bean>
+
+ <inject property="valueConverter"
object="service:tapestry.coerce.ValueConverter" />
+ <inject property="pageService" object="engine-service:page" />
+ <inject property="applicationSpecification"
object="infrastructure:applicationSpecification" />
+ <inject property="baseTagWriter"
object="service:tapestry.url.BaseTagWriter" />
+ <inject property="jsManager"
object="service:tapestry.js.JavascriptManager" />
</component-specification>
