Changeset 24437

Timestamp:

2011-08-19T23:47:11+12:00 (12 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:

• antinstall-config.xml (modified) (1 diff)
• build.xml (modified) (3 diffs)

main/trunk/release-kits/kits/rk3/installer/antinstall-config.xml

@@ -183 +183 @@
         <text property="tomcat.shutdown.port" defaultValue="8005" displayText=""/>
     </page>
+    
+    <!-- page to ask if we should enable admin pages -->
+    <page type="input" name="admin-pages" displayText="">
+        <comment name="admin-expl"/>
+        <comment name="admin-expl-2"/>
+        <comment name="admin-expl-3"/>
+        <checkbox property="enable.admin.pages" displayText="" defaultValue="false"/>
+    </page>
+
+    <!-- only if they said yes above, set a password -->
+    <page type="input" name="admin-password" displayText="" ifProperty="(${enable.admin.pages}==true)" target="Configuring Administration Pages">
+        <comment name="admin-password-expl"/>
+        <validated property="admin.password" defaultValue="" displayText="" regex="^.{3,20}$"/>
+    </page>
 
     <!-- the final progress page -->

main/trunk/release-kits/kits/rk3/installer/build.xml

@@ -11 +11 @@
     <path id="project.classpath"><pathelement path="${antinstaller.jar}"/></path>
 
-    <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>
+    <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>   
+    <typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstoneUserToDatabase" classpathref="project.classpath"/>
     <!-- if linux|mac -->
     <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
@@ -20 +21 @@
     <typedef name="getfreepath" classname="org.greenstone.anttasks.GetFreePath" classpathref="project.classpath"/>
     <!-- /if -->
+    
+    <!-- set some properties to keep track of the OS -->
+    <!-- if windows -->
+    <property name="rk.os" value="windows"/>
+    <property name="shell.name" value="windows"/>
+    <!-- /if -->
+    <!-- if linux -->
+    <property name="rk.os" value="linux"/>
+    <property name="shell.name" value="linux"/>
+    <!-- /if -->
+    <!-- if mac -->
+    <property name="rk.os" value="mac"/>
+    <property name="shell.name" value="darwin"/>
+    <!-- /if -->
+    
 
     <!-- create a local and strictly unix installDir String -->
@@ -318 +334 @@
     </target>
 
+    
+    <target name="Configuring Administration Pages" if="enable.admin.pages">
+        <echo>Enabling Admin Pages</echo>
+        <!--<rsr file="${installDir}/etc/main.cfg" pattern="^\s*status\s+.*" replacement="status enabled"/>-->
+        <rsr file="${installDir}/web/sites/localsite/siteConfig.xml" pattern="&lt;!--&lt;serviceRack name='Authentication'/&gt;--&gt;" replacement="&lt;serviceRack name='Authentication'/&gt;"/>
+        <echo>Creating admin and demo users</echo>
+        <adduser txt2db="${installDir}/gs2build/bin/${shell.name}/txt2db"
+            usersDb="${installDir}/etc/users.gdb"
+            username="admin"
+            password="${admin.password}"
+            groups="administrator,colbuilder,all-collections-editor"
+            comment="created at install time"/>
+        <adduser
+            txt2db="${installDir}/gs2build/bin/${shell.name}/txt2db"
+            usersDb="${installDir}/etc/users.gdb"
+            username="demo"
+            password="demo"
+            groups="demo"
+            comment="Dummy 'demo' user with password 'demo' for authen-e collection"/>
+    </target>
+
+    
     <!-- util target to extract the given component -->
     <!-- pass in ${component.name} as a param -->