Changeset 17107 for release-kits/mark2

Timestamp:

2008-08-29T16:24:07+12:00 (16 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:

• ant-scripts/create-installer.xml (modified) (1 diff)
• installer/antinstall-config.xml (modified) (1 diff)
• installer/build.xml (modified) (2 diffs)

release-kits/mark2/ant-scripts/create-installer.xml

@@ -15 +15 @@
         <copy todir="${basedir}/installer/classes" overwrite="true">
             <fileset dir="${mark2.home}/greenstone2/installer-classes"/>
-            <fileset dir="${mark2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
         </copy>
+        <unjar src="${mark2.home}/ant-scripts/tasks/greenstone/anttasks.jar" dest="${basedir}/installer/classes"/>
+        <delete dir="${basedir}/installer/classes/META-INF"/>
+        <unjar src="${mark2.home}/lib/crypt.jar" dest="${basedir}/installer/classes"/>
+        <delete dir="${basedir}/installer/classes/META-INF"/>
     </target>
 

release-kits/mark2/installer/antinstall-config.xml

@@ -40 +40 @@
     </page>
 
+    <page type="input" name="admin-password" displayText="">
+        <comment name="admin-password-expl"/>
+        <text property="admin.password" defaultValue="" displayText=""/>
+    </page>
+
     <page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText=""></page>
 

release-kits/mark2/installer/build.xml

@@ -14 +14 @@
 
     <!-- custom tasks -->
-    <typedef name="rsr" classname="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"/>
 
     <condition property="bundled.java.exists">
@@ -75 +76 @@
         <echo/>
 
+        <echo message="Creating admin and demo users"/>
+        <adduser txt2db="${installDir}/bin/linux/txt2db"
+            usersDb="${installDir}/etc/users.db"
+            username="admin"
+            password="${admin.password}"
+            groups="administrator,colbuilder"
+            comment="created at install time"/>
+        <adduser
+            txt2db="${installDir}/bin/linux/txt2db"
+            usersDb="${installDir}/etc/users.db"
+            username="demo"
+            password="demo"
+            groups="demo"
+            comment="Dummy 'demo' user with password 'demo' for authen-e collection"/>
+
         <!-- delete unneeded files -->      
         <echo message="Deleting some unneeded files"/>