Changeset 25329

Timestamp:

2012-04-02T19:35:14+12:00 (12 years ago)

Author:

ak19

Message:

Installer for GS3 now sets the admin password to user specification by calling the ant config-admin target in GS3's build.xml file.

File:

• main/trunk/release-kits/kits/rk3/installer/build.xml (modified) (2 diffs)

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

@@ -12 +12 @@
 
     <typedef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/>   
-    <typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstoneUserToDatabase" classpathref="project.classpath"/>
+    <!--<typedef name="adduser" classname="org.greenstone.anttasks.AddGreenstone3UserToDatabase" classpathref="project.classpath"/>-->
     <!-- if linux|mac -->
     <taskdef name="sevenzip" classname="org.apache.tools.ant.SevenZip" classpathref="project.classpath"/>
@@ -337 +337 @@
     <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"
+        <echo>Creating admin user</echo>
+        <!--<echo>Creating admin and demo users</echo>-->
+        <exec dir="${installDir}" executable="cmd.exe">
+          <arg line="/c echo ${admin.password}| ant config-admin"/>
+        </exec>
+        <!--<adduser txt2db="org.greenstone.gsdl3.util.ChangePwdUsersDB"
+            usersDb="${installDir}/web/sites/localsite/etc/usersDB"
             username="admin"
             password="${admin.password}"
             groups="administrator,colbuilder,all-collections-editor"
-            comment="created at install time"/>
+            comment="created at install time"
+            email=""/>
         <adduser
-            txt2db="${installDir}/gs2build/bin/${shell.name}/txt2db"
-            usersDb="${installDir}/etc/users.gdb"
+            txt2db="org.greenstone.gsdl3.util.ChangePwdUsersDB"
+            usersDb="${installDir}/web/sites/localsite/etc/usersDB"
             username="demo"
             password="demo"
             groups="demo"
-            comment="Dummy 'demo' user with password 'demo' for authen-e collection"/>
+            comment="Dummy 'demo' user with password 'demo' for authen-e collection"
+            email=""/>-->
     </target>