Changeset 17107 for release-kits/mark2

Show
Ignore:
Timestamp:
29.08.2008 16:24:07 (11 years ago)
Author:
oranfry
Message:

changed build scripts and create-installer targets after the greenstone ant tasks were moved. also, greenstone2 installer now creates admin and demo users at install

Location:
release-kits/mark2
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • release-kits/mark2/ant-scripts/create-installer.xml

    r16818 r17107  
    1515        <copy todir="${basedir}/installer/classes" overwrite="true"> 
    1616            <fileset dir="${mark2.home}/greenstone2/installer-classes"/> 
    17             <fileset dir="${mark2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" /> 
    1817        </copy> 
     18        <unjar src="${mark2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/> 
     19        <delete dir="${basedir}/installer/classes/META-INF"/> 
     20        <unjar src="${mark2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/> 
     21        <delete dir="${basedir}/installer/classes/META-INF"/> 
    1922    </target> 
    2023 
  • release-kits/mark2/installer/antinstall-config.xml

    r17040 r17107  
    4040    </page> 
    4141 
     42    <page type="input" name="admin-password" displayText=""> 
     43        <comment name="admin-password-expl"/> 
     44        <text property="admin.password" defaultValue="" displayText=""/> 
     45    </page> 
     46 
    4247    <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText=""></page> 
    4348 
  • release-kits/mark2/installer/build.xml

    r17076 r17107  
    1414 
    1515    <!-- custom tasks --> 
    16     <typedef name="rsr" classname="RegexSearchReplace" classpathref="project.classpath"/> 
     16    <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/> 
     17    <typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstoneUserToDatabase" classpathref="project.classpath"/> 
    1718 
    1819    <condition property="bundled.java.exists"> 
     
    7576        <echo/> 
    7677 
     78        <echo message="Creating admin and demo users"/> 
     79        <adduser txt2db="${installDir}/bin/linux/txt2db" 
     80            usersDb="${installDir}/etc/users.db" 
     81            username="admin" 
     82            password="${admin.password}" 
     83            groups="administrator,colbuilder" 
     84            comment="created at install time"/> 
     85        <adduser 
     86            txt2db="${installDir}/bin/linux/txt2db" 
     87            usersDb="${installDir}/etc/users.db" 
     88            username="demo" 
     89            password="demo" 
     90            groups="demo" 
     91            comment="Dummy 'demo' user with password 'demo' for authen-e collection"/> 
     92 
    7793        <!-- delete unneeded files -->       
    7894        <echo message="Deleting some unneeded files"/>