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/08/04 22:04:53 UTC
svn commit: r428863 - in /tapestry/tapestry4/trunk: ./ .settings/
tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/
tapestry-examples/TimeTracker/src/context/WEB-INF/
tapestry-framework/src/descriptor/META-INF/ tapestry-framework/src/java/...
Author: jkuhnert
Date: Fri Aug 4 13:04:52 2006
New Revision: 428863
URL: http://svn.apache.org/viewvc?rev=428863&view=rev
Log:
Removed more marked for death 4.1 interface methods. Updated remaining straggling script executors to help
fix body script output related to TAPESTRY-1037. Added new XmlMarkupFilter (generously donated from Tacos project via Leonardo ) to handle
xml based XHR responses.
Added:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/XmlMarkupFilter.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/text/XmlCharacterTranslator.java
Removed:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/html/BodyTest.java
Modified:
tapestry/tapestry4/trunk/.settings/org.eclipse.jdt.core.prefs
tapestry/tapestry4/trunk/pom.xml
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.java
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/TestScript.script
tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.markup.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/FloatingPane.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/TitlePane.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/DatePicker.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormComponentContributorContextImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LinkSubmit.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/TranslatorBindingFactory.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Body.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ComponentEventConnectionWorker.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/ILibrarySpecification.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/LibrarySpecification.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/BaseValidator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/BindingTestCase.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/script/TestScript.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/spec/TestComponentSpecification.java
Modified: tapestry/tapestry4/trunk/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/.settings/org.eclipse.jdt.core.prefs?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ tapestry/tapestry4/trunk/.settings/org.eclipse.jdt.core.prefs Fri Aug 4 13:04:52 2006
@@ -1,4 +1,4 @@
-#Sun Jul 09 09:30:52 EDT 2006
+#Fri Aug 04 11:43:45 EDT 2006
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -19,8 +19,8 @@
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=enabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=error
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Fri Aug 4 13:04:52 2006
@@ -175,7 +175,7 @@
<dependency>
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-test</artifactId>
- <version>4.1</version>
+ <version>4.1.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.java (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/palette/Palette.java Fri Aug 4 13:04:52 2006
@@ -353,7 +353,7 @@
_symbols.put("palette", this);
- getScript().execute(cycle, pageRenderSupport, _symbols);
+ getScript().execute(this, cycle, pageRenderSupport, _symbols);
}
/**
Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/TestScript.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/TestScript.script?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/TestScript.script (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/WEB-INF/TestScript.script Fri Aug 4 13:04:52 2006
@@ -3,7 +3,10 @@
"-//Apache Software Foundation//Tapestry Script Specification 3.0//EN"
"http://jakarta.apache.org/tapestry/dtd/Script_3_0.dtd">
<script>
+ <body>
+ dojo.log.info("This is body content being executed.");
+ </body>
<initialization>
alert("I'm a script, I work..\nHooray!");
</initialization>
-</script>
\ No newline at end of file
+</script>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.markup.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.markup.xml?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.markup.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.markup.xml Fri Aug 4 13:04:52 2006
@@ -49,7 +49,10 @@
<contribution configuration-id="MarkupFilters">
<content type="text/html" filter="instance:AsciiMarkupFilter"/>
- <content type="text/html;charset=utf-8" filter="instance:UTFMarkupFilter"/>
+ <content type="text/html;charset=utf-8" filter="instance:UTFMarkupFilter"/>
+ <content type="text/plain" filter="instance:AsciiMarkupFilter"/>
+ <content type="text/xml;charset=utf-8" filter="instance:UTFMarkupFilter"/>
+ <content type="text/xml" filter="instance:XmlMarkupFilter"/>
<content type="text/vnd.wap.wml" filter="instance:org.apache.tapestry.wml.WMLMarkupFilter"/>
</contribution>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownDatePicker.java Fri Aug 4 13:04:52 2006
@@ -88,7 +88,7 @@
parms.put("clientId", getClientId());
parms.put("props", json.toString());
- getScript().execute(cycle, TapestryUtils.getPageRenderSupport(cycle, this), parms);
+ getScript().execute(this, cycle, TapestryUtils.getPageRenderSupport(cycle, this), parms);
}
/**
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/form/DropdownTimePicker.java Fri Aug 4 13:04:52 2006
@@ -90,7 +90,7 @@
parms.put("clientId", getClientId());
parms.put("props", json.toString());
- getScript().execute(cycle, TapestryUtils.getPageRenderSupport(cycle, this), parms);
+ getScript().execute(this, cycle, TapestryUtils.getPageRenderSupport(cycle, this), parms);
}
/**
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/FloatingPane.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/FloatingPane.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/FloatingPane.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/FloatingPane.java Fri Aug 4 13:04:52 2006
@@ -115,6 +115,7 @@
scriptParms.put("id", getIdParameter());
scriptParms.put("props", obj.toString());
PageRenderSupport pageRenderSupport = TapestryUtils.getPageRenderSupport(cycle, this);
- getScript().execute(cycle, pageRenderSupport, scriptParms);
+
+ getScript().execute(this, cycle, pageRenderSupport, scriptParms);
}
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/TitlePane.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/TitlePane.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/TitlePane.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/TitlePane.java Fri Aug 4 13:04:52 2006
@@ -76,7 +76,9 @@
Map scriptParms = new HashMap();
scriptParms.put("id", getIdParameter());
scriptParms.put("props", obj.toString());
+
PageRenderSupport pageRenderSupport = TapestryUtils.getPageRenderSupport(cycle, this);
- getScript().execute(cycle, pageRenderSupport, scriptParms);
+
+ getScript().execute(this, cycle, pageRenderSupport, scriptParms);
}
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/DatePicker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/DatePicker.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/DatePicker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/DatePicker.java Fri Aug 4 13:04:52 2006
@@ -126,7 +126,7 @@
symbols.put(SYM_FORMNAME, getForm().getName());
symbols.put(SYM_VALUE, getValue());
- getScript().execute(cycle, pageRenderSupport, symbols);
+ getScript().execute(this, cycle, pageRenderSupport, symbols);
renderDelegatePrefix(writer, cycle);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormComponentContributorContextImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormComponentContributorContextImpl.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormComponentContributorContextImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormComponentContributorContextImpl.java Fri Aug 4 13:04:52 2006
@@ -77,13 +77,13 @@
public void includeClasspathScript(String path)
{
Resource resource = new ClasspathResource(_resolver, path);
-
- _pageRenderSupport.addExternalScript(resource);
+
+ _pageRenderSupport.addExternalScript(_form, resource);
}
public void addSubmitHandler(String submitListener)
{
- _pageRenderSupport.addInitializationScript("Tapestry.onsubmit('" + _formId + "', "
+ _pageRenderSupport.addInitializationScript(_form, "Tapestry.onsubmit('" + _formId + "', "
+ submitListener + ");");
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java Fri Aug 4 13:04:52 2006
@@ -361,7 +361,7 @@
// TODO: If PRS is null ...
- _pageRenderSupport.addInitializationScript(buffer.toString());
+ _pageRenderSupport.addInitializationScript(_form, buffer.toString());
}
/**
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LinkSubmit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LinkSubmit.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LinkSubmit.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/LinkSubmit.java Fri Aug 4 13:04:52 2006
@@ -75,7 +75,7 @@
symbols.put("form", form);
symbols.put("name", name);
- getScript().execute(cycle, pageRenderSupport, symbols);
+ getScript().execute(this, cycle, pageRenderSupport, symbols);
writer.begin("a");
writer.attribute("href", (String) symbols.get("href"));
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/TranslatorBindingFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/TranslatorBindingFactory.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/TranslatorBindingFactory.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/form/translator/TranslatorBindingFactory.java Fri Aug 4 13:04:52 2006
@@ -28,8 +28,6 @@
*
* @author Howard Lewis Ship
* @since 4.0
- * @deprecated Support for the translator: will be removed in release 4.1, along with
- * {@link org.apache.tapestry.valid.ValidField}.
*/
public class TranslatorBindingFactory extends AbstractBindingFactory
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Body.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Body.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Body.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Body.java Fri Aug 4 13:04:52 2006
@@ -124,24 +124,6 @@
{
_pageRenderSupport.addExternalScript(target, scriptLocation);
}
-
- /**
- * Retrieves the <code>Body</code> that was stored into the request cycle. This allows
- * components wrapped by the <code>Body</code> to locate it and access the services it
- * provides.
- *
- * @param cycle Request cycle in which the Body was stored
- * @return Body wrapping the components for the specified request cycle
- *
- * @deprecated To be removed in 4.1. Use
- * {@link org.apache.tapestry.TapestryUtils#getOptionalPageRenderSupport(IRequestCycle)}
- * instead.
- */
-
- public static Body get(IRequestCycle cycle)
- {
- return (Body) TapestryUtils.getOptionalPageRenderSupport(cycle);
- }
protected void prepareForRender(IRequestCycle cycle)
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/html/Rollover.java Fri Aug 4 13:04:52 2006
@@ -142,7 +142,7 @@
symbols.put("mouseOverImageURL", preloadedMouseOverImageURL);
symbols.put("mouseOutImageURL", preloadedMouseOutImageURL);
- getScript().execute(cycle, pageRenderSupport, symbols);
+ getScript().execute(this, cycle, pageRenderSupport, symbols);
// Add attributes to the link to control mouse over/out.
// Because the script is written before the <body> tag,
Added: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/XmlMarkupFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/XmlMarkupFilter.java?rev=428863&view=auto
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/XmlMarkupFilter.java (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/markup/XmlMarkupFilter.java Fri Aug 4 13:04:52 2006
@@ -0,0 +1,34 @@
+// Copyright Aug 4, 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package org.apache.tapestry.markup;
+
+import org.apache.tapestry.util.text.ICharacterTranslator;
+import org.apache.tapestry.util.text.XmlCharacterTranslator;
+
+
+/**
+ * MarkupFilter for Xml content.
+ *
+ * @author lquijano
+ */
+public class XmlMarkupFilter extends AbstractMarkupFilter
+{
+
+ private static ICharacterTranslator _translator = new XmlCharacterTranslator();
+
+ public XmlMarkupFilter()
+ {
+ super(_translator);
+ }
+}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ComponentEventConnectionWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ComponentEventConnectionWorker.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ComponentEventConnectionWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/ComponentEventConnectionWorker.java Fri Aug 4 13:04:52 2006
@@ -121,7 +121,7 @@
PageRenderSupport prs = TapestryUtils.getPageRenderSupport(cycle, component);
Resource resource = getScript(component);
- _scriptSource.getScript(resource).execute(cycle, prs, parms);
+ _scriptSource.getScript(resource).execute(component, cycle, prs, parms);
}
/**
@@ -155,7 +155,7 @@
parms.put("events", prop.getEvents());
parms.put("formEvents", filterFormEvents(prop, parms, cycle));
- _scriptSource.getScript(resource).execute(cycle, prs, parms);
+ _scriptSource.getScript(resource).execute(component, cycle, prs, parms);
parms.clear();
}
@@ -199,7 +199,7 @@
PageRenderSupport prs = TapestryUtils.getPageRenderSupport(cycle, component);
Resource resource = getScript(component);
- _scriptSource.getScript(resource).execute(cycle, prs, scriptParms);
+ _scriptSource.getScript(resource).execute(form, cycle, prs, scriptParms);
}
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/ILibrarySpecification.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/ILibrarySpecification.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/ILibrarySpecification.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/ILibrarySpecification.java Fri Aug 4 13:04:52 2006
@@ -81,30 +81,6 @@
List getComponentTypes();
/**
- * @throws UnsupportedOperationException
- * always
- * @deprecated to be removed in release 4.1
- */
-
- String getServiceClassName(String name);
-
- /**
- * Returns a sorted list of service names (or an empty list, but not null).
- *
- * @returns an empty list (as of release 4.0)
- * @deprecated to be removed in release 4.1
- */
-
- List getServiceNames();
-
- /**
- * @deprecated To be removed in release 4.1.
- * @throws UnsupportedOperationException
- * always
- */
- void setServiceClassName(String name, String className);
-
- /**
* Returns the documentation for this library..
*/
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/LibrarySpecification.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/LibrarySpecification.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/LibrarySpecification.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/LibrarySpecification.java Fri Aug 4 13:04:52 2006
@@ -160,21 +160,6 @@
return sortedKeys(_components);
}
- public String getServiceClassName(String name)
- {
- throw new UnsupportedOperationException();
- }
-
- public List getServiceNames()
- {
- return Collections.EMPTY_LIST;
- }
-
- public void setServiceClassName(String name, String className)
- {
- throw new UnsupportedOperationException();
- }
-
private List sortedKeys(Map map)
{
if (map == null) return Collections.EMPTY_LIST;
Added: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/text/XmlCharacterTranslator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/text/XmlCharacterTranslator.java?rev=428863&view=auto
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/text/XmlCharacterTranslator.java (added)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/text/XmlCharacterTranslator.java Fri Aug 4 13:04:52 2006
@@ -0,0 +1,50 @@
+// Copyright Aug 4, 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package org.apache.tapestry.util.text;
+
+
+/**
+ * Handles escaping of special characters as per the XML spec section 2.2.
+ *
+ * @author lquijano
+ */
+public final class XmlCharacterTranslator extends MarkupCharacterTranslator {
+
+ /** Default constructor. */
+ public XmlCharacterTranslator() {
+ super(true);
+ }
+
+ /**
+ * Translates the character.
+ *
+ * <p>
+ * XML spec section 2.2
+ * Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] |
+ * [#xE000-#xFFFD] |
+ * [#x10000-#x10FFFF]
+ * any Unicode character, excluding the surrogate blocks, FFFE, and FFFF.
+ * </p>
+ */
+ public String translate(char ch) {
+ if (ch == 0x09 || ch == 0x0a || ch == 0x0d
+ || (ch >= 0x20 && ch <= 0xd7ff)
+ || (ch >= 0xe000 && ch <= 0xfffd)
+ || (ch >= 0x10000 && ch <= 0x10ffff)) {
+ return super.translate(ch);
+ }
+
+ return "";
+ }
+}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/BaseValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/BaseValidator.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/BaseValidator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/valid/BaseValidator.java Fri Aug 4 13:04:52 2006
@@ -296,7 +296,7 @@
PageRenderSupport pageRenderSupport = TapestryUtils.getPageRenderSupport(cycle, field);
- script.execute(cycle, pageRenderSupport, finalSymbols);
+ script.execute(field, cycle, pageRenderSupport, finalSymbols);
}
/**
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/BindingTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/BindingTestCase.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/BindingTestCase.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/binding/BindingTestCase.java Fri Aug 4 13:04:52 2006
@@ -42,4 +42,4 @@
return newMock(ValueConverter.class);
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestTypeConverterWrapper.java Fri Aug 4 13:04:52 2006
@@ -86,4 +86,4 @@
assertNull(w.convertValue(null));
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java Fri Aug 4 13:04:52 2006
@@ -310,7 +310,7 @@
writer.attribute("id", "myform");
- support.addInitializationScript("Tapestry.onsubmit('myform', function (event)"
+ support.addInitializationScript(form, "Tapestry.onsubmit('myform', function (event)"
+ "\n{\n mySubmit1();\n mySubmit2();\n mySubmit3();\n});\n");
render.render(writer, cycle);
@@ -753,7 +753,7 @@
writer.attribute("id", "myform");
- support.addInitializationScript("Tapestry.onreset('myform', function (event)"
+ support.addInitializationScript(form, "Tapestry.onreset('myform', function (event)"
+ "\n{\n myReset1();\n myReset2();\n});\n");
render.render(writer, cycle);
@@ -1358,7 +1358,7 @@
}
});
- support.addInitializationScript("Tapestry.onsubmit('myform', function (event)"
+ support.addInitializationScript(form, "Tapestry.onsubmit('myform', function (event)"
+ "\n{\n mySubmit();\n});\n");
render.render(writer, cycle);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/TestFormComponentContributorContext.java Fri Aug 4 13:04:52 2006
@@ -88,7 +88,7 @@
Resource expected = new ClasspathResource(resolver, "/foo.js");
- prs.addExternalScript(expected);
+ prs.addExternalScript(form, expected);
trainGetAttribute(cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
@@ -116,7 +116,7 @@
PageRenderSupport prs = newSupport();
- prs.addInitializationScript("Tapestry.onsubmit('myform', foo);");
+ prs.addInitializationScript(form, "Tapestry.onsubmit('myform', foo);");
trainGetAttribute(cycle, TapestryUtils.PAGE_RENDER_SUPPORT_ATTRIBUTE, prs);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/script/TestScript.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/script/TestScript.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/script/TestScript.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/script/TestScript.java Fri Aug 4 13:04:52 2006
@@ -335,4 +335,4 @@
createExpressionEvaluator(), null, null);
assertEquals("ScriptSession[" + script.getScriptResource() + "]", session.toString());
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/PersistentPropertyDataEncoderTest.java Fri Aug 4 13:04:52 2006
@@ -227,12 +227,12 @@
assertEquals("fred", PropertyUtils.read(instance2, "name"));
assertEquals("flintstone", PropertyUtils.read(instance2, "value"));
}
+
private ClassResolver newClassResolver(File jarFile) throws Exception
{
- URLClassLoader classLoader = new URLClassLoader(new URL[]
- { jarFile.toURL() });
+ URLClassLoader classLoader = new URLClassLoader(new URL[] { jarFile.toURI().toURL() });
return new DefaultClassResolver(classLoader);
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/ComponentEventConnectionWorkerTest.java Fri Aug 4 13:04:52 2006
@@ -113,7 +113,7 @@
expect(scriptSource.getScript(compScriptResource)).andReturn(script);
- script.execute(eq(cycle), eq(prs), isA(Map.class));
+ script.execute(eq(component), eq(cycle), eq(prs), isA(Map.class));
replay();
@@ -146,7 +146,7 @@
expect(scriptSource.getScript(widScriptResource)).andReturn(script);
- script.execute(eq(cycle), eq(prs), isA(Map.class));
+ script.execute(eq(widget), eq(cycle), eq(prs), isA(Map.class));
replay();
@@ -323,7 +323,7 @@
expect(scriptSource.getScript(compScriptResource)).andReturn(script);
- script.execute(eq(cycle), eq(prs), isA(Map.class));
+ script.execute(eq(form), eq(cycle), eq(prs), isA(Map.class));
replay();
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/spec/TestComponentSpecification.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/spec/TestComponentSpecification.java?rev=428863&r1=428862&r2=428863&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/spec/TestComponentSpecification.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/spec/TestComponentSpecification.java Fri Aug 4 13:04:52 2006
@@ -14,9 +14,13 @@
package org.apache.tapestry.spec;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertTrue;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -29,7 +33,7 @@
* @since 4.0
*/
@Test
-public class TestComponentSpecification extends HiveMindTestCase
+public class TestComponentSpecification extends BaseComponentTestCase
{
public void testClaimPropertyOK()
{
@@ -217,7 +221,6 @@
cs.addParameter(ps);
- assertListsEqual(new Object[]
- { ps }, cs.getRequiredParameters().toArray());
+ assertListEquals(new Object[] { ps }, cs.getRequiredParameters().toArray());
}
}