You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/12/16 23:06:13 UTC
svn commit: r487906 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
java/org/apache/tapestry/html/HTMLStrings.properties
java/org/apache/tapestry/html/Script.java
test/org/apache/tapestry/html/ScriptTest.java
Author: jkuhnert
Date: Sat Dec 16 14:06:12 2006
New Revision: 487906
URL: http://svn.apache.org/viewvc?view=rev&rev=487906
Log:
Fixes TAPESTRY-1191. Component was referencing old "scriptPath" parameter name instead of "script" .
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/HTMLStrings.properties
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Script.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/ScriptTest.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/HTMLStrings.properties
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/HTMLStrings.properties?view=diff&rev=487906&r1=487905&r2=487906
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/HTMLStrings.properties (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/HTMLStrings.properties Sat Dec 16 14:06:12 2006
@@ -13,7 +13,7 @@
# limitations under the License.
text-conversion-error=Error converting text to lines (for InsertText component): {0}
-script-multiscript-error=Script component has both script IAsset parameter({0}) AND String scriptPath parameter({1}) set, \
+script-multiscript-error=Script component has both script IAsset parameter({0}) AND String IAsset parameter({1}) set, \
only one of the two parameters is allowed.
script-required-path-error=Either the scriptAsset or the scriptPath parameter must be supplied, neither parameter \
was set.
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Script.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Script.java?view=diff&rev=487906&r1=487905&r2=487906
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Script.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Script.java Sat Dec 16 14:06:12 2006
@@ -109,7 +109,7 @@
if (scriptAsset != null && scriptPath != null)
throw new ApplicationRuntimeException(HTMLMessages
.multiAssetParameterError(getBinding("scriptAsset"),
- getBinding("scriptPath")));
+ getBinding("script")));
if (scriptPath == null && scriptAsset == null)
throw new ApplicationRuntimeException(HTMLMessages
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/ScriptTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/ScriptTest.java?view=diff&rev=487906&r1=487905&r2=487906
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/ScriptTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/ScriptTest.java Sat Dec 16 14:06:12 2006
@@ -103,8 +103,6 @@
trainResponseBuilder(cycle, writer);
body.render(writer, cycle);
-
- //trainResponseBuilder(cycle, writer);
replay();
@@ -220,8 +218,6 @@
IRender body = newRender();
body.render(writer, cycle);
-
- //trainResponseBuilder(cycle, writer);
replay();
@@ -268,7 +264,7 @@
verify();
}
- public void test_IAsset_ParamRender()
+ public void test_IAsset_Param_Render()
{
IScriptSource source = newScriptSource();
IScript script = newScript();