Index: /release-kits/lirk2/ant-scripts/build.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/build.xml	(revision 15979)
+++ /release-kits/lirk2/ant-scripts/build.xml	(revision 15980)
@@ -15,16 +15,12 @@
 	<import file="compile.xml"/>
 	<import file="create-distribution.xml"/>
-	<!--
 	<import file="create-installer.xml"/>
 	<import file="wrap.xml"/>
-	-->
 
 	<target name="lirk2" depends="init">
 		<addressedcall target="compile"/>
 		<addressedcall target="create-distribution"/>
-		<!--
 		<addressedcall target="create-installer"/>
 		<addressedcall target="wrap"/>
-		-->
 	</target>
 
Index: /release-kits/lirk2/ant-scripts/create-distribution.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/create-distribution.xml	(revision 15979)
+++ /release-kits/lirk2/ant-scripts/create-distribution.xml	(revision 15980)
@@ -15,4 +15,6 @@
 		<addressedcall target="export-gsdl-gli-indexers" />
 		<addressedcall target="dist-set-version" />
+		<addressedcall target="drop-in-binaries" />
+		<addressedcall target="drop-in-demo-collection" />
 		<addressedcall target="compile-gli" />
 		<addressedcall target="create-gli-client-zip" />
@@ -23,16 +25,16 @@
 		<if><bool><istrue value="${execute}"/></bool>
 
-			<mkdir dir="distribution"/>
-			<delete dir="distribution/gsdl"/>
+			<mkdir dir="distributions"/>
+			<delete dir="distributions/web"/>
 			<svn>
-				<export srcurl="${svn.root}/gsdl/${branch.path}"		destPath="distribution/gsdl"/>
+				<export srcurl="${svn.root}/gsdl/${branch.path}"		destPath="distributions/web"/>
 			</svn>
 
 			<svn>
-				<export srcurl="${svn.root}/gli/${branch.path}"			destPath="distribution/gsdl/gli"/>
+				<export srcurl="${svn.root}/gli/${branch.path}"			destPath="distributions/web/gli"/>
 			</svn>
 
 			<svn>
-				<export srcurl="${svn.root}/indexers/${branch.path}"	destPath="distribution/gsdl/indexers"/>
+				<export srcurl="${svn.root}/indexers/${branch.path}"	destPath="distributions/web/indexers"/>
 			</svn>
 
@@ -44,14 +46,33 @@
 
 			<echo level="info">Setting version in src/lib/gsdlconf.h</echo>
-			<rsr file="${basedir}/gsdl/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
+			<rsr file="${basedir}/distributions/web/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
 
 			<echo level="info">Setting version in Install.sh</echo>
-			<rsr file="${basedir}/gsdl/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
+			<rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
 
 			<echo level="info">Setting version in etc/VERSION</echo>
-			<rsr file="${basedir}/gsdl/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
+			<rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
 
 		</if>
 	</target>
+
+	<target name="drop-in-binaries">
+		<if><bool><istrue value="${execute}"/></bool>
+			<echo level="info">Dropping compiled binaries into distribution</echo>
+			<delete dir="distributions/web/bin/linux" />
+			<exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/linux distributions/web/bin"/></exec>
+			<exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>
+			<exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiservr distributions/web/cgi-bin"/></exec>
+		</if>
+	</target>
+
+	<target name="drop-in-demo-collection">
+		<if><bool><istrue value="${execute}"/></bool>
+			<echo level="info">Dropping compiled binaries into distribution</echo>
+			<delete dir="distributions/web/collect/demo" />
+			<exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec>
+		</if>
+	</target>
+
 
 	<target name="compile-gli">
@@ -59,15 +80,15 @@
 
 			<echo>Compiling gli...</echo>
-			<exec dir="${basedir}/distribution/gsdl/gli" executable="${basedir}/distribution/gsdl/gli/makegli.sh"/>
+			<exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makegli.sh"/>
 
 			<echo>Creating jar...</echo>
-			<exec dir="${basedir}/distribution/gsdl/gli" executable="${basedir}/distribution/gsdl/gli/makejar.sh"/>
+			<exec dir="${basedir}/distributions/web/gli" executable="${basedir}/distributions/web/gli/makejar.sh"/>
 
 			<echo>Cleaning up intermediate files...</echo>
-			<delete dir="${basedir}/distribution/gsdl/gli/jar"/>
-			<delete dir="${basedir}/distribution/gsdl/gli/classes/org"/>
+			<delete dir="${basedir}/distributions/web/gli/jar"/>
+			<delete dir="${basedir}/distributions/web/gli/classes/org"/>
 
 			<echo>Putting gli server jar in a better place</echo>
-			<exec dir="${basedir}/distribution/gsdl" executable="mv" failonerror="true">
+			<exec dir="${basedir}/distributions/web" executable="mv" failonerror="true">
 				<arg line="gli/GLIServer.jar bin/java" />
 			</exec>
@@ -104,12 +125,20 @@
 
 			<echo level="info">Changing Install.sh to web release</echo>
-			<rsr file="${basedir}/distribution/gsdl/Install.sh" pattern="^(iscdrom=).*" replacement="$1&quot;no&quot;" />
+			<rsr file="${basedir}/distributions/web/Install.sh" pattern="^(iscdrom=).*" replacement="$1&quot;no&quot;" />
+
+			<echo level="info">Putting the COPYING file into distribution</echo>
+			<copy file="${lirk2.home}/resources/COPYING" tofile="${basedir}/distributions/web/COPYING" />
+
+			<echo level="info">Removing signed gatherer</echo>
+			<delete file="${basedir}/distributions/web/bin/java/SignedGatherer.jar" />
+
+			<echo level="info">Removing some unneeded stuff</echo>
+			<delete file="${basedir}/distributions/web/gli/.greenstonestore" />
+			<delete file="${basedir}/distributions/web/gli/gli4gs3.sh" />
+			<delete><fileset dir="${basedir}/distributions/web/gli" includes="*.bat"/></delete>
+			<delete><fileset dir="${basedir}/distributions/web" includes="*.bat"/></delete>
 
 		</if>
 	</target>
 
-	
-
-
-
 </project>
Index: /release-kits/lirk2/ant-scripts/create-installer.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/create-installer.xml	(revision 15979)
+++ /release-kits/lirk2/ant-scripts/create-installer.xml	(revision 15980)
@@ -9,10 +9,9 @@
 -->
 
-<project name="lirk3-create-installer" default="create-installer">
+<project name="lirk2-create-installer" default="create-installer">
 
 	<target name="create-installer">
 		<addressedcall target="setup-for-installer-creation"/>
 		<addressedcall target="compile-installer"/>
-		<addressedcall target="clean-up-after-installer-creation"/>
 	</target>
 
@@ -20,15 +19,15 @@
 		<if><bool><istrue value="${execute}"/></bool>
 
-			<echo>Project Path: ${basedir}/distribution/greenstone3</echo>
+			<echo>Project Path: ${basedir}/distribution/gsdl</echo>
 			<mkdir dir="${basedir}/installer"/>
-			<copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml"/>
-			<copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml"/>
-			<copy todir="${basedir}/installer/cp"><fileset dir="${lirk3.home}/installer/cp"/></copy>
+			<copy todir="${basedir}/installer" file="${lirk2.home}/installer/antinstall-config.xml" overwrite="true"/>
+			<copy todir="${basedir}/installer" file="${lirk2.home}/installer/build.xml" overwrite="true"/>
+			<copy todir="${basedir}/installer/cp" overwrite="true"><fileset dir="${lirk2.home}/installer/cp"/></copy>
 
 			<!-- put the concrete values of things in the config -->
 			<rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
+			<rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.java@" replacement="${component.size.java}"/>
 			<rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/>
 			<rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${java.extracted}"/>
-
 
 			<!-- put the concrete values of things in the text -->
@@ -37,8 +36,7 @@
 			<rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
 			<rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
-			<rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
-			<rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
 
 			<!-- chinese -->
+			<!--
 			<rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/>
 			<rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
@@ -46,4 +44,6 @@
 			<rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
 			<rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
+			-->
+
 
 		</if>
@@ -53,30 +53,19 @@
 		<if><bool><istrue value="${execute}"/></bool>
 
-			<installer file="${basedir}/installer/greenstone3-with-java.jar"
+			<!-- create the installer with java -->
+			<installer file="${basedir}/installer/gsdl-${version}-linux-with-java.jar"
 					compress="true"
 					extractType="NonExtractor"
 					installConfig="${basedir}/installer/antinstall-config.xml"
 					buildFile="${basedir}/installer/build.xml"
-					antInstallLib="${lirk3.home}/bin/ant-installer/lib"
-					antLib="${lirk3.home}/bin/ant-installer/antlib"
+					antInstallLib="${lirk2.home}/bin/ant-installer/lib"
+					antLib="${lirk2.home}/bin/ant-installer/antlib"
 					validateConfig="true"
 					failOnError="false"
 					icons="bluecurve">
 
-				<!-- copy all the important files into the archive to be extracted for install -->
 				<zipfileset dir="${basedir}/installer/cp" includes="resources/*"/>
-				<zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
-
-
-				<zipfileset dir="${basedir}/distribution/greenstone3" includes="*"/>
-				<zipfileset dir="${basedir}/distribution/greenstone3/bin" prefix="bin"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/docs" prefix="docs"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/gli" prefix="gli"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/gs2build" prefix="gs2build"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/lib" prefix="lib"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/web" prefix="web"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/packages" prefix="packages"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/resources" prefix="resources"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset>
+				<zipfileset dir="${lirk2.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
+				<zipfileset dir="${basedir}/distributions/web" includes="**/*"/>
 
 			</installer>
@@ -85,28 +74,20 @@
 			<rsr file="${basedir}/installer/antinstall-config.xml" pattern=".*&lt;!-- bundled java only --&gt;" replacement=""/>
 
-			<installer file="${basedir}/installer/greenstone3.jar"
+			<!-- create the installer without java -->
+			<installer file="${basedir}/installer/gsdl-${version}-linux.jar"
 					compress="true"
 					extractType="NonExtractor"
 					installConfig="${basedir}/installer/antinstall-config.xml"
 					buildFile="${basedir}/installer/build.xml"
-					antInstallLib="${lirk3.home}/bin/ant-installer/lib"
-					antLib="${lirk3.home}/bin/ant-installer/antlib"
+					antInstallLib="${lirk2.home}/bin/ant-installer/lib"
+					antLib="${lirk2.home}/bin/ant-installer/antlib"
 					validateConfig="true"
+					failOnError="false"
 					icons="bluecurve">
 
-				<!-- copy all the important files into the archive to be extracted for install -->
 				<zipfileset dir="${basedir}/installer/cp" includes="resources/*"/>
-				<zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
+				<zipfileset dir="${lirk2.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
+				<zipfileset dir="${basedir}/distributions/web" includes="**/*"/>
 
-				<zipfileset dir="${basedir}/distribution/greenstone3" includes="*"/>
-				<zipfileset dir="${basedir}/distribution/greenstone3/bin" prefix="bin"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/docs" prefix="docs"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/gli" prefix="gli"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/gs2build" prefix="gs2build"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/lib" prefix="lib"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/web" prefix="web"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/packages" prefix="packages"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/resources" prefix="resources"><include name="**/*"/></zipfileset>
-				<zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset>
 			</installer>
 
@@ -114,11 +95,3 @@
 	</target>
 
-	<target name="clean-up-after-installer-creation">
-		<if><bool><istrue value="${execute}"/></bool>
-			<delete file="${basedir}/installer/antinstall-config.xml"/>
-			<delete file="${basedir}/installer/build.xml"/>
-		</if>
-	</target>
-
-
 </project>
Index: /release-kits/lirk2/ant-scripts/init.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/init.xml	(revision 15979)
+++ /release-kits/lirk2/ant-scripts/init.xml	(revision 15980)
@@ -51,6 +51,4 @@
 	<!-- the version numbers of bundled things -->
 	<property name="bundled.version.java" value="1.6.0_05"/>
-	<property name="bundled.version.tomcat" value="5.5.25"/>
-	<property name="bundled.version.ant" value="1.6.5"/>
 
 	<!--<property name="java.installer" value="jre_6u5_linux_i586"/>-->
Index: /release-kits/lirk2/ant-scripts/wrap.xml
===================================================================
--- /release-kits/lirk2/ant-scripts/wrap.xml	(revision 15979)
+++ /release-kits/lirk2/ant-scripts/wrap.xml	(revision 15980)
@@ -9,10 +9,9 @@
 -->
 
-<project name="lirk3-wrap" default="wrap">
+<project name="lirk2-wrap" default="wrap">
 
 	<target name="wrap">
 		<addressedcall target="setup-for-wrapping"/>
 		<addressedcall target="compile-wrapper"/>
-		<addressedcall target="clean-up-after-wrapping"/>
 	</target>
 
@@ -23,16 +22,16 @@
 			<!-- create and setup the build directory -->
 			<mkdir dir="${basedir}/wrapped-installer/build"/>
-			<copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/wrapper/mywrapper.c"/>
+			<copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/wrapper.cpp"/>
 
 			<!-- copy bundled files -->
-			<copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/search4j/search4j"/>
-			<copy todir="${basedir}/wrapped-installer/build" file="${lirk3.home}/wrapper/${java.installer}"/>
-			<copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3.jar"/>
-			<copy todir="${basedir}/wrapped-installer/build" file="${basedir}/installer/greenstone3-with-java.jar"/>
+			<copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/search4j/search4j"/>
+			<copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/wrapper/${java.installer}"/>
+			<copy tofile="${basedir}/wrapped-installer/build/greenstone2.jar" file="${basedir}/installer/gsdl-${version}-linux.jar"/>
+			<copy tofile="${basedir}/wrapped-installer/build/greenstone2-with-java.jar" file="${basedir}/installer/gsdl-${version}-linux-with-java.jar"/>
 
-			<!-- substitute the real java installer filename and min version into various files -->
-			<rsr file="${basedir}/wrapped-installer/build/mywrapper.c" pattern="@java.installer@" replacement="${java.installer}"/>
-			<rsr file="${basedir}/wrapped-installer/build/mywrapper.c" pattern="@java.extracted@" replacement="${java.extracted}"/>
-			<rsr file="${basedir}/wrapped-installer/build/mywrapper.c" pattern="@java.min.version@" replacement="${java.min.version}"/>
+			<!-- substitute in real values -->
+			<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.installer@" replacement="${java.installer}"/>
+			<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.extracted@" replacement="${java.extracted}"/>
+			<rsr file="${basedir}/wrapped-installer/build/wrapper.cpp" pattern="@java.min.version@" replacement="${java.min.version}"/>
 
 		</if>
@@ -44,8 +43,8 @@
 			<echo level="info">create an object file (extension .o) for each file to bundle</echo>
 			<exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
-				<arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_jar_start=greenstone3jar --readonly-text greenstone3.jar greenstone3.jar.o"/>
+				<arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_jar_start=greenstone2jar --readonly-text greenstone2.jar greenstone2.jar.o"/>
 			</exec>
 			<exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
-				<arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone3_with_java_jar_start=greenstone3jar --readonly-text greenstone3-with-java.jar greenstone3-with-java.jar.o"/>
+				<arg line="-I binary -O elf32-i386 -B i386 --redefine-sym _binary_greenstone2_with_java_jar_start=greenstone2jar --readonly-text greenstone2-with-java.jar greenstone2-with-java.jar.o"/>
 			</exec>
 			<exec executable="/usr/bin/objcopy" dir="${basedir}/wrapped-installer/build">
@@ -56,12 +55,11 @@
 			</exec>
 
-
 			<!-- get size of greenstone.jar -->
-			<exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3.jar.ls"><arg line="-l greenstone3.jar"/></exec>
-			<exec executable="sed" inputstring="${greenstone3.jar.ls}" outputproperty="greenstone3.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
+			<exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone2.jar.ls"><arg line="-l greenstone2.jar"/></exec>
+			<exec executable="sed" inputstring="${greenstone2.jar.ls}" outputproperty="greenstone2.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
 
 			<!-- get size of greenstone-with-java.jar -->
-			<exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone3-with-java.jar.ls"><arg line="-l greenstone3-with-java.jar"/></exec>
-			<exec executable="sed" inputstring="${greenstone3-with-java.jar.ls}" outputproperty="greenstone3-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
+			<exec executable="ls" dir="${basedir}/wrapped-installer/build" outputproperty="greenstone2-with-java.jar.ls"><arg line="-l greenstone2-with-java.jar"/></exec>
+			<exec executable="sed" inputstring="${greenstone2-with-java.jar.ls}" outputproperty="greenstone2-with-java.jar.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
 
 			<!-- get size of search4j -->
@@ -73,50 +71,38 @@
 			<exec executable="sed" inputstring="${java.ls}" outputproperty="java.size"><arg line="-e 's/^[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *[^\ ]*\ *\([0-9]*\).*$/\1/g'"/></exec>
 
-
 			<echo level="info">creating the header file for no java version</echo>
-			<delete file="mywrapper.h"/>
-			<exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h"><arg line="extern const char greenstone3jar[${greenstone3.jar.size}];"/></exec>
-			<exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>
+			<delete file="wrapper.h"/>
+			<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2.jar.size}];"/></exec>
+			<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>
 
 			<echo level="info">compile the wrapper program</echo>
 			<exec executable="g++" dir="${basedir}/wrapped-installer/build">
-				<arg line="-Wall -static -static-libgcc -c -o mywrapper.o mywrapper.c"/>
+				<arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
 			</exec>
 
 			<echo level="info">link, bundling the files to be bundled</echo>
 			<exec executable="g++" dir="${basedir}/wrapped-installer/build">
-				<arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin mywrapper.o greenstone3.jar.o search4j.o"/>
+				<arg line="-static -static-libgcc -o  ../greenstone-${version}-linux.bin wrapper.o greenstone2.jar.o search4j.o"/>
 			</exec>
 
-
 			<echo level="info">creating the header file for bundled java version</echo>
-			<delete file="mywrapper.h"/>
-			<exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h"><arg line="extern const char greenstone3jar[${greenstone3-with-java.jar.size}];"/></exec>
-			<exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>
-			<exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
-			<exec executable="echo" output="${basedir}/wrapped-installer/build/mywrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
+			<delete file="wrapper.h"/>
+			<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h"><arg line="extern const char greenstone2jar[${greenstone2-with-java.jar.size}];"/></exec>
+			<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char search4j[${search4j.size}];"/></exec>
+			<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="extern const char java[${java.size}];"/></exec>
+			<exec executable="echo" output="${basedir}/wrapped-installer/build/wrapper.h" append="true"><arg line="#define java_is_bundled yes"/></exec>
 
 			<echo level="info">recompile the wrapper program</echo>
 			<exec executable="g++" dir="${basedir}/wrapped-installer/build">
-				<arg line="-Wall -static -static-libgcc -c -o mywrapper.o mywrapper.c"/>
+				<arg line="-Wall -static -static-libgcc -c -o wrapper.o wrapper.cpp"/>
 			</exec>
 
 			<echo level="info">relink, bundling the files to be bundled</echo>
 			<exec executable="g++" dir="${basedir}/wrapped-installer/build">
-				<arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin mywrapper.o greenstone3-with-java.jar.o search4j.o java.o"/>
+				<arg line="-static -static-libgcc -o  ../greenstone-${version}-linux-with-java.bin wrapper.o greenstone2-with-java.jar.o search4j.o java.o"/>
 			</exec>
-
-
 
 		</if>
 	</target>
 
-	<target name="clean-up-after-wrapping">
-		<if><bool><istrue value="${execute}"/></bool>
-			<delete dir="${basedir}/wrapped-installer/build"/>
-		</if>
-	</target>
-
-
-
 </project>
Index: /release-kits/lirk2/installer/antinstall-config.xml
===================================================================
--- /release-kits/lirk2/installer/antinstall-config.xml	(revision 15979)
+++ /release-kits/lirk2/installer/antinstall-config.xml	(revision 15980)
@@ -7,6 +7,6 @@
 			debug="false"
 			lookAndFeel="org.tp23.jgoodies.plaf.plastic.PlasticXPLookAndFeel"
-			name="Greenstone3 @version@ Installer"
-			windowIcon="/resources/gs3-small.png"
+			name="Greenstone-@version@ Installer"
+			windowIcon="/resources/gs2-small.png"
 			defaultImageResource="/resources/makewavesdawn.png"
 			minJavaVersion="1.4">
@@ -18,5 +18,5 @@
 
 	<!--  type="license" shows a license page to click through -->
-	<page type="license" name="license" resource="/LICENSE.txt"  displayText="" />
+	<page type="license" name="license" resource="/COPYING"  displayText="" />
 
 	<!--  install destination page -->
@@ -37,20 +37,9 @@
 		<target target="install-core-components" 	defaultValue="true" force="true" displayText="" />
 		<target target="install-java" 				defaultValue="true" displayText="" /> <!-- bundled java only -->
-		<target target="install-tomcat"				defaultValue="true" displayText="" />
-		<target target="install-ant"					defaultValue="true" displayText="" />
 		<target target="install-source-code"		defaultValue="false" displayText="" />
 
 	</page>
 
-	<page type="input" name="tomcat-config" ifProperty="(${install-tomcat}==true)" displayText="">
-
-		<text property="tomcat.server" defaultValue="localhost" displayText=""/>
-		<text property="tomcat.port" defaultValue="8080" displayText=""/>
-		<text property="tomcat.shutdown.port" defaultValue="8005" displayText=""/>
-
-	</page>
-
-	<page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText="">
-	</page>
+	<page type="progress" name="progress" showTargets="false" target="cleanuptarget" displayText=""></page>
 
 </installer>
Index: /release-kits/lirk2/installer/build.xml
===================================================================
--- /release-kits/lirk2/installer/build.xml	(revision 15979)
+++ /release-kits/lirk2/installer/build.xml	(revision 15980)
@@ -23,35 +23,32 @@
 	<target name="install-core-components" depends="">
 
-		<!-- create the installation directory -->
-		<echo message="Creating Installation directory"/>
 		<echo>basedir: ${basedir}</echo>
 		<echo>installDir: ${installDir}</echo>
 		<echo>antinstaller.jar: ${antinstaller.jar}</echo>
+
+		<!-- create the installation directory -->
+		<echo message="Creating Installation directory"/>
 		<mkdir dir="${installDir}"/>
 
 
-		<!-- install binaries and set executable -->
+		<!-- install files -->
+		<echo message="Installing GLI (gli)"/>
+		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="gli/**/*"/></patternset></unzip>
+		<echo/>
+
 		<echo message="Installing Executable Binaries (bin)"/>
 		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="bin/**/*"/></patternset></unzip>
 		<echo/>
 
-		<echo message="Installing Documentation (docs)"/>
-		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="docs/**/*"/></patternset></unzip>
+		<echo message="Installing CGI Binaries (cgi-bin)"/>
+		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="cgi-bin/**/*"/></patternset></unzip>
 		<echo/>
 
-		<echo message="Installing GLI (gli)"/>
-		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="gli/**/*"/></patternset></unzip>
+		<echo message="Installing Config Folder (etc)"/>
+		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="etc/**/*"/></patternset></unzip>
 		<echo/>
 
-		<echo message="Installing gs2build (gs2build)"/>
-		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="gs2build/**/*"/></patternset></unzip>
-		<echo/>
-
-		<echo message="Installing Libraries (lib)"/>
-		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="lib/**/*"/></patternset></unzip>
-		<echo/>
-
-		<echo message="Installing Web Content (web)"/>
-		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="web/**/*"/></patternset></unzip>
+		<echo message="Installing mappings (mappings)"/>
+		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="mappings/**/*"/></patternset></unzip>
 		<echo/>
 
@@ -60,6 +57,22 @@
 		<echo/>
 
-		<echo message="Installing Resources (resources)"/>
-		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="resources/**/*"/></patternset></unzip>
+		<echo message="Installing Images (images)"/>
+		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="images/**/*"/></patternset></unzip>
+		<echo/>
+
+		<echo message="Installing Perl Libraries (perllib)"/>
+		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="perllib/**/*"/></patternset></unzip>
+		<echo/>
+
+		<echo message="Installing Indexers (indexers)"/>
+		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="indexers/**/*"/></patternset></unzip>
+		<echo/>
+
+		<echo message="Installing Macros (macros)"/>
+		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="macros/**/*"/></patternset></unzip>
+		<echo/>
+
+		<echo message="Installing Collect Folder (collect)"/>
+		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="collect/**/*"/></patternset></unzip>
 		<echo/>
 
@@ -67,11 +80,22 @@
 		<unzip src="${antinstaller.jar}" dest="${installDir}">
 			<patternset>
-				<include name="build.xml"/>
-				<include name="build.properties"/>
-				<include name="gs3-server.sh"/>
-				<include name="gs3-setup.sh"/>
-				<include name="LICENSE.txt"/>
-				<include name="README.txt"/>
-				<include name="server.jar"/>
+				<include name="config.sub"/>
+				<include name="configure.in"/>
+				<include name="install-sh"/>
+				<include name="setup.bash"/>
+				<include name="config.h.in"/>
+				<include name="configtest.pl"/>
+				<include name="WIN32cfg.h"/>
+				<include name="acconfig.h"/>
+				<include name="COPYING"/>
+				<include name="config.guess"/>
+				<include name="Install.txt"/>
+				<include name="configure"/>
+				<include name="win32.mak"/>
+				<include name="setup.csh"/>
+				<include name="Install.sh"/>
+				<include name="Makefile.in"/>
+				<include name="micotest.cpp"/>
+				<include name="aclocal.m4"/>
 			</patternset>
 		</unzip>
@@ -79,48 +103,10 @@
 
 		<echo message="Setting Binaries to Executable"/>
-		<chmod dir="${installDir}" includes="*.sh" perm="775"/>
-		<chmod dir="${installDir}/bin/script" includes="*" perm="775"/>
-		<chmod dir="${installDir}/bin" includes="*" perm="775"/>
-		<chmod dir="${installDir}/packages/tomcat/bin" includes="*.sh" perm="775"/>
-		<chmod dir="${installDir}/packages/ant/bin" includes="*" perm="775"/>
-		<chmod dir="${installDir}/gs2build/bin/linux" includes="*" perm="775"/>
-		<chmod dir="${installDir}/gs2build/bin/script" includes="**/*" perm="775"/>
+		<chmod dir="${installDir}" includes="*.sh,*.bash" perm="775"/>
+		<chmod dir="${installDir}/bin/linux" includes="*" perm="775"/>
+		<chmod dir="${installDir}/cgi-bin" includes="*" perm="775"/>
+		<chmod dir="${installDir}/bin/script" includes="**/*" perm="775"/>
 		<chmod dir="${installDir}/gli" includes="*.sh" perm="775"/>
 		<echo/>
-
-		<!-- change the tomcat ports in build.properties -->
-		<echo message="Changing tomcat ports in build.properties"/>
-		<rsr file="${installDir}/build.properties" pattern="(tomcat.port[=:]).*" replacement="$1${tomcat.port}" />
-		<rsr file="${installDir}/build.properties" pattern="(tomcat.shutdown.port[=:]).*" replacement="$1${tomcat.shutdown.port}" />
-
-		<!-- change the tomcat ports in tomcats server.xml -->
-		<echo message="Changing tomcat ports tomcat's server.xml"/>
-		<copy file="${installDir}/resources/tomcat/server.xml" tofile="${installDir}/packages/tomcat/conf/server.xml" overwrite="true"/>
-		<rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@port@(.*)" replacement="$1${tomcat.port}$2" />
-		<rsr file="${installDir}/packages/tomcat/conf/server.xml" pattern="(.*)@shutdown-port@(.*)" replacement="$1${tomcat.shutdown.port}$2" />
-		
-		<!-- copy the greenstone3.xml file to tomcat -->
-		<echo message="Copying greenstone3.xml to tomcat directory"/>
-		<copy file="${installDir}/resources/tomcat/greenstone3.xml" tofile="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"/>
-		<rsr file="${installDir}/packages/tomcat/conf/Catalina/localhost/greenstone3.xml" pattern="(.*)@gsdl3webhome@(.*)" replacement="$1${installDir}/web$2" />
-
-		<!-- set up global properties -->
-		<echo message="Setting up global properties"/>
-		<copy file="${installDir}/resources/java/global.properties.in" tofile="${installDir}/web/WEB-INF/classes/global.properties" overwrite="true"/>
-		<rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
-		<rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.server@(.*)" replacement="$1localhost$2" />
-		<rsr file="${installDir}/web/WEB-INF/classes/global.properties" pattern="(.*)@tomcat.port@(.*)" replacement="$1${tomcat.port}$2" />
-
-		<!-- set up log4j properties-->
-		<echo message="Setting up log4j properties"/>
-		<copy file="${installDir}/resources/java/log4j.properties.in" tofile="${installDir}/web/WEB-INF/classes/log4j.properties" overwrite="true"/>
-		<rsr file="${installDir}/web/WEB-INF/classes/log4j.properties" pattern="(.*)@gsdl3home@(.*)" replacement="$1${installDir}/web$2" />
-
-
-		<!-- in the gs3-setup.sh file, set ANT_HOME and put it in PATH (no need anymore)-->
-		<!--<echo>In the gs3-setup.sh file, set ANT_HOME and put it in PATH</echo>
-		<exec executable="echo" output="${installDir}/gs3-setup.sh" append="true">
-			<arg line="export ANT_HOME=${installDir}/packages/ant; export PATH=$ANT_HOME/bin:$PATH;"/>
-		</exec>-->
 
 		<!-- delete unneeded files -->	    
@@ -137,9 +123,5 @@
 		<echo message="Installing Source Code (src)"/>
 		<mkdir dir="${installDir}/src"/>
-		<unzip src="${antinstaller.jar}" dest="${installDir}">
-			<patternset>
-				<include name="src/**/*"/>
-			</patternset>
-		</unzip>
+		<unzip src="${antinstaller.jar}" dest="${installDir}"><patternset><include name="src/**/*"/></patternset></unzip>
 	</target>
 
@@ -152,14 +134,4 @@
 	</target>
 
-	<target name="install-tomcat">
-		<echo message="Installing Tomcat"/>
-	</target>
-
-	<target name="install-ant">
-		<echo message="Installing Ant"/>
-	</target>
-
-
-
 	<target name="cleanuptarget">
 	</target>
Index: lease-kits/lirk2/installer/createLanguagePack.sh
===================================================================
--- /release-kits/lirk2/installer/createLanguagePack.sh	(revision 15979)
+++ 	(revision )
@@ -1,37 +1,0 @@
-#!/bin/sh
-
-# This script creates properties files stubs from the antinstall-config.xml file
-#
-# it only works if attributes are placed on separate lines
-
-dir=`expr  match "$0" '\(.*\)createResourceStub.sh'`
-#  if it we did not call ./  change to the directory we called
-if [ "$dir" != "./" ] ; then
-   if [ "$dir" != "" ] ;  then
-      cd "$dir" ;
-   fi
-fi
-
-if [ "$ANT_INSTALL_HOME" == "" ] ; then 
-  export ANT_INSTALL_HOME=../../../..
-fi
-
-if [ ! -f $ANT_INSTALL_HOME/lib/ant-installer.jar ] ; then 
-  echo "set ANT_INSTALL_HOME"
-  exit 1;
-fi
-
-if [ "$JAVA_HOME" = "" ] ; then
-	echo set JAVA_HOME;
-	exit 1;
-fi
-
-
-CLASSPATH=$ANT_INSTALL_HOME/lib/xercesImpl.jar:$ANT_INSTALL_HOME/lib/xml-apis.jar:$ANT_INSTALL_HOME/lib/ant-installer.jar:$ANT_INSTALL_HOME/lib/ant-installer-ext.jar
-CLASSPATH=$CLASSPATH:$ANT_INSTALL_HOME/antlib/ant.jar:$ANT_INSTALL_HOME/antlib/ant-launcher.jar
-CLASSPATH=$CLASSPATH:$ANT_INSTALL_HOME/lib/jgoodies-edited-1_2_2.jar
-CLASSPATH=$CLASSPATH:./cp
-
-COMMAND=$JAVA_HOME/bin/java
-
-$COMMAND -classpath $CLASSPATH  org.tp23.antinstaller.util.CreateLanguagePack
Index: /release-kits/lirk2/wrapper/mywrapper.c
===================================================================
--- /release-kits/lirk2/wrapper/mywrapper.c	(revision 15979)
+++ /release-kits/lirk2/wrapper/mywrapper.c	(revision 15980)
@@ -12,10 +12,11 @@
 
 	string tempdir = (string)argv[0] + ".tmp"; //temporary directory where we will store extracted files
-	string jarfile = tempdir + "/greenstone3.jar"; //where we will store the jar file
+	string jarfile = tempdir + "/greenstone2.jar"; //where we will store the jar file
 	string search4jfile = tempdir + "/search4j"; //where we will store the jar file
+	string javafile = tempdir + "/@java.installer@"; //where we will store the java tar file
 	bool succeeded = false;
 
 	//create the temp folder
-	cout << "Creating temp directory" << endl;
+	cout << "Creating temp directory..." << endl;
 	succeeded = ( 0 == system( ("mkdir " + tempdir).c_str() ) );
 	if ( !succeeded ) {
@@ -28,78 +29,62 @@
 	//extract files
 	cout << "Extracting installer jar..." << endl;
-	succeeded = extract_bundled_file( greenstone3jar, sizeof(greenstone3jar), (char*)jarfile.c_str(), false);
+	succeeded = extract_bundled_file( greenstone2jar, sizeof(greenstone2jar), (char*)jarfile.c_str(), false);
+
+	cout << "Extracting search4j tool..." << endl;
+	succeeded = extract_bundled_file( search4j, sizeof(search4j), (char*)search4jfile.c_str(), true ) && succeeded;
+
+	#ifdef java_is_bundled
+	cout << "Extracting bundled java..." << endl;
+	succeeded = extract_bundled_file( java, sizeof(java), (char*)javafile.c_str(), true ) && succeeded;
+	#endif
+		
 	if ( !succeeded ) {
-		cout << "failed" << endl;
-		cout << "Failed to extract the JAR file to '" << jarfile << "'" << endl;
-		cout << "The file may be corrupt or missing" << endl;
-		cout << "Or this installer may not have sufficient file permissions to write it to disk" << endl;
+		cout << "Failed to extract one or more resources" << endl;
+		cout << "This installer may not have sufficient file permissions to write it to disk" << endl;
+		cout << "Or, the files may be corrupt or missing from this executable" << endl;
 		cout << "Exiting" << endl;
 		return 1;
 	}
 
-	cout << "Extracting search4j tool..." << endl;
-	succeeded = extract_bundled_file( search4j, sizeof(search4j), (char*)search4jfile.c_str(), true );
+	//change to the temp directory
+	chdir( tempdir.c_str() );
+
+	#ifdef java_is_bundled
+	succeeded = (system( "tar -xzf @java.installer@" ) == 0);
 	if ( !succeeded ) {
-		cout << "failed" << endl;
-		cout << "Failed to extract the search4j tool to '" << jarfile << "'" << endl;
-		cout << "The file may be corrupt or missing" << endl;
-		cout << "Or this installer may not have sufficient file permissions to write it to disk" << endl;
+		cout << "Failed to extract the bundled java archive to the temp directory" << endl;
+		cout << "You need the tar program on your PATH" << endl;
 		cout << "Exiting" << endl;
 		return 1;
 	}
-
-
-	//change to the temp directory
-	chdir( tempdir.c_str() );
-
+	#endif
 
 	//check if an appropriate java is found
 	bool jvmFound = (system( "./search4j -m @java.min.version@ -h ./@java.extracted@" ) == 0);
 
-	//if the jvm was not found, try to fix it and find it
+	//if the jvm was not found, report not found
 	if ( !jvmFound ) {
+
 		//did not find a good java
-		cout << "Greenstone requires java @java.min.version@ or greater" << endl;
+		cout << "Greenstone requires java @java.min.version@ or greater." << endl;
 		
 		//tell them if java is absent or just too old
 		if ( system( "./search4j -h ./@java.extracted@" ) == 0 ) {
-			cout << "Your java is too old." << endl;
+			cout << "You have java, but it is too old." << endl;
 		} else {
 			cout << "Could not find java on your system." << endl;
 		}
-		
-		//is this an installer with the bundled JRE?
-		
-		#ifdef java_is_bundled
-			//yes, JRE is bundled
-			/*
-			cout
-				<< "This installer comes bundled with a suitible version of java: " << endl
-				<< "   @java.installer@" << endl
-				<< "Do you want to install this java? (y/n)" << endl;
-			char r[1024]; cin >> r;
-			if ( strcmp( r, "y" ) == 0 || strcmp( r, "Y" ) == 0) {
-			*/
 
-			cout << "Using bundled java." << endl;
-			extract_bundled_file( java, sizeof(java), (char*)"@java.installer@", true );
-			system( "tar -xzf @java.installer@" );
-			jvmFound = true; //assume the java installation went well
-
-			/*}*/
+		cout << "Install java (@java.min.version@ or greater) and set JAVA_HOME or JRE_HOME, and try again" << endl;
+		#ifndef java_is_bundled
+		cout << "Or, download a greentsone3 installer with bundled java and use that instead of this one" << endl;
 		#endif
 
-		#ifndef java_is_bundled
-			//no, JRE is not bundled
-			cout << "Install java (@java.min.version@ or greater) and set JAVA_HOME or JRE_HOME, and try again" << endl;
-			cout << "Or, download a greentsone3 installer with bundled java and use that instead of this one" << endl;
-		#endif
-	}
+	//if we have found it, launch the installer
+	} else {
 
-	//if we have found it by now, launch the installer
-	if ( jvmFound ) {
 		cout << "Launching Installer ..." << endl;
 		int launch_exit_code = 0;
-		launch_exit_code = system("./search4j -m @java.min.version@ -l greenstone3.jar -h ./@java.extracted@");
+		launch_exit_code = system("./search4j -m @java.min.version@ -l greenstone2.jar -h ./@java.extracted@");
 
 		//report how it went
@@ -107,6 +92,6 @@
 			cout << "Setup complete" << endl;
 		} else {
-			cout << "Still could not find a suitible version of java" << endl;
-			cout << "Please install java, set JAVA_HOME or JRE_HOME, and try again" << endl;
+			cout << "The installer exited with an error" << endl;
+			cout << "Greenstone may not be correctly installed" << endl;
 		}
 
@@ -119,5 +104,4 @@
 	cout << "Deleting the temp directory" << endl;
 	system( ("rm -rf " + tempdir).c_str() );
-
 
 	return 0;
