Improve staf support for Mac OS X in the Trunk Update to latest version of ...

Ludovic Poitou

16.11.2011 e7ba8dcfdf75f8d139b9d1713937d6f18da4687f

Improve staf support for Mac OS X in the Trunk
Update to latest version of staf and services.
Use macosx-universal as we test mostly on OS 10.6+, 64bits.

 opends/tests/staf-tests/shared/ant/build.properties

@@ -85,9 +85,9 @@
opends.name=${default.opends.name}

# Java section
java.path=${java.home}/..
local.javahome=${java.home}/..
remote.javahome=${java.home}/..
java.path=${java.home}
local.javahome=${java.home}
remote.javahome=${java.home}

# STAF section
staf.shared.dir=${shared.dir}/staf

 opends/tests/staf-tests/shared/ant/build.xml

@@ -131,7 +131,7 @@
        <switch value="${os.arch}">
          <case value="x86_64">
            <!-- Linux i386 -->
            <property name="os.myname" value="macosx-i386"/>
            <property name="os.myname" value="macosx-universal"/>
          </case>
        </switch>


 opends/tests/staf-tests/shared/staf/staf-controller.cfg

@@ -22,6 +22,7 @@
#
#
#      Copyright 2007-2010 Sun Microsystems, Inc.
#      Portions Copyright 2011 ForgeRock AS

# Change default data directory
SET DATADIR {STAF/Config/STAFRoot}/data-${local.hostname}
@@ -59,17 +60,20 @@
# EVENT SERVICE CONFIGURATION
SERVICE Event LIBRARY JSTAF \
  EXECUTE ${staf.install.dir}/${event.name}/STAFEvent.jar \
  OPTION JVMNAME=eventJVM-${local.hostname}
  OPTION JVMNAME=eventJVM-${local.hostname} \
  OPTION JVM=${local.javahome}/bin/java

# EVENTMANAGER SERVICE CONFIGURATION
SERVICE EventManager LIBRARY JSTAF \
  EXECUTE ${staf.install.dir}/${eventmanager.name}/STAFEventManager.jar \
  OPTION JVMNAME=eventmanagerJVM-${local.hostname}
  OPTION JVMNAME=eventmanagerJVM-${local.hostname} \
  OPTION JVM=${local.javahome}/bin/java

# EMAIL SERVICE CONFIGURATION
SERVICE Email LIBRARY JSTAF \
  EXECUTE ${staf.install.dir}/${email.name}/STAFEmail.jar \
  OPTION JVMNAME=emailJVM-${local.hostname}  \
  OPTION JVM=${local.javahome}/bin/java \
  PARMS "MAILSERVER ${email.server.host} PORT ${email.server.port}"

SET MAXQUEUESIZE 10000