Index: release-kits/lirk2/ant-scripts/create-distribution.xml
===================================================================
--- release-kits/lirk2/ant-scripts/create-distribution.xml	(revision 15957)
+++ 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>
