Removed dependence on Jakarta regexp library.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@1202 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
@@ -77,10 +77,6 @@
|
|||||||
classpathref="classpath"/>
|
classpathref="classpath"/>
|
||||||
<echo message="Commons Digester: ${jakarta.commons-digester.present}"/>
|
<echo message="Commons Digester: ${jakarta.commons-digester.present}"/>
|
||||||
|
|
||||||
<available property="jakarta.regexp.present"
|
|
||||||
classname="org.apache.regexp.RE" classpathref="classpath"/>
|
|
||||||
<echo message="Regexp: ${jakarta.regexp.present}"/>
|
|
||||||
|
|
||||||
<available property="jakarta.velocity.present"
|
<available property="jakarta.velocity.present"
|
||||||
classname="org.apache.velocity.Template" classpathref="classpath"/>
|
classname="org.apache.velocity.Template" classpathref="classpath"/>
|
||||||
<echo message="Velocity: ${jakarta.velocity.present}"/>
|
<echo message="Velocity: ${jakarta.velocity.present}"/>
|
||||||
@@ -118,19 +114,15 @@
|
|||||||
<!--<echo message="com.samskivert.jdbc: ${build.jdbc}"/>-->
|
<!--<echo message="com.samskivert.jdbc: ${build.jdbc}"/>-->
|
||||||
|
|
||||||
<condition property="build.net">
|
<condition property="build.net">
|
||||||
<and>
|
<isset property="build.io"/>
|
||||||
<isset property="build.io"/>
|
|
||||||
<isset property="jakarta.regexp.present"/>
|
|
||||||
</and>
|
|
||||||
</condition>
|
</condition>
|
||||||
<echo message="com.samskivert.net: ${build.net}"/>
|
<!--<echo message="com.samskivert.net: ${build.net}"/>-->
|
||||||
|
|
||||||
<condition property="build.servlet">
|
<condition property="build.servlet">
|
||||||
<and>
|
<and>
|
||||||
<isset property="build.io"/>
|
<isset property="build.io"/>
|
||||||
<isset property="build.jdbc"/>
|
<isset property="build.jdbc"/>
|
||||||
<isset property="build.util"/>
|
<isset property="build.util"/>
|
||||||
<isset property="jakarta.regexp.present"/>
|
|
||||||
<isset property="servlet2.2.present"/>
|
<isset property="servlet2.2.present"/>
|
||||||
</and>
|
</and>
|
||||||
</condition>
|
</condition>
|
||||||
|
|||||||
Reference in New Issue
Block a user