fixed issues in the installer for solaris sparc. (LD_LIBRARY_PATH. fixed eo...

al_xipe

02.41.2007 bc4edce28c7c4303776e9fb7c1dc194b198d12d0

fixed issues in the installer for solaris sparc. (LD_LIBRARY_PATH. fixed eol-style issue on installer files. added javadoc target to generate functional tests documentation. added email capability in the run-daily target. config.py.stubs is back to referencing python variables.

 opends/tests/functional-tests/build.bat

@@ -46,6 +46,7 @@
echo   JAVA_HOME=%JAVA_HOME%

if not "%*" == "" echo   your parameters=%*

echo Now running ant ...

"%ANT_HOME%\bin\ant" -f staf-installer.xml %*

OPENDS_LIB=%FT_HOME%\..\..\lib
"%ANT_HOME%\bin\ant" -lib "%OPENDS_LIB%\mail.jar;%OPENDS_LIB%\activation.jar"-f staf-installer.xml %*


:end


 opends/tests/functional-tests/build.sh

@@ -44,7 +44,8 @@
  fi

fi



OPENDS_LIB=`cd ../../lib;pwd`
ANT_HOME=`cd ../..;pwd`/ext/ant

export ANT_HOME

# Execute the ant script and pass it any additional command-line arguments.

$ANT_HOME/bin/ant -f staf-installer.xml ${*}

$ANT_HOME/bin/ant -lib $OPENDS_LIB/mail.jar:$OPENDS_LIB/activation.jar -f staf-installer.xml ${*}

 opends/tests/functional-tests/staf-installer.xml

@@ -31,9 +31,10 @@
        This allows tests that need a running instance of staf to easily
        get one and hides all the complexity under the hood
  </description>
  <dirname file="${basedir}/.." property="project.home"/>
  
  <!-- installer wide settings - top -->
    <property file="../../PRODUCT"/>
    <property file="${project.home}//PRODUCT"/>
    <property name="product.name"
              value="${SHORT_NAME}-${MAJOR_VERSION}.${MINOR_VERSION}" />
    <!-- this is the file where the default values are defined                -->
@@ -254,11 +255,20 @@

<!-- Gui section - top -->
  <target name="gui"
          depends="status-do"
          description="brings up the stax gui" >
    <java classname="com.ibm.staf.service.stax.STAXMonitor"
          classpath="${staf.install.dir}/services/stax/STAXMon.jar${path.separator}${staf.install.dir}/bin/JSTAF.jar"
          fork="true" 
          spawn="true"/>
    
    <exec
      dir="${staf.install.dir}"
      executable="${java.home}/bin/java"
      spawn="true">
      <env key="LD_LIBRARY_PATH" value="${staf.lib.dir}"/>
      <env key="STAFCONVDIR" value="${staf.install.dir}/codepage"/>
      <env key="STAFCODEPAGE" value="LATIN_1"/>
      <arg value="-classpath"/>
      <arg value="${staf.install.dir}/services/stax/STAXMon.jar${path.separator}${staf.lib.dir}/JSTAF.jar"/>
      <arg value="com.ibm.staf.service.stax.STAXMonitor"/>
    </exec>
  </target>
<!-- Gui section - bottom -->

@@ -277,11 +287,6 @@
  <target name="run-tests-prepare" 
          depends="status-do,get-pkg" 
          if="staf.running">
    <condition property="staf.lib.dir" 
      value="${staf.install.dir}${file.separator}bin" 
      else="${staf.install.dir}${file.separator}lib">
      <os family="windows"/>
    </condition>
    <!-- python config - top -->
      <!-- 1. get a timestamp for step 3 -->
      <tstamp>
@@ -342,6 +347,7 @@
      >
      <arg line="LOCAL STAX ${tests.request}"/>
      <env key="CLASSPATH" path="${staf.lib.dir}/JSTAF.jar${path.separator}${e.CLASSPATH}"/>
      <env key="LD_LIBRARY_PATH" value="${staf.lib.dir}"/>
      <env key="STAFCONVDIR" value="${staf.install.dir}/codepage"/>
      <env key="STAFCODEPAGE" value="LATIN_1"/>
    </exec>
@@ -366,6 +372,14 @@
        <include name="r*"/>
      </fileset>
    </copy>
    <mail from="arnaud@sun.com" 
          tolist="arnaud@sun.com" 
          subject="FT - ${daily.date} - ${os.name} - ${os.arch}"
          files="${staf.tmp.dir}/results.html"
          mailhost="pecos.central.sun.com"
          messagefile="${staf.tmp.dir}/results.html"
          messagemimetype="text/html">
    </mail>
  </target>
  
  <target name="daily">
@@ -439,7 +453,7 @@
     <arg value="${staf.config}"/>
     <env key="${path.var}" path="${java.home}${file.separator}bin${path.separator}${staf.install.dir}${file.separator}bin${path.separator}${path.current}"/>
     <env key="LD_LIBRARY_PATH" path="${staf.install.dir}/lib"/>
     <env key="CLASSPATH" path="${staf.install.dir}/bin/JSTAF.jar${path.separator}${e.CLASSPATH}"/>
     <env key="CLASSPATH" path="${staf.lib.dir}/JSTAF.jar${path.separator}${e.CLASSPATH}"/>
     <env key="STAFCONVDIR" value="${staf.install.dir}/codepage"/>
     <env key="STAFCODEPAGE" value="LATIN_1"/>
     <env key="STAF_INSTANCE_NAME" value="STAF"/>
@@ -529,6 +543,11 @@
      <available file="${staf.install.dir}" 
                type="dir" 
                property="staf.installed" />
      <condition property="staf.lib.dir" 
        value="${staf.install.dir}${file.separator}bin" 
        else="${staf.install.dir}${file.separator}lib">
        <os family="windows"/>
      </condition>
  
      <condition property="staf.running">
        <socket port="${staf.port}" server="${host.name}"/>
@@ -604,4 +623,30 @@
        <antcall target="uninstall"/>
    </target>
<!--  Macros section - bottom -->
  <target name="javadoc" depends="status-do" if="staf.installed">
    <delete dir="${staf.home}/doc"/>
    <mkdir dir="${staf.home}/doc"/>
    <java jar="${staf.install.dir}/services/stax/STAXDoc.jar" fork="true">
      <arg value="-d"/> 
      <arg value="${staf.home}/doc"/>
      <arg value="testcases"/>
      <arg value="testcases/aci"/>
      <arg value="testcases/backends"/>
      <arg value="testcases/core"/>
      <arg value="testcases/schema"/>
      <arg value="testcases/security"/>
      <arg value="testcases/security/account_activation"/>
      <arg value="testcases/security/auth_pwd_syntax"/>
      <arg value="testcases/security/bind_no_pwd"/>
      <arg value="testcases/security/jks"/>
      <arg value="testcases/security/pkcs12"/>
      <arg value="testcases/security/pwd_policy"/>
      <arg value="testcases/security/pwd_policy_root"/>
      <arg value="testcases/security/pwd_storage"/>
      <arg value="testcases/security/pwd_validator"/>
      <arg value="testcases/security/sasl"/>
      <arg value="testcases/security/startTLS"/>
      <arg value="shared/functions"/>
    </java>
  </target>
</project>

 opends/tests/functional-tests/staf-installer/Linux.properties

 opends/tests/functional-tests/staf-installer/SunOS-sparc.properties

 opends/tests/functional-tests/staf-installer/SunOS-x86.properties

 opends/tests/functional-tests/staf-installer/config.py.stubs

@@ -1,31 +1,31 @@
TEST_OS_STRING              = '${os.name}'
TEST_HW_STRING              = '${os.arch}(${sun.arch.data.model} bits)'
TEST_JVM_STRING             = '${java.version}'
TEST_HW_STRING              = '${os.arch}'
TEST_JVM_STRING             = '${java.version}(${sun.arch.data.model} bits)'
STAF_LOCAL_HOSTNAME         = 'localhost'
STAF_REMOTE_HOSTNAME        = 'localhost'
STAF_JAVA_HOME              = '${java.home}'
STAF_HOME_DIR               = '${staf.install.dir}'
TMPDIR                      = '${staf.tmp.dir}'
PSWDFILE                    = '${staf.tmp.dir}/password'
PSWDFILE                    = '%s/password' % TMPDIR
OPENDSDIR                   = '${project.home}'
OPENDSNAME                  = '${product.name}'
ZIPNAME                     = '${product.name}.zip'
ZIPPATH                     = '${product.package.dir}'
TESTS_DIR                   = '${basedir}'
TESTS_ROOT                  = '${basedir}/tests'
TESTS_SHARED_DIR            = '${basedir}/shared'
TESTS_FUNCTIONS_DIR         = '${basedir}/shared/functions'
TESTS_DATA_DIR              = '${basedir}/shared/data'
TMP_DATA_DIR                = '${tests.run.dir}/${tests.run.time}/data'
TESTS_ROOT                  = '%s/tests' % OPENDSDIR
TESTS_DIR                   = '%s/functional-tests' % TESTS_ROOT
TESTS_SHARED_DIR            = '%s/shared' % TESTS_DIR
TESTS_FUNCTIONS_DIR         = '%s/functions' % TESTS_SHARED_DIR
TESTS_DATA_DIR              = '%s/data' % TESTS_SHARED_DIR
TMP_DATA_DIR                = '%s/functional-tests' % TMPDIR
DIRECTORY_INSTANCE_DN       = 'cn=Directory Manager'
DIRECTORY_INSTANCE_PSWD     = 'password'
DIRECTORY_INSTANCE_DIR      = '${staf.tmp.dir}'
DIRECTORY_INSTANCE_DIR      = '%s' % TMPDIR
DIRECTORY_INSTANCE_HOST     = 'localhost'
DIRECTORY_INSTANCE_PORT     = '1389'
DIRECTORY_INSTANCE_SSL_PORT = '1636'
DIRECTORY_INSTANCE_SFX      = 'dc=com'
DIRECTORY_INSTANCE_BE       = 'userRoot'
STAGED_DATA_DIR             = '${tests.run.dir}/${tests.run.time}/data/shared/data'
STAGED_DATA_DIR             = '%s/shared/data' % TMP_DATA_DIR
JAVA_HOME                   = '${java.home}'
SEND_MAIL_AFTER_TEST_RUN    = '${staf.email.send}'
SEND_MAIL_TO                = '${staf.email.to}'

 opends/tests/functional-tests/staf-installer/functional-tests.cfg

 opends/tests/functional-tests/staf-installer/replay.bat

 opends/tests/functional-tests/staf-installer/replay.sh

 opends/tests/functional-tests/staf-installer/staf-installer.properties

@@ -1,5 +1,4 @@
# Global section - top

project.home=${basedir}${file.separator}..${file.separator}..

host.name=localhost

# Global section - bottom




 opends/tests/functional-tests/staf-installer/windows-x86-32.properties

 opends/tests/functional-tests/staf-installer/windows-x86-64.properties

 opends/tests/functional-tests/staf-installer/windows.properties