Adaptation of SVR4 factory to changes required by LSARC/2008/691: * inst...

chebrard

02.24.2008 71a34a13d9dc6064d3d467f1c8ba64c14ce2a10b

Adaptation of SVR4 factory to changes required by LSARC/2008/691:
   * installation into /usr instead of /opt
   * default instance path: /var/opends instead of /var/opt/opends
   * instance.loc path: /etc/opends/instance.loc instead of /etc/opt/opends/instance.loc
   * user ldap/ldap instead of opendsd/opendsd

This also adapts the factory to be able to specify a prefix for all paths in an SVR4 package. For example, for opends package, prefix is opends.

 opends/build-svr4.xml

@@ -42,7 +42,7 @@
  <property name="pkg.dir"           location="${build.dir}/package" />
  <property name="svr4.dir"          location="${build.dir}/package/svr4" />

  <!-- Product specific properties: pkg.name / pkg.fullname / pkg.arch / pkg.desc / pkg.vendor / pkg.basedir -->
  <!-- Product specific properties: pkg.name / pkg.fullname / pkg.arch / pkg.desc / pkg.vendor / pkg.basedir / pkg.prefix -->
  <property file="${svr4.src.dir}/pkg.properties" />

  <!-- Default values for product specific properties -->
@@ -57,7 +57,7 @@
  <property name="svr4.build.dir"        location="${build.dir}/package/svr4/build/${pkg.name}" />
  <property name="svr4.meta.dir"         location="${svr4.build.dir}/meta" />
  <property name="svr4.layout.dir"       location="${svr4.build.dir}/layout" />
  <property name="svr4.layout.pkg.dir"   location="${svr4.build.dir}/layout/${pkg.name}" />
  <property name="svr4.layout.pkg.dir"   location="${svr4.build.dir}/layout/${pkg.prefix}" />

  <!-- Must define layout/pkgversion target -->
  <import file="${svr4.src.dir}/layout.xml" />
@@ -88,7 +88,7 @@
  </target>
  
  <!-- Construct metadata data -->
  <target name="metadata" depends="pkginfo,prototype,copyright" if="isSunOS" 
  <target name="metadata" depends="pkginfo,prototype,copyright,depend" if="isSunOS" 
        description="Construct metadata for ${pkg.name}.">
  </target>
  
@@ -147,6 +147,17 @@
    <copy file="${svr4.src.dir}/copyright" todir="${svr4.meta.dir}"/>
  </target>

  <!-- Construct depend file -->
  <target name="depend.init" if="isSunOS">
      <available property="present" file="${svr4.src.dir}/depend"/>
  </target>

  <target name="depend" depends="depend.init" if="present"
                description="Create depend file based on ${svr4.src.dir}/depend" >
       <echo message="Building depend for ${pkg.name} pkg" />
       <copy file="${svr4.src.dir}/depend" todir="${svr4.meta.dir}"/>
  </target>

  <!-- Make package -->
  <target name="pkgmk" if="isSunOS" 
        description="Build ${pkg.name} package" >

 opends/src/quicksetup/org/opends/quicksetup/Installation.java

@@ -150,7 +150,7 @@
  /**
   * The path to the default instance.
   */
  public static final String DEFAULT_INSTANCE_PATH = "/var/opt/opends";
  public static final String DEFAULT_INSTANCE_PATH = "/var/opends";

  /**
   * The relative path to the instance.loc file.
@@ -161,7 +161,7 @@
  /**
   * The path to the instance.loc file.
   */
  public static final String INSTANCE_LOCATION_PATH = "/etc/opt/opends/" +
  public static final String INSTANCE_LOCATION_PATH = "/etc/opends/" +
    INSTANCE_LOCATION_PATH_RELATIVE;

  /**

 opends/src/quicksetup/org/opends/quicksetup/configurator/Configurator.java

@@ -202,7 +202,7 @@
          System.exit(ReturnCode.APPLICATION_ERROR.getReturnCode());
        }
      } else {
        user = "opendsd";
        user = "ldap";
        cmd = "id " + user;
        proc = Runtime.getRuntime().exec(cmd);
        proc.waitFor();

 opends/src/svr4/OpenDS/pkg.properties

@@ -4,4 +4,5 @@
pkg.desc=OpenDS, an open source LDAP directory server 
pkg.arch=all
pkg.vendor=opends.org
pkg.basedir=/opt
pkg.basedir=/usr
pkg.prefix=opends