From 1c8f74adc43334de3298e19db9eafe10a9014639 Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Thu, 08 Dec 2011 13:16:45 +0000
Subject: [PATCH] Remove references to activation.jar in staf tests
---
opendj-sdk/opends/tests/staf-tests/shared/ant/staf.xml | 2 +-
opendj-sdk/opends/tests/staf-tests/build | 2 +-
opendj-sdk/opends/tests/staf-tests/build.bat | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/build b/opendj-sdk/opends/tests/staf-tests/build
index 2b99c8d..ead23cc 100755
--- a/opendj-sdk/opends/tests/staf-tests/build
+++ b/opendj-sdk/opends/tests/staf-tests/build
@@ -45,7 +45,7 @@
fi
OPENDS_LIB=`cd ../../lib;pwd`
-ANT_LIB=$OPENDS_LIB/mail.jar:$OPENDS_LIB/activation.jar
+ANT_LIB=$OPENDS_LIB/mail.jar
ANT_HOME=`cd ../..;pwd`/ext/ant
export ANT_HOME
ANT_OPTS="-Xmx1g"
diff --git a/opendj-sdk/opends/tests/staf-tests/build.bat b/opendj-sdk/opends/tests/staf-tests/build.bat
index 39c2dba..9fa3e4a 100644
--- a/opendj-sdk/opends/tests/staf-tests/build.bat
+++ b/opendj-sdk/opends/tests/staf-tests/build.bat
@@ -48,7 +48,7 @@
set OPENDS_LIB=%FT_HOME%\..\..\lib
echo OPENDS_LIB=%OPENDS_LIB%
-set ANT_LIBS=-lib "%OPENDS_LIB%\mail.jar" -lib "%OPENDS_LIB%\activation.jar"
+set ANT_LIBS=-lib "%OPENDS_LIB%\mail.jar"
echo ANT_LIBS=%ANT_LIBS%
echo Now running ant ...
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/ant/staf.xml b/opendj-sdk/opends/tests/staf-tests/shared/ant/staf.xml
index e5a68bf..47007aa 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/ant/staf.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/ant/staf.xml
@@ -165,7 +165,7 @@
<socket port="${staf.port}" server="${host.name}"/>
</not>
<then>
- <var name="cp" value="${project.home}/resource/dsml/lib/activation.jar:${project.home}/resource/dsml/lib/j2ee.jar:${project.home}/resource/dsml/lib/jaxb-api.jar:${project.home}/resource/dsml/lib/jaxb-impl.jar:${project.home}/resource/dsml/lib/jaxb-xjc.jar:${project.home}/resource/dsml/lib/jaxb1-impl.jar:${project.home}/resource/dsml/lib/jsr173_1.0_api.jar:${project.home}/resource/dsml/lib/saaj-1.3.jar:${project.home}/resource/dsml/lib/saaj-impl-1.3.jar"/>
+ <var name="cp" value="${project.home}/resource/dsml/lib/j2ee.jar:${project.home}/resource/dsml/lib/jaxb-api.jar:${project.home}/resource/dsml/lib/jaxb-impl.jar:${project.home}/resource/dsml/lib/jaxb-xjc.jar:${project.home}/resource/dsml/lib/jaxb1-impl.jar:${project.home}/resource/dsml/lib/jsr173_1.0_api.jar:${project.home}/resource/dsml/lib/saaj-1.3.jar:${project.home}/resource/dsml/lib/saaj-impl-1.3.jar"/>
<echo>Starting staf, please wait...</echo>
<exec dir="${staf.bin.dir}"
--
Gitblit v1.10.0