Author: andyhot
Date: Mon Nov 12 06:10:34 2007
New Revision: 594153
URL: http://svn.apache.org/viewvc?rev=594153&view=rev
Log:
default values for Shell can now come from the JavascriptManager
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.jwc
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/javascript/JavascriptManagerImpl.java
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=594153&r1=594152&r2=594153&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
Mon Nov 12 06:10:34 2007
@@ -147,38 +147,38 @@
</description>
</parameter>
- <parameter name="tapestrySource"
default-value="asset:defaultTapestrySource">
+ <parameter name="tapestrySource"
default-value="ognl:jsManager.jsTapestryAsset">
<description>
If specified, allows for the default tapestry source included to
be overriden.
</description>
</parameter>
- <parameter name="tapestryPath" default-value="asset:defaultTapestryPath">
+ <parameter name="tapestryPath"
default-value="ognl:jsManager.jsTapestryPath">
<description>
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 name="dojoSource" default-value="asset:defaultDojoSource">
+ <parameter name="dojoSource" default-value="ognl:jsManager.mainJsAsset">
<description>
If specified, allows for the default dojo source included to be
overriden.
</description>
</parameter>
- <parameter name="dojoFormSource"
default-value="asset:defaultDojoFormSource">
+ <parameter name="dojoFormSource"
default-value="ognl:jsManager.mainJsFormAsset">
<description>
If specified, allows for the default dojo source included to be
overriden.
</description>
</parameter>
- <parameter name="dojoWidgetSource"
default-value="asset:defaultDojoWidgetSource">
+ <parameter name="dojoWidgetSource"
default-value="ognl:jsManager.mainJsWidgetAsset">
<description>
If specified, allows for the default dojo source included to be
overriden.
</description>
</parameter>
- <parameter name="dojoPath" default-value="asset:defaultDojoPath">
+ <parameter name="dojoPath" default-value="ognl:jsManager.jsPath">
<description>
Specifies the default path to the root dojo folder, not the
dojo.js file itself. This is
used by the djConfig.baseRelativePath javascript configuration
variable in dojo.
@@ -189,7 +189,8 @@
<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" />
+
<bean name="coreAjaxDelegate"
class="org.apache.tapestry.dojo.AjaxShellDelegate">
<set name="dojoSource" value="dojoSource" />
<set name="dojoFormSource" value="dojoFormSource" />
@@ -206,13 +207,5 @@
<set name="parseWidgets" value="parseWidgets" />
<set name="searchIds" value="searchIds" />
</bean>
-
- <asset name="defaultDojoSource" path="classpath:/dojo-0.4.3/dojo.js" />
- <asset name="defaultDojoFormSource" path="classpath:/dojo-0.4.3/dojo2.js"
/>
- <asset name="defaultDojoWidgetSource"
path="classpath:/dojo-0.4.3/dojo3.js" />
-
- <asset name="defaultDojoPath" path="classpath:/dojo-0.4.3/" />
- <asset name="defaultTapestrySource" path="classpath:/tapestry/core.js" />
- <asset name="defaultTapestryPath" path="classpath:/tapestry/" />
</component-specification>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/javascript/JavascriptManagerImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/javascript/JavascriptManagerImpl.java?rev=594153&r1=594152&r2=594153&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/javascript/JavascriptManagerImpl.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/javascript/JavascriptManagerImpl.java
Mon Nov 12 06:10:34 2007
@@ -127,7 +127,6 @@
Location location = new DescribedLocation(new URLResource(path),
description);
asset = _assetSource.findAsset(null, path, null, location);
}
- System.out.println("##ASSET for " + path + " : " + asset);
return asset;
}
