Show
Ignore:
Timestamp:
19.08.2011 23:47:11 (8 years ago)
Author:
ak19
Message:

Changes to release-kit to get the admin page to appear in the GS3 installer. Needed to add in a typedef reference in GS3 for the GS custom addusertask of ant that Oran wrote. Encryption of password requires lib\Crypt.class to be generated from crypt.jar. The other changes were copied from how the GS2 admin page works.

Location:
main/trunk/release-kits/kits/rk3/installer
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk3/installer/antinstall-config.xml

    r24216 r24437  
    183183        <text property="tomcat.shutdown.port" defaultValue="8005" displayText=""/> 
    184184    </page> 
     185     
     186    <!-- page to ask if we should enable admin pages --> 
     187    <page type="input" name="admin-pages" displayText=""> 
     188        <comment name="admin-expl"/> 
     189        <comment name="admin-expl-2"/> 
     190        <comment name="admin-expl-3"/> 
     191        <checkbox property="enable.admin.pages" displayText="" defaultValue="false"/> 
     192    </page> 
     193 
     194    <!-- only if they said yes above, set a password --> 
     195    <page type="input" name="admin-password" displayText="" ifProperty="(${enable.admin.pages}==true)" target="Configuring Administration Pages"> 
     196        <comment name="admin-password-expl"/> 
     197        <validated property="admin.password" defaultValue="" displayText="" regex="^.{3,20}$"/> 
     198    </page> 
    185199 
    186200    <!-- the final progress page --> 
  • main/trunk/release-kits/kits/rk3/installer/build.xml

    r24182 r24437  
    1111    <path id="project.classpath"><pathelement path="${antinstaller.jar}"/></path> 
    1212 
    13     <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/> 
     13    <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>    
     14    <typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstoneUserToDatabase" classpathref="project.classpath"/> 
    1415    <!-- if linux|mac --> 
    1516    <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/> 
     
    2021    <typedef name="getfreepath" classname="org.greenstone.anttasks.GetFreePath" classpathref="project.classpath"/> 
    2122    <!-- /if --> 
     23     
     24    <!-- set some properties to keep track of the OS --> 
     25    <!-- if windows --> 
     26    <property name="rk.os" value="windows"/> 
     27    <property name="shell.name" value="windows"/> 
     28    <!-- /if --> 
     29    <!-- if linux --> 
     30    <property name="rk.os" value="linux"/> 
     31    <property name="shell.name" value="linux"/> 
     32    <!-- /if --> 
     33    <!-- if mac --> 
     34    <property name="rk.os" value="mac"/> 
     35    <property name="shell.name" value="darwin"/> 
     36    <!-- /if --> 
     37     
    2238 
    2339    <!-- create a local and strictly unix installDir String --> 
     
    318334    </target> 
    319335 
     336     
     337    <target name="Configuring Administration Pages" if="enable.admin.pages"> 
     338        <echo>Enabling Admin Pages</echo> 
     339        <!--<rsr file="${installDir}/etc/main.cfg" pattern="^\s*status\s+.*" replacement="status enabled"/>--> 
     340        <rsr file="${installDir}/web/sites/localsite/siteConfig.xml" pattern="&lt;!--&lt;serviceRack name='Authentication'/&gt;--&gt;" replacement="&lt;serviceRack name='Authentication'/&gt;"/> 
     341        <echo>Creating admin and demo users</echo> 
     342        <adduser txt2db="${installDir}/gs2build/bin/${shell.name}/txt2db" 
     343            usersDb="${installDir}/etc/users.gdb" 
     344            username="admin" 
     345            password="${admin.password}" 
     346            groups="administrator,colbuilder,all-collections-editor" 
     347            comment="created at install time"/> 
     348        <adduser 
     349            txt2db="${installDir}/gs2build/bin/${shell.name}/txt2db" 
     350            usersDb="${installDir}/etc/users.gdb" 
     351            username="demo" 
     352            password="demo" 
     353            groups="demo" 
     354            comment="Dummy 'demo' user with password 'demo' for authen-e collection"/> 
     355    </target> 
     356 
     357     
    320358    <!-- util target to extract the given component --> 
    321359    <!-- pass in ${component.name} as a param -->