Re: [MO-java-dev] [Patch] build.xml

[Jeff M. <je...@mk...>]

Committed. Thanks

On Mon, 2004-04-26 at 13:37, tk...@10... wrote:
> The sequence
> 
> <available property="jdk.version" value="1.2" classname="java.lang.ThreadLocal" />
> <available property="jdk.version" value="1.3" classname="java.lang.StrictMath" />
> <available property="jdk.version" value="1.4" classname="java.lang.CharSequence" 
> />
> 
> generates a message 
> "DEPRECATED - <available> used to override an existing property.". Replaced with a 
> sequence of <condition >-tasks.
> 
> 
> ______________________________________________________________________
> Index: build.xml
> ===================================================================
> RCS file: /cvsroot/mockobjects/mockobjects-java/build.xml,v
> retrieving revision 1.40
> diff -u -r1.40 build.xml
> --- build.xml	12 Aug 2003 12:16:12 -0000	1.40
> +++ build.xml	26 Apr 2004 12:27:03 -0000
> @@ -67,28 +67,47 @@
>        <pathelement location="${j2ee.lib}"/>
>      </path>
>  
> -    <available property="jdk.version" value="1.2" classname="java.lang.ThreadLocal" />
> -    <available property="jdk.version" value="1.3" classname="java.lang.StrictMath" />
> -    <available property="jdk.version" value="1.4" classname="java.lang.CharSequence" />
> -    <available property="j2ee.version" value="1.2"
> -               classpathref="lib.classpath"
> -               classname="javax.servlet.Servlet" />
> -    <available property="j2ee.version" value="1.3"
> -               classpathref="lib.classpath"
> -               classname="javax.servlet.Filter" />
> -    <available property="j2ee.version" value="1.4"
> -               classpathref="lib.classpath"
> -               classname="javax.servlet.jsp.ErrorData" />
> +    <condition property="jdk.version" value="1.4">
> +      <available classname="java.lang.CharSequence" />
> +    </condition>
> +    <condition property="jdk.version" value="1.3">
> +      <and>
> +        <not><isset property="jdk.version" /></not>
> +        <available classname="java.lang.StrictMath" />
> +      </and>
> +    </condition>
> +    <condition property="jdk.version" value="1.2">
> +      <and>
> +        <not><isset property="jdk.version" /></not>
> +        <available classname="java.lang.ThreadLocal" />
> +      </and>
> +    </condition>
> +    <condition property="j2ee.version" value="1.4">
> +      <available classpathref="lib.classpath" classname="javax.servlet.jsp.ErrorData" />
> +    </condition>
> +    <condition property="j2ee.version" value="1.3">
> +      <and>
> +        <not><isset property="j2ee.version" /></not>
> +        <available classpathref="lib.classpath" classname="javax.servlet.Filter" />
> +      </and>
> +    </condition>
> +    <condition property="j2ee.version" value="1.2">
> +      <and>
> +        <not><isset property="j2ee.version" /></not>
> +        <available classpathref="lib.classpath" classname="javax.servlet.Servlet" />
> +      </and>
> +    </condition>
>      <available property="httpclient" value="true"
>                 classpathref="lib.classpath"
>                 classname="org.apache.commons.httpclient.HttpClient" />
>  
> -    <property name="jar.j2ee.name" value="" />
> -
>      <available property="jar.j2ee.name"
>                 value="_j2ee${j2ee.version}"
>                 classpathref="lib.classpath"
>                 classname="javax.servlet.Servlet" />
> +    <condition property="jar.j2ee.name" value="">
> +        <not><isset property="jar.j2ee.name" /></not>
> +    </condition>
>    </target>
>  
>    <target name="call-me-first"
-- 
jeff martin
information technologist
mkodo limited
 
mobile: 44 (0) 78 5547 8331
phone: 44 (0) 20 2226 4545
email: je...@mk...
 
www.mkodo.com