velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Nathan Bubna" <nbu...@apache.org>
Subject Re: svn commit: r618746 - in /velocity/tools/trunk: build.properties build.xml src/main/java/org/apache/velocity/tools/generic/EscapeTool.java xdocs/generic.project.xml
Date Tue, 05 Feb 2008 18:59:48 GMT
On Feb 5, 2008 10:58 AM,  <nbubna@apache.org> wrote:
> Author: nbubna
> Date: Tue Feb  5 10:58:14 2008
> New Revision: 618746
>
> URL: http://svn.apache.org/viewvc?rev=618746&view=rev
> Log:
> DisplayTool was missing fromtpw veltools

argh!  that command was not supposed to be sent...

> Modified:
>     velocity/tools/trunk/build.properties
>     velocity/tools/trunk/build.xml
>     velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java
>     velocity/tools/trunk/xdocs/generic.project.xml
>
> Modified: velocity/tools/trunk/build.properties
> URL: http://svn.apache.org/viewvc/velocity/tools/trunk/build.properties?rev=618746&r1=618745&r2=618746&view=diff
> ==============================================================================
> --- velocity/tools/trunk/build.properties (original)
> +++ velocity/tools/trunk/build.properties Tue Feb  5 10:58:14 2008
> @@ -89,10 +89,12 @@
>  test.log.dir=${test.build.dir}/log
>
>  # Needs to be configured with system location of findbugs for findbugs task
> -findbugs.home=*unset*
> +findbugs.home=C:/java/sf.net/findbugs/1.2.1
> +#findbugs.home=*unset*
>
>  # Needs to be configured with system location of PMD for pmd task
> -pmd.home=*unset*
> +pmd.home=C:/java/sf.net/pmd/4.0
> +#pmd.home=*unset*
>
>  #test switches
>  test.haltonerror=true
>
> Modified: velocity/tools/trunk/build.xml
> URL: http://svn.apache.org/viewvc/velocity/tools/trunk/build.xml?rev=618746&r1=618745&r2=618746&view=diff
> ==============================================================================
> --- velocity/tools/trunk/build.xml (original)
> +++ velocity/tools/trunk/build.xml Tue Feb  5 10:58:14 2008
> @@ -325,7 +325,25 @@
>      </javadoc>
>    </target>
>
> -
> +  <!-- Build JDocs (for jdocs.com) -->
> +  <target name="jdocs" description="Builds JDocs for the whole project">
> +    <taskdef name="jdocs" classname="com.dzone.jdocs.ant.jdk15.task.Jdocs"/>
> +    <mkdir dir="${javadoc.dir}" />
> +    <jdocs packagenames="org.apache.velocity.tools.*"
> +             destdir="${docs.dir}/javadoc"
> +             author="true"
> +             private="true"
> +             version="true"
> +             doctitle="&lt;h1&gt;${javadoc.title}&lt;/h1&gt;"
> +             windowtitle="${javadoc.title}"
> +             bottom="Copyright (c) ${javadoc.year} Apache Software Foundation" >
> +
> +      <classpath refid="compile.classpath"/>
> +      <sourcepath>
> +        <pathelement path="${classes.src}" />
> +      </sourcepath>
> +    </jdocs>
> +  </target>
>
>    <!-- Build Velocity-Tools documentation -->
>    <target name="docs" depends="prepare.docs"
> @@ -641,9 +659,9 @@
>      * Call for a release vote on private@velocity.apache.org and dev@velocity.apache.org
>
>      * Once the release vote has passed, these files should all be copied to
> -        /x1/www/www.apache.org/dist/velocity/tools/${project.version}
> +        /www/www.apache.org/dist/velocity/tools/${project.version}
>        and the jars should be copied into
> -        /x1/www/people.apache.org/repo/m1-ibiblio-rsync-repository/velocity-tools/jars
> +        /www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/velocity/velocity-tools/${project.version}/
>
>      * Tag the release in SVN with a command such as:
>          svn copy -m "Release Tools ${project.version}" https://svn.apache.org/repos/asf/velocity/tools/trunk
\
>
> Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java
> URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java?rev=618746&r1=618745&r2=618746&view=diff
> ==============================================================================
> --- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java
(original)
> +++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/EscapeTool.java
Tue Feb  5 10:58:14 2008
> @@ -64,6 +64,11 @@
>   *  $esc.singleQuote             -> '
>   *  $esc.s                       -> '
>   *
> + *  $esc.newline                 ->
> + *
> + *  $esc.n                       ->
> + *
> + *
>   *  $esc.exclamation             -> !
>   *  $esc.e                       -> !
>   *
> @@ -407,6 +412,26 @@
>      public String getS()
>      {
>          return this.getSingleQuote();
> +    }
> +
> +    /**
> +     * Renders a new line character appropriate for the
> +     * operating system ("\n" in java).
> +     * @see #getN()
> +     */
> +    public String getNewline()
> +    {
> +        return "\n";
> +    }
> +
> +    /**
> +     * Renders a new line character appropriate for the
> +     * operating system ("\n" in java).
> +     * @see #getNewline()
> +     */
> +    public String getN()
> +    {
> +        return this.getNewline();
>      }
>
>      /**
>
> Modified: velocity/tools/trunk/xdocs/generic.project.xml
> URL: http://svn.apache.org/viewvc/velocity/tools/trunk/xdocs/generic.project.xml?rev=618746&r1=618745&r2=618746&view=diff
> ==============================================================================
> --- velocity/tools/trunk/xdocs/generic.project.xml (original)
> +++ velocity/tools/trunk/xdocs/generic.project.xml Tue Feb  5 10:58:14 2008
> @@ -31,6 +31,7 @@
>            <item name="ComparisonDateTool"   href="javadoc/org/apache/velocity/tools/generic/ComparisonDateTool.html"/>
>            <item name="ConversionTool"       href="javadoc/org/apache/velocity/tools/generic/ConversionTool.html"/>
>            <item name="DateTool"             href="javadoc/org/apache/velocity/tools/generic/DateTool.html"/>
> +          <item name="DisplayTool"          href="javadoc/org/apache/velocity/tools/generic/DisplayTool.html"/>
>            <item name="EscapeTool"           href="javadoc/org/apache/velocity/tools/generic/EscapeTool.html"/>
>            <item name="FieldTool"            href="javadoc/org/apache/velocity/tools/generic/FieldTool.html"/>
>            <item name="ListTool"             href="javadoc/org/apache/velocity/tools/generic/ListTool.html"/>
>
>
>

Mime
View raw message