You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by we...@apache.org on 2006/03/16 10:24:52 UTC
svn commit: r386295 - /webservices/wss4j/trunk/build.xml
Author: werner
Date: Thu Mar 16 01:24:52 2006
New Revision: 386295
URL: http://svn.apache.org/viewcvs?rev=386295&view=rev
Log:
Use the latest version of BC jar if using Java 5.0.
Modified:
webservices/wss4j/trunk/build.xml
Modified: webservices/wss4j/trunk/build.xml
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/build.xml?rev=386295&r1=386294&r2=386295&view=diff
==============================================================================
--- webservices/wss4j/trunk/build.xml (original)
+++ webservices/wss4j/trunk/build.xml Thu Mar 16 01:24:52 2006
@@ -76,6 +76,25 @@
<property name="build.junit.html" value="${build.doc.html}/junit"/>
+ <condition property="jdk13.present">
+ <equals arg1="${ant.java.version}" arg2="1.3"/>
+ </condition>
+
+ <condition property="jdk14.present">
+ <equals arg1="${ant.java.version}" arg2="1.4"/>
+ </condition>
+
+ <condition property="jdk15.present">
+ <equals arg1="${ant.java.version}" arg2="1.5"/>
+ </condition>
+
+ <condition property="merlin.ok">
+ <or>
+ <equals arg1="${ant.java.version}" arg2="1.4"/>
+ <equals arg1="${ant.java.version}" arg2="1.5"/>
+ </or>
+ </condition>
+
<!--
for the time being following path id uses the libs in the wss4j
@@ -85,9 +104,13 @@
the CLASSPATH includes all required packages (see above
-->
+
+
<path id="classpath.libraries" description="3rd party libs">
<fileset dir="${dir.libs}">
<include name="**/*.jar"/>
+ <exclude name="**/bcprov-jdk15-*.jar" unless="jdk15.present"/>
+ <exclude name="**/bcprov-jdk13-*.jar" if="jdk15.present" />
<!-- <pathelement path="${java.class.path}"/> -->
</fileset>
<fileset dir="${dir.endorsed.libs}">
@@ -242,25 +265,6 @@
<!-- check whether JUnit is available -->
<classpath refid="classpath.test"/>
</available>
-
- <condition property="jdk13.present">
- <equals arg1="${ant.java.version}" arg2="1.3"/>
- </condition>
-
- <condition property="jdk14.present">
- <equals arg1="${ant.java.version}" arg2="1.4"/>
- </condition>
-
- <condition property="jdk15.present">
- <equals arg1="${ant.java.version}" arg2="1.5"/>
- </condition>
-
- <condition property="merlin.ok">
- <or>
- <equals arg1="${ant.java.version}" arg2="1.4"/>
- <equals arg1="${ant.java.version}" arg2="1.5"/>
- </or>
- </condition>
<available property="bc.present" classname="org.bouncycastle.jce.provider.BouncyCastleProvider">
<!-- check whether BouncyCastle is available -->
---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org