Re: svn commit: r687454 - /db/jdo/trunk/tck2/maven.xml

[Craig L Russell <Cr...@Sun.COM>]

Oops, the comment should read:

> +            <echo>The top-level directory name must terminate in  
> "jdo".</echo>
> +            <echo>Please rename your directory to "jdo" or  
> "XXXjdo".</echo>
> +            <echo>Otherwise the dist directory will be incorrectly  
> named.</echo>

Craig
On Aug 20, 2008, at 1:44 PM, mcaisse@apache.org wrote:

> Author: mcaisse
> Date: Wed Aug 20 13:44:59 2008
> New Revision: 687454
>
> URL: http://svn.apache.org/viewvc?rev=687454&view=rev
> Log:
> JDO-603 Catch bad directory name and report problem.
>
> Modified:
>    db/jdo/trunk/tck2/maven.xml
>
> Modified: db/jdo/trunk/tck2/maven.xml
> URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/maven.xml?rev=687454&r1=687453&r2=687454&view=diff
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- db/jdo/trunk/tck2/maven.xml (original)
> +++ db/jdo/trunk/tck2/maven.xml Wed Aug 20 13:44:59 2008
> @@ -123,6 +123,8 @@
>         <j:set var="nullval" value=""/>
>         <j:set var="true" value="true"/>
>         <j:set var="false" value="false"/>
> +        <j:set var="slashval" value="/"/>
> +        <j:set var="backslashval" value="\"/>
>
>         <j:set var="cfglist" value="${jdo.tck.cfglist}"/>
>         <j:if test="${cfglist == null}">
> @@ -829,7 +831,16 @@
>
>     <goal name="dist">
>         <!-- Just do a source distribution for tck20. -->
> -        <attainGoal name="dist:build-src"/>
> +        <j:if test="${basedir.lastIndexOf('jdo') ==  
> basedir.lastIndexOf('jdo\')
> +                 || basedir.lastIndexOf('jdo') ==  
> basedir.lastIndexOf('jdo/')
> +            }">
> +            <attainGoal name="dist:build-src"/>
> +        </j:if>
> +        <j:else>
> +            <echo>The top-level directory name must terminate in  
> "jdo".</echo>
> +            <echo>Please rename your directory to "jdo" or  
> "jdoXXX".</echo>
> +            <echo>Otherwise the dist directory will be incorrectly  
> named.</echo>
> +        </j:else>
>     </goal>
>
>     <preGoal name="dist:build-src">
>
>

Craig L Russell
Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
408 276-5638 mailto:Craig.Russell@sun.com
P.S. A good JDO? O, Gasp!