Author: jkuhnert
Date: Mon May 14 20:50:34 2007
New Revision: 538050
URL: http://svn.apache.org/viewvc?view=rev&rev=538050
Log:
-) Renamed dojo js directory so that it is served with a 0.4.2 url so as to
properly force browser/other caches to update to the new version.
-) Added doing a dojo.require("dojo.i18n.number") to NumberTranslator for
client side contributions.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/ScriptIncludes.jwc
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Shell.jwc
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_eventConnections.html
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_AlertDialog.html
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDatePicker.html
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDateTimePicker.html
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TDebugConsole.html
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TimePicker.html
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/pom.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/pom.xml?view=diff&rev=538050&r1=538049&r2=538050
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/pom.xml Mon May 14 20:50:34 2007
@@ -154,11 +154,11 @@
</excludes>
</resource>
<resource>
- <directory>src/js/dojo</directory>
+ <directory>src/js/dojo-0.4.2</directory>
<includes>
<include>**/*</include>
</includes>
- <targetPath>dojo</targetPath>
+ <targetPath>dojo-0.4.2</targetPath>
</resource>
<resource>
<directory>src/js/tapestry</directory>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml?view=diff&rev=538050&r1=538049&r2=538050
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml
Mon May 14 20:50:34 2007
@@ -16,183 +16,183 @@
-->
<module id="tapestry.asset" version="4.0.0"
package="org.apache.tapestry.asset">
-
- Factories for creating IAsset instances.
-
- <configuration-point id="AssetFactories">
-
- Maps asset path prefixes to AssetFactory implementations.
-
- <schema>
- <element name="factory">
- <attribute name="prefix" required="true" unique="true">
- The prefix to map.
- </attribute>
- <attribute name="object" required="true" translator="object">
- The asset factory for the prefix.
- </attribute>
-
- <conversion class="AssetFactoryContribution">
- <map attribute="object" property="factory"/>
- </conversion>
- </element>
- </schema>
- </configuration-point>
-
- <contribution configuration-id="AssetFactories">
-
- <factory prefix="context" object="service:ContextAssetFactory"/>
- <factory prefix="classpath" object="service:ClasspathAssetFactory"/>
-
- </contribution>
-
- <service-point id="DefaultAssetFactory" interface="AssetFactory">
-
- AssetFactory used when the prefix on the path is not known.
-
- <create-instance class="DefaultAssetFactory"/>
-
- </service-point>
-
- <service-point id="ContextAssetFactory" interface="AssetFactory">
-
- AssetFactory used when the prefix is "context:" or the base
- resource is a ContextResource.
-
- <invoke-factory>
- <construct class="ContextAssetFactory">
- <set-object property="contextPath" value="infrastructure:contextPath"/>
- <set-service property="webContext"
service-id="tapestry.globals.WebContext"/>
- <set-object property="localizer"
value="infrastructure:resourceLocalizer"/>
- <set-object property="requestCycle"
value="infrastructure:requestCycle" />
- </construct>
- </invoke-factory>
-
- </service-point>
-
- <service-point id="ClasspathAssetFactory" interface="AssetFactory">
-
- AssetFactory used when the prefix is "classpath:" or the
- base resource is a ClasspathResource.
-
- <invoke-factory>
- <construct class="ClasspathAssetFactory">
- <set-object property="assetService" value="engine-service:asset"/>
- </construct>
- </invoke-factory>
- </service-point>
-
- <configuration-point id="AssetFactoryStrategies"
schema-id="hivemind.lib.StrategyRegistry"/>
-
- <contribution configuration-id="AssetFactoryStrategies">
- <strategy class="org.apache.hivemind.util.ContextResource"
object="service:ContextAssetFactory"/>
-
- <strategy class="org.apache.tapestry.web.WebContextResource"
object="service:ContextAssetFactory"/>
-
- <strategy class="org.apache.hivemind.util.ClasspathResource"
object="service:ClasspathAssetFactory"/>
-
- <strategy class="ExternalResource" object="service:DefaultAssetFactory"/>
- </contribution>
-
- <service-point id="LookupAssetFactory" interface="AssetFactory">
-
- AssetFactory that delegates to another implementation based on
- the type of resource. Used when the asset path does not contain
- a prefix.
-
- <invoke-factory service-id="hivemind.lib.StrategyFactory">
- <construct configuration-id="AssetFactoryStrategies"/>
- </invoke-factory>
- </service-point>
-
-
- <service-point id="AssetSource">
-
- The master factory for assets, which identifies the correct
- AssetFactory based on the prefix of the asset path (if any).
-
- <invoke-factory>
- <construct class="AssetSourceImpl">
- <set-configuration property="contributions"
configuration-id="AssetFactories"/>
- <set-service property="lookupAssetFactory"
service-id="LookupAssetFactory"/>
- <set-service property="defaultAssetFactory"
service-id="DefaultAssetFactory"/>
- <set-service property="contextAssetFactory"
service-id="ContextAssetFactory" />
- <set-service property="classpathAssetFactory"
service-id="ClasspathAssetFactory" />
- </construct>
- </invoke-factory>
- </service-point>
-
-
- <service-point id="ResourceDigestSource">
-
- Reads and caches Digest digests of files exposed by the AssetService.
-
- <invoke-factory>
- <construct class="ResourceDigestSourceImpl">
- <event-listener service-id="tapestry.ResetEventHub"/>
- <event-listener service-id="tapestry.describe.ReportStatusHub"/>
- </construct>
- </invoke-factory>
- </service-point>
-
- <contribution configuration-id="tapestry.Infrastructure">
- <property name="assetFactory" object="service:LookupAssetFactory"/>
- </contribution>
-
- <configuration-point id="UnprotectedAssets">
-
- Maps asset path regexp patterns to assets that won't be required
- to have md5sum digests, making them visible and accessible to
unauthenticated
- url requests. Care should be taken contributing here. Most things should
remain
- protected, like .class files, database configuration files, etc.
-
- This configuration is mainly intended to help some resources that require
being
- able to dynamically load content on the browser client-side. One such
resource
- is the http://dojotoolkit.org javascript library, which loads
javascript/css/other
- resources dynamically via XmlHttpRequests for resources that haven't been
previously
- digested.
-
- <schema>
- <element name="unprotected-resource">
- <attribute name="contains" required="true" unique="true">
- The regexp pattern to match against.
- </attribute>
-
- <rules>
- <push-attribute attribute="contains"/>
- <invoke-parent method="addElement"/>
- </rules>
- </element>
- </schema>
- </configuration-point>
-
- <contribution configuration-id="UnprotectedAssets">
- List of unprotected asset regexps for ResourceMatcher service.
-
- <unprotected-resource contains="^/tapestry/" />
- <unprotected-resource contains="^/org/apache/tapestry/.*.css" />
- <unprotected-resource contains="^/org/apache/tapestry/.*.gif" />
- <unprotected-resource contains="^/org/apache/tapestry/.*.png" />
- <unprotected-resource contains="^/org/apache/tapestry/.*.jpg" />
- <unprotected-resource contains="^/org/apache/tapestry/.*.js" />
- <unprotected-resource contains="^/org/apache/tapestry/.*.htm" />
- <unprotected-resource contains="^/org/apache/tapestry/.*.html" />
-
- <unprotected-resource contains="^/dojo/" />
- </contribution>
-
- <service-point id="UnprotectedResourceMatcher" interface="ResourceMatcher" >
-
- Uses the UnprotectedAssets configuration point to dynamically determine
- which assets managed by the AssetService should be protected. The default
- is to protect all resources.
-
- <invoke-factory>
- <construct class="ResourceMatcherImpl">
- <event-listener service-id="tapestry.ResetEventHub"/>
- <set-configuration configuration-id="UnprotectedAssets"
property="contributions" />
- </construct>
- </invoke-factory>
- </service-point>
-
+
+ Factories for creating IAsset instances.
+
+ <configuration-point id="AssetFactories">
+
+ Maps asset path prefixes to AssetFactory implementations.
+
+ <schema>
+ <element name="factory">
+ <attribute name="prefix" required="true" unique="true">
+ The prefix to map.
+ </attribute>
+ <attribute name="object" required="true" translator="object">
+ The asset factory for the prefix.
+ </attribute>
+
+ <conversion class="AssetFactoryContribution">
+ <map attribute="object" property="factory"/>
+ </conversion>
+ </element>
+ </schema>
+ </configuration-point>
+
+ <contribution configuration-id="AssetFactories">
+
+ <factory prefix="context" object="service:ContextAssetFactory"/>
+ <factory prefix="classpath" object="service:ClasspathAssetFactory"/>
+
+ </contribution>
+
+ <service-point id="DefaultAssetFactory" interface="AssetFactory">
+
+ AssetFactory used when the prefix on the path is not known.
+
+ <create-instance class="DefaultAssetFactory"/>
+
+ </service-point>
+
+ <service-point id="ContextAssetFactory" interface="AssetFactory">
+
+ AssetFactory used when the prefix is "context:" or the base
+ resource is a ContextResource.
+
+ <invoke-factory>
+ <construct class="ContextAssetFactory">
+ <set-object property="contextPath"
value="infrastructure:contextPath"/>
+ <set-service property="webContext"
service-id="tapestry.globals.WebContext"/>
+ <set-object property="localizer"
value="infrastructure:resourceLocalizer"/>
+ <set-object property="requestCycle"
value="infrastructure:requestCycle" />
+ </construct>
+ </invoke-factory>
+
+ </service-point>
+
+ <service-point id="ClasspathAssetFactory" interface="AssetFactory">
+
+ AssetFactory used when the prefix is "classpath:" or the
+ base resource is a ClasspathResource.
+
+ <invoke-factory>
+ <construct class="ClasspathAssetFactory">
+ <set-object property="assetService"
value="engine-service:asset"/>
+ </construct>
+ </invoke-factory>
+ </service-point>
+
+ <configuration-point id="AssetFactoryStrategies"
schema-id="hivemind.lib.StrategyRegistry"/>
+
+ <contribution configuration-id="AssetFactoryStrategies">
+ <strategy class="org.apache.hivemind.util.ContextResource"
object="service:ContextAssetFactory"/>
+
+ <strategy class="org.apache.tapestry.web.WebContextResource"
object="service:ContextAssetFactory"/>
+
+ <strategy class="org.apache.hivemind.util.ClasspathResource"
object="service:ClasspathAssetFactory"/>
+
+ <strategy class="ExternalResource"
object="service:DefaultAssetFactory"/>
+ </contribution>
+
+ <service-point id="LookupAssetFactory" interface="AssetFactory">
+
+ AssetFactory that delegates to another implementation based on
+ the type of resource. Used when the asset path does not contain
+ a prefix.
+
+ <invoke-factory service-id="hivemind.lib.StrategyFactory">
+ <construct configuration-id="AssetFactoryStrategies"/>
+ </invoke-factory>
+ </service-point>
+
+
+ <service-point id="AssetSource">
+
+ The master factory for assets, which identifies the correct
+ AssetFactory based on the prefix of the asset path (if any).
+
+ <invoke-factory>
+ <construct class="AssetSourceImpl">
+ <set-configuration property="contributions"
configuration-id="AssetFactories"/>
+ <set-service property="lookupAssetFactory"
service-id="LookupAssetFactory"/>
+ <set-service property="defaultAssetFactory"
service-id="DefaultAssetFactory"/>
+ <set-service property="contextAssetFactory"
service-id="ContextAssetFactory" />
+ <set-service property="classpathAssetFactory"
service-id="ClasspathAssetFactory" />
+ </construct>
+ </invoke-factory>
+ </service-point>
+
+
+ <service-point id="ResourceDigestSource">
+
+ Reads and caches Digest digests of files exposed by the AssetService.
+
+ <invoke-factory>
+ <construct class="ResourceDigestSourceImpl">
+ <event-listener service-id="tapestry.ResetEventHub"/>
+ <event-listener
service-id="tapestry.describe.ReportStatusHub"/>
+ </construct>
+ </invoke-factory>
+ </service-point>
+
+ <contribution configuration-id="tapestry.Infrastructure">
+ <property name="assetFactory" object="service:LookupAssetFactory"/>
+ </contribution>
+
+ <configuration-point id="UnprotectedAssets">
+
+ Maps asset path regexp patterns to assets that won't be required
+ to have md5sum digests, making them visible and accessible to
unauthenticated
+ url requests. Care should be taken contributing here. Most things
should remain
+ protected, like .class files, database configuration files, etc.
+
+ This configuration is mainly intended to help some resources that
require being
+ able to dynamically load content on the browser client-side. One such
resource
+ is the http://dojotoolkit.org javascript library, which loads
javascript/css/other
+ resources dynamically via XmlHttpRequests for resources that haven't
been previously
+ digested.
+
+ <schema>
+ <element name="unprotected-resource">
+ <attribute name="contains" required="true" unique="true">
+ The regexp pattern to match against.
+ </attribute>
+
+ <rules>
+ <push-attribute attribute="contains"/>
+ <invoke-parent method="addElement"/>
+ </rules>
+ </element>
+ </schema>
+ </configuration-point>
+
+ <contribution configuration-id="UnprotectedAssets">
+ List of unprotected asset regexps for ResourceMatcher service.
+
+ <unprotected-resource contains="^/tapestry/" />
+ <unprotected-resource contains="^/org/apache/tapestry/.*.css" />
+ <unprotected-resource contains="^/org/apache/tapestry/.*.gif" />
+ <unprotected-resource contains="^/org/apache/tapestry/.*.png" />
+ <unprotected-resource contains="^/org/apache/tapestry/.*.jpg" />
+ <unprotected-resource contains="^/org/apache/tapestry/.*.js" />
+ <unprotected-resource contains="^/org/apache/tapestry/.*.htm" />
+ <unprotected-resource contains="^/org/apache/tapestry/.*.html" />
+
+ <unprotected-resource contains="^/dojo.*/" />
+ </contribution>
+
+ <service-point id="UnprotectedResourceMatcher" interface="ResourceMatcher"
>
+
+ Uses the UnprotectedAssets configuration point to dynamically determine
+ which assets managed by the AssetService should be protected. The
default
+ is to protect all resources.
+
+ <invoke-factory>
+ <construct class="ResourceMatcherImpl">
+ <event-listener service-id="tapestry.ResetEventHub"/>
+ <set-configuration configuration-id="UnprotectedAssets"
property="contributions" />
+ </construct>
+ </invoke-factory>
+ </service-point>
+
</module>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/ScriptIncludes.jwc
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/ScriptIncludes.jwc?view=diff&rev=538050&r1=538049&r2=538050
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/ScriptIncludes.jwc
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/ScriptIncludes.jwc
Mon May 14 20:50:34 2007
@@ -112,8 +112,8 @@
<set name="parseWidgets" value="parseWidgets" />
</bean>
- <asset name="defaultDojoSource" path="classpath:/dojo/dojo.js" />
- <asset name="defaultDojoPath" path="classpath:/dojo/" />
+ <asset name="defaultDojoSource" path="classpath:/dojo-0.4.2/dojo.js" />
+ <asset name="defaultDojoPath" path="classpath:/dojo-0.4.2/" />
<asset name="defaultTapestrySource" path="classpath:/tapestry/core.js" />
<asset name="defaultTapestryPath" path="classpath:/tapestry/" />
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java?view=diff&rev=538050&r1=538049&r2=538050
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java
Mon May 14 20:50:34 2007
@@ -126,6 +126,8 @@
}
JSONObject cons =
profile.getJSONObject(ValidationConstants.CONSTRAINTS);
+ context.addInitializationScript(field,
"dojo.require(\"dojo.i18n.number\");");
+
DecimalFormat format = getDecimalFormat(context.getLocale());
String grouping = "";
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?view=diff&rev=538050&r1=538049&r2=538050
==============================================================================
---
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 May 14 20:50:34 2007
@@ -184,8 +184,8 @@
<set name="parseWidgets" value="parseWidgets" />
</bean>
- <asset name="defaultDojoSource" path="classpath:/dojo/dojo.js" />
- <asset name="defaultDojoPath" path="classpath:/dojo/" />
+ <asset name="defaultDojoSource" path="classpath:/dojo-0.4.2/dojo.js" />
+ <asset name="defaultDojoPath" path="classpath:/dojo-0.4.2/" />
<asset name="defaultTapestrySource" path="classpath:/tapestry/core.js" />
<asset name="defaultTapestryPath" path="classpath:/tapestry/" />
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_eventConnections.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_eventConnections.html?view=diff&rev=538050&r1=538049&r2=538050
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_eventConnections.html
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/test_eventConnections.html
Mon May 14 20:50:34 2007
@@ -14,7 +14,7 @@
parseWidgets: false
};
</script>
-<script type="text/javascript" src="../dojo/dojo.js"></script>
+<script type="text/javascript" src="../dojo-0.4.2/dojo.js"></script>
<script type="text/javascript" src="../tapestry/core.js"></script>
</head>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_AlertDialog.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_AlertDialog.html?view=diff&rev=538050&r1=538049&r2=538050
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_AlertDialog.html
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_AlertDialog.html
Mon May 14 20:50:34 2007
@@ -13,7 +13,7 @@
isDebug: true
};
</script>
-<script type="text/javascript" src="../../dojo/dojo.js"></script>
+<script type="text/javascript" src="../../dojo-0.4.2/dojo.js"></script>
<script type="text/javascript" src="../../tapestry/core.js"></script>
</head>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDatePicker.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDatePicker.html?view=diff&rev=538050&r1=538049&r2=538050
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDatePicker.html
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDatePicker.html
Mon May 14 20:50:34 2007
@@ -13,7 +13,7 @@
isDebug: true
};
</script>
-<script type="text/javascript" src="../../dojo/dojo.js"></script>
+<script type="text/javascript" src="../../dojo-0.4.2/dojo.js"></script>
<script type="text/javascript" src="../../tapestry/core.js"></script>
<style type="text/css">
body { font-family : sans-serif; }
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDateTimePicker.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDateTimePicker.html?view=diff&rev=538050&r1=538049&r2=538050
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDateTimePicker.html
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_DropDownDateTimePicker.html
Mon May 14 20:50:34 2007
@@ -13,7 +13,7 @@
isDebug: true
};
</script>
-<script type="text/javascript" src="../../dojo/dojo.js"></script>
+<script type="text/javascript" src="../../dojo-0.4.2/dojo.js"></script>
<script type="text/javascript" src="../../tapestry/core.js"></script>
<style type="text/css">
body { font-family : sans-serif; }
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TDebugConsole.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TDebugConsole.html?view=diff&rev=538050&r1=538049&r2=538050
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TDebugConsole.html
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TDebugConsole.html
Mon May 14 20:50:34 2007
@@ -13,7 +13,7 @@
isDebug: true
};
</script>
-<script type="text/javascript" src="../../dojo/dojo.js"></script>
+<script type="text/javascript" src="../../dojo-0.4.2/dojo.js"></script>
<script type="text/javascript" src="../../tapestry/core.js"></script>
</head>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TimePicker.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TimePicker.html?view=diff&rev=538050&r1=538049&r2=538050
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TimePicker.html
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/js/tests/widget/test_TimePicker.html
Mon May 14 20:50:34 2007
@@ -13,7 +13,7 @@
isDebug: true
};
</script>
-<script type="text/javascript" src="../../dojo/dojo.js"></script>
+<script type="text/javascript" src="../../dojo-0.4.2/dojo.js"></script>
<script type="text/javascript" src="../../tapestry/core.js"></script>
</head>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java?view=diff&rev=538050&r1=538049&r2=538050
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/ClasspathAssetFactoryTest.java
Mon May 14 20:50:34 2007
@@ -207,7 +207,7 @@
factory.setAssetService(assetService);
factory.setLocalizer(new DefaultResourceLocalizer());
- String path = "/dojo/dojo.js";
+ String path = "/dojo-0.4.2/dojo.js";
IAsset asset = factory.createAsset(shell, spec, path,
Locale.getDefault(),
@@ -236,7 +236,7 @@
factory.setAssetService(assetService);
factory.setLocalizer(new DefaultResourceLocalizer());
- String path = "/dojo/";
+ String path = "/dojo-0.4.2/";
IAsset asset = factory.createAsset(shell, spec, path,
Locale.getDefault(),
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java?view=diff&rev=538050&r1=538049&r2=538050
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/translator/TestNumberTranslator.java
Mon May 14 20:50:34 2007
@@ -240,6 +240,7 @@
FormComponentContributorContext context =
newMock(FormComponentContributorContext.class);
expect(context.getProfile()).andReturn(json);
+ context.addInitializationScript(field,
"dojo.require(\"dojo.i18n.number\");");
trainGetLocale(context, Locale.ENGLISH);
@@ -272,6 +273,7 @@
FormComponentContributorContext context =
newMock(FormComponentContributorContext.class);
expect(context.getProfile()).andReturn(json);
+ context.addInitializationScript(field,
"dojo.require(\"dojo.i18n.number\");");
trainGetLocale(context, Locale.US);
@@ -306,6 +308,7 @@
FormComponentContributorContext context =
newMock(FormComponentContributorContext.class);
expect(context.getProfile()).andReturn(json);
+ context.addInitializationScript(field,
"dojo.require(\"dojo.i18n.number\");");
trainGetLocale(context, Locale.ENGLISH);
@@ -343,6 +346,7 @@
FormComponentContributorContext context =
newMock(FormComponentContributorContext.class);
expect(context.getProfile()).andReturn(json);
+ context.addInitializationScript(field,
"dojo.require(\"dojo.i18n.number\");");
trainGetLocale(context, Locale.ENGLISH);
