-1
I would rather see a tool named "$link" instead. That tool would be more
consistent with what Turbine's LinkTool does as well as the fact that it
makes more sense than $escape...
-jon
on 6/3/02 3:20 AM, "[EMAIL PROTECTED]" <[EMAIL PROTECTED]> wrote:
> kaz 2002/06/03 03:20:28
>
> Modified: src/java/org/apache/maven BaseProjectTask.java
> src/templates/xdocs dependencies.xml mail-lists.xml
> project-info.xml
> Log:
> Need to escape some of the URLs that are generated so that they don't
> cause XML errors if they contain '&' in the query string. This fixes a
> problem pointed out by Bob. Thanks!
>
> Revision Changes Path
> 1.15 +3 -1
> jakarta-turbine-maven/src/java/org/apache/maven/BaseProjectTask.java
>
> Index: BaseProjectTask.java
> ===================================================================
> RCS file:
> /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/BaseProjectTask.java
> ,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -r1.14 -r1.15
> --- BaseProjectTask.java 1 Jun 2002 03:31:56 -0000 1.14
> +++ BaseProjectTask.java 3 Jun 2002 10:20:28 -0000 1.15
> @@ -68,6 +68,7 @@
> import org.apache.velocity.context.Context;
> import org.apache.velocity.VelocityContext;
> import org.apache.velocity.texen.ant.TexenTask;
> +import org.apache.velocity.anakia.Escape;
>
> import org.apache.maven.ant.ListTask;
>
> @@ -75,7 +76,7 @@
> * An ant task for creating an xml schema from an sql schema
> *
> * @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
> - * @version $Id: BaseProjectTask.java,v 1.14 2002/06/01 03:31:56 jvanzyl Exp
> $
> + * @version $Id: BaseProjectTask.java,v 1.15 2002/06/03 10:20:28 kaz Exp $
> */
> public class BaseProjectTask
> extends TexenTask
> @@ -144,6 +145,7 @@
> }
>
> context.put("callbacks", new HashMap());
> + context.put("escape", new Escape());
>
> return context;
> }
>
>
>
> 1.4 +1 -1
> jakarta-turbine-maven/src/templates/xdocs/dependencies.xml
>
> Index: dependencies.xml
> ===================================================================
> RCS file:
> /home/cvs/jakarta-turbine-maven/src/templates/xdocs/dependencies.xml,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -r1.3 -r1.4
> --- dependencies.xml 2 Jun 2002 14:09:46 -0000 1.3
> +++ dependencies.xml 3 Jun 2002 10:20:28 -0000 1.4
> @@ -27,7 +27,7 @@
> <tr>
> <td>
> #if ($dep.url && $dep.url.length() != 0)
> - <a href="$dep.url">$!dep.id</a>
> + <a href="$escape.getText($dep.url)">$!dep.id</a>
> #else
> $!dep.id
> #end
>
>
>
> 1.2 +1 -1 jakarta-turbine-maven/src/templates/xdocs/mail-lists.xml
>
> Index: mail-lists.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-turbine-maven/src/templates/xdocs/mail-lists.xml,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- mail-lists.xml 4 May 2002 01:50:11 -0000 1.1
> +++ mail-lists.xml 3 Jun 2002 10:20:28 -0000 1.2
> @@ -4,7 +4,7 @@
> <td>
> #if ($link && $link.length() != 0)
> #if ($link.startsWith("http"))
> - <a href="$link">$label</a>
> + <a href="$escape.getText($link)">$label</a>
> #else
> <a href="mailto:$link";>$label</a>
> #end
>
>
>
> 1.5 +2 -2
> jakarta-turbine-maven/src/templates/xdocs/project-info.xml
>
> Index: project-info.xml
> ===================================================================
> RCS file:
> /home/cvs/jakarta-turbine-maven/src/templates/xdocs/project-info.xml,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- project-info.xml 2 Jun 2002 18:08:43 -0000 1.4
> +++ project-info.xml 3 Jun 2002 10:20:28 -0000 1.5
> @@ -39,7 +39,7 @@
> </td>
> </tr>
> #if ($project.repository.url)
> - <tr><td><a href="$project.repository.url.toString().trim()">Source
> Repository</a></td>
> + <tr><td><a
> href="$escape.getText($project.repository.url.toString().trim())">Source
> Repository</a></td>
> <td>
> This is a link to the online source repository that can be
> viewed via a web browser.
> @@ -47,7 +47,7 @@
> </tr>
> #end
> #if ($project.issueTrackingUrl)
> - <tr><td><a href="$project.issueTrackingUrl.toString().trim()">Issue
> Tracking</a></td>
> + <tr><td><a
> href="$escape.getText($project.issueTrackingUrl.toString().trim())">Issue
> Tracking</a></td>
> <td>
> This is a link to the issue tracking system for this
> project. Issues (bugs, features, change requests) can be
>
>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
