More brian patches
git-svn-id: https://svn.apache.org/repos/asf/jakarta/tapestry/branches/branch-3-0@387670 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/doc/src/UsersGuide/template.xml b/doc/src/UsersGuide/template.xml
index 69d32a5..114c582 100644
--- a/doc/src/UsersGuide/template.xml
+++ b/doc/src/UsersGuide/template.xml
@@ -553,7 +553,7 @@
filtered, so that any reserved
HTML characters in a message string are expanded to HTML entities. For example,
a <literal><</literal> will be expanded to <literal>&lt;</literal>. If this is not desired,
-add <literal>raw="yes"</literal> to the &span;. This defeats the filtering, and text in the message
+add <literal>raw="true"</literal> to the &span;. This defeats the filtering, and text in the message
is passed through as-is.
</para>
diff --git a/framework/src/org/apache/tapestry/engine/ExternalService.java b/framework/src/org/apache/tapestry/engine/ExternalService.java
index 127dd45..9e0790f 100644
--- a/framework/src/org/apache/tapestry/engine/ExternalService.java
+++ b/framework/src/org/apache/tapestry/engine/ExternalService.java
@@ -110,6 +110,20 @@
public class ExternalService extends AbstractService
{
+ /**
+ * Builds a URL for a service. This is performed during the
+ * rendering phase of one request cycle and bulds URLs that will
+ * invoke activity in a subsequent request cycle.
+ *
+ * @param cycle Defines the request cycle being processed.
+ * @param component The component requesting the URL. Generally, the
+ * service context is established from the component.
+ * @param parameters Additional parameters specific to the
+ * component requesting the EngineServiceLink.
+ * @return The URL for the service. The URL always be encoded when it is returned.
+ *
+ **/
+
public ILink getLink(IRequestCycle cycle, IComponent component, Object[] parameters)
{
if (parameters == null || parameters.length == 0)
diff --git a/framework/src/org/apache/tapestry/valid/ValidationStrings_fi.properties b/framework/src/org/apache/tapestry/valid/ValidationStrings_fi.properties
new file mode 100644
index 0000000..e40e8cc
--- /dev/null
+++ b/framework/src/org/apache/tapestry/valid/ValidationStrings_fi.properties
@@ -0,0 +1,24 @@
+# $Id$
+
+field-is-required=Anna syöte kenttään: {0}.
+field-too-short=Kentän {1} arvon minimipituus on {0} merkkiä.
+
+invalid-date-format=Kentän {0} päivämäärä on väärää muotoa. Muoto on {1}.
+invalid-int-format=Kentän {0} arvon pitää olla kokonaisluku.
+invalid-format=Kentän {0} syöte on väärää muotoa.
+invalid-numeric-format=Kentän {0} arvon pitää olla luku.
+
+date-too-early=Kentän {0} päivämäärä ei saa olla ennen {1}.
+date-too-late=Kentän {0} päivämäärä ei saa olla jälkeen {1}.
+
+number-too-small=Kentän {0} arvo ei saa olla pienempi {1}.
+number-too-large=Kentän {0} arvo ei saa olla suurempi kuin {1}.
+
+number-range=Kentän {0} arvon tulee olla välillä {1}-{2}.
+
+invalid-email-format=Sähköpostiosoite kentässä {0} on väärää muotoa. Muoto on tunnus@kone.fi.
+
+pattern-not-matched=Kentän {0} arvo ei ole vaaditussa muodossa {1}.
+
+invalid-url-format = URL on väärää muotoa.
+disallowed-protocol = Protokolla ei kelpaa - protokollan pitää olla {0}.
diff --git a/status.xml b/status.xml
index d075a5f..de967a9 100644
--- a/status.xml
+++ b/status.xml
@@ -151,6 +151,12 @@
<action type="update" dev="JK" fixes-bug="TAPESTRY-310" due-to="Joni Suoinen" >
Add finnish validation strings
</action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-646" due-to="Brian K. Wallace" >
+ Modified text raw="yes" to raw="true" for user guide Insert component documentation.
+ </action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-422" due-to="Brian K. Wallace" >
+ Patches to Javadoc to explicitly state that URLs returned from ExternalService will already be encoded.
+ </action>
</release>
<release version="3.0.3" date="Mar 26 2005">
<action type="fix" dev="PF" fixes-bug="TAPESTRY-278"> Fixes security flaw in asset service. </action>
