From cf48edeb9ed75fe7290b183ecb2a37de367d733a Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Wed, 14 May 2008 13:30:55 +0000
Subject: [PATCH] Fix compilation problem for SNMP tests

---
 opendj-sdk/opends/tests/shared/functions/topology.xml |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opendj-sdk/opends/tests/shared/functions/topology.xml b/opendj-sdk/opends/tests/shared/functions/topology.xml
index 94c11d1..c5db739 100755
--- a/opendj-sdk/opends/tests/shared/functions/topology.xml
+++ b/opendj-sdk/opends/tests/shared/functions/topology.xml
@@ -281,7 +281,7 @@
             'extension'  : 'class'
             }
           </call>
-          <if expr="STAXResult != ''">
+          <if expr="len(STAXResult) == 0">
             <sequence>
               <!---   Compile ldap java files on controler host -->
               <message>
@@ -334,7 +334,7 @@
             'attribute' : 'TYPE'
             }
           </call>
-          <!-- 'SNMP_OPENDS_JARFILE' exists so we can continue -->
+          <!-- 'SNMP_OPENDMK_LIBDIR' exists so we can continue with SNMP -->
           <if expr="RC != 48">
             <sequence>          
               <!---   Check if snmp java files are already compiled -->
@@ -345,7 +345,7 @@
                 'extension'  : 'class'
                 }
               </call>
-              <if expr="STAXResult != ''">
+              <if expr="len(STAXResult) == 0">
                 <sequence>
                   <!--- Install DS Copy zip file -->
                   <message>
@@ -375,10 +375,10 @@
                     { 
                     'location' : STAXServiceMachine,
                     'type'     : 'STRING',
-                    'name'     : 'STAF/Env/LD_LIBRARY_PATH'
+                    'name'     : 'STAF/Env/STAF_DIR'
                     }
                   </call>                                                       
-                  <script>jstaf_jarfile = '%s/JSTAF.jar' % STAFResult</script> 
+                  <script>jstaf_jarfile = '%s/lib/JSTAF.jar' % STAFResult</script> 
                   
                   <!---   Compile snmp java files on controler host -->
                   <message>

--
Gitblit v1.10.0