Menu
▾
▴
[Archive-access-cvs] archive-access/projects/wera/src/installer build-retriever.xml,NONE,1.1 antinstall-config.xml,1.1,1.2 build.xml,1.1,1.2 build-wera.xml,1.1,1.2
|
From: Sverre B. <sv...@us...> - 2005-10-21 11:12:19
|
Update of /cvsroot/archive-access/archive-access/projects/wera/src/installer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6051/src/installer Modified Files: antinstall-config.xml build.xml build-wera.xml Added Files: build-retriever.xml Log Message: praparations for release 4 Index: build-wera.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/installer/build-wera.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build-wera.xml 4 Oct 2005 22:59:27 -0000 1.1 --- build-wera.xml 21 Oct 2005 11:12:07 -0000 1.2 *************** *** 17,23 **** <!-- Properties for generating documentation --> ! <property name="input.file" value="${cvsexport}/wera/doc/manual.xml"/> ! <property name="output.html" value="${cvsexport}/manual/manual.html"/> ! <property name="output.pdf" value="${cvsexport}/manual/manual.pdf"/> <property name="docbook.dir" value="/usr/share/xml/docbook" /> <property name="saxon.dir" value="/usr/share/saxon" /> --- 17,26 ---- <!-- Properties for generating documentation --> ! <property name="releasenotes.xml" value="${cvsexport}/archive-access/projects/wera/src/articles/releasenotes.xml"/> ! <property name="releasenotes.html" value="${cvsexport}/releasenotes.html"/> ! ! <property name="input.file" value="${cvsexport}/archive-access/projects/wera/src/articles/manual.xml"/> ! <property name="output.html" value="${cvsexport}/articles/manual.html"/> ! <property name="output.pdf" value="${cvsexport}/articles/manual.pdf"/> <property name="docbook.dir" value="/usr/share/xml/docbook" /> <property name="saxon.dir" value="/usr/share/saxon" /> *************** *** 27,39 **** <echo message="Fetching source code ... "/> <tstamp> ! <format property="werabuildtime" pattern="yyyyMMddHHmm"/> </tstamp> <if> <equals arg1="${wera.cvstag}" arg2="head" /> <then> ! <property name="werapack" value="wera-${werabuildtime}"/> <echo message="Package name: ${werapack}"/> <echo message="Retrieving most recent files from cvs"/> ! <cvs command="export" cvsRoot=":ext:${nwa.sfuser}@cvs.sf.net:/cvsroot/nwatoolset" package="retriever wera" date="tomorrow" dest="${cvsexport}" failonerror="true"/> </then> <elseif> --- 30,42 ---- <echo message="Fetching source code ... "/> <tstamp> ! <format property="weraversion" pattern="yyyyMMddHHmm"/> </tstamp> <if> <equals arg1="${wera.cvstag}" arg2="head" /> <then> ! <property name="werapack" value="wera-${weraversion}"/> <echo message="Package name: ${werapack}"/> <echo message="Retrieving most recent files from cvs"/> ! <cvs command="export" cvsRoot=":ext:${nwa.sfuser}@cvs.sf.net:/cvsroot/archive-access" package="archive-access/projects/wera/src archive-access/projects/wera/lib" date="tomorrow" dest="${cvsexport}" failonerror="true"/> </then> <elseif> *************** *** 44,67 **** <fileset dir="cvslocal"/> </copy> ! <property name="werapack" value="wera-test-${werabuildtime}"/> </then> </elseif> <else> <echo message="Retrieving files with tag ${wera.cvstag} from cvs"/> ! <cvs command="export" cvsRoot=":ext:${nwa.sfuser}@cvs.sf.net:/cvsroot/nwatoolset" package="retriever wera" tag="${wera.cvstag}" dest="${cvsexport}" failonerror="true"/> <property name="werapack" value="${wera.cvstag}"/> <echo message="Package name: ${werapack}"/> </else> </if> ! <delete file="${cvsexport}/wera/gui/lib/config.inc"/> <echo message="Generating documentation"/> ! <mkdir dir="${cvsexport}/manual"/> ! <copy todir="${cvsexport}/manual"> ! <fileset dir="${cvsexport}/wera/doc"> <include name="images/*"/> - <include name="RELEASE-NOTES"/> </fileset> </copy> --- 47,70 ---- <fileset dir="cvslocal"/> </copy> ! <property name="werapack" value="wera-test-${weraversion}"/> </then> </elseif> <else> <echo message="Retrieving files with tag ${wera.cvstag} from cvs"/> ! <cvs command="export" cvsRoot=":ext:${nwa.sfuser}@cvs.sf.net:/cvsroot/archive-access" package="archive-access/projects/wera/src archive-access/projects/wera/lib" tag="${wera.cvstag}" dest="${cvsexport}" failonerror="true"/> <property name="werapack" value="${wera.cvstag}"/> + <property name="weraversion" value="${wera.cvstag}"/> <echo message="Package name: ${werapack}"/> </else> </if> ! <delete file="${cvsexport}/archive-access/projects/wera/src/webapps/wera/lib/config.inc"/> <echo message="Generating documentation"/> ! <mkdir dir="${cvsexport}/articles"/> ! <copy todir="${cvsexport}/articles"> ! <fileset dir="${cvsexport}/archive-access/projects/wera/src/articles"> <include name="images/*"/> </fileset> </copy> *************** *** 81,85 **** <arg value="${docbook.dir}/stylesheet/nwalsh/current/html/docbook.xsl"/> </java> ! <echo message="Creating manual.pdf"/> <java classname="org.apache.fop.apps.Fop" fork="true"> <classpath refid="fop.classpath"/> --- 84,93 ---- <arg value="${docbook.dir}/stylesheet/nwalsh/current/html/docbook.xsl"/> </java> ! <echo message="Creating releasenotes.html"/> ! <java jar="${saxon.dir}/saxon.jar" fork="true" output="${releasenotes.html}"> ! <arg value="${releasenotes.xml}"/> ! <arg value="${docbook.dir}/stylesheet/nwalsh/current/html/docbook.xsl"/> ! </java> ! <!-- <echo message="Creating manual.pdf"/> <java classname="org.apache.fop.apps.Fop" fork="true"> <classpath refid="fop.classpath"/> *************** *** 87,109 **** <arg line="-xsl ${docbook.dir}/stylesheet/nwalsh/current/fo/docbook.xsl"/> <arg value="${output.pdf}"/> ! </java> ! <echo message="Building ARC Retriever"/> ! <ant dir="${cvsexport}/retriever/arcretriever"/> <zip file="./wera.zip"> <zipfileset dir="${cvsexport}"> ! <include name="manual/**/*"/> ! <include name="wera/gui/**/*"/> </zipfileset> ! <zipfileset dir="${cvsexport}/retriever/arcretriever"> ! <include name="ArcRetriever.war"/> </zipfileset> - <!--<zipfileset dir="${cvsexport}/nutchwax"> - <include name="archive-access-nutch.war"/> - </zipfileset>--> </zip> ! <echo message="Building manual install package"/> <property name="manualinstalldir" location="${basedir}/manual-install"/> <delete dir="${manualinstalldir}"/> --- 95,123 ---- <arg line="-xsl ${docbook.dir}/stylesheet/nwalsh/current/fo/docbook.xsl"/> <arg value="${output.pdf}"/> ! </java>--> ! <delete dir="arcretriever"/> ! ! <echo message="Building ARC Retriever"/> ! <ant antfile="build-retriever.xml"/> ! ! <replace file="${cvsexport}/archive-access/projects/wera/src/webapps/wera/lib/header.inc"> ! <replacefilter token="@VERSION@" value="${weraversion}"/> ! </replace> <zip file="./wera.zip"> <zipfileset dir="${cvsexport}"> ! <include name="articles/**/*"/> ! <include name="**/releasenotes.html"/> </zipfileset> ! <zipfileset dir="${cvsexport}/archive-access/projects/wera/src/webapps/wera"> ! <include name="**/*"/> ! </zipfileset> ! <zipfileset dir="."> ! <include name="arcretriever/**/*"/> </zipfileset> </zip> ! <!-- <echo message="Building manual install package"/> <property name="manualinstalldir" location="${basedir}/manual-install"/> <delete dir="${manualinstalldir}"/> *************** *** 132,136 **** <replacefilter token="@retrieverUrl@" value="http://localhost:8080/ArcRetriever/ArcRetriever"/> <replacefilter token="@guiUrl@" value="http://localhost/wera"/> - <!--<replacefilter token="@guiCollection@" value="${guiCollection}"/>--> <replacefilter token="@collection@" value="test"/> <replacefilter token="@searchEngine@" value="nutch"/> --- 146,149 ---- *************** *** 142,146 **** <tar tarfile="${werapack}-manual-install.tar" basedir="${manualinstalldir}"/> <gzip zipfile="${werapack}-manual-install.tar.gz" src="${werapack}-manual-install.tar"/> ! <delete file="${werapack}-manual-install.tar"/> <echo message="Building Installer package"/> --- 155,159 ---- <tar tarfile="${werapack}-manual-install.tar" basedir="${manualinstalldir}"/> <gzip zipfile="${werapack}-manual-install.tar.gz" src="${werapack}-manual-install.tar"/> ! <delete file="${werapack}-manual-install.tar"/> --> <echo message="Building Installer package"/> *************** *** 168,177 **** <copy todir="./selfextract"> ! <fileset dir="${cvsexport}/wera/installer"> <include name="install_info.txt"/> </fileset> </copy> <copy todir="./selfextract"> ! <fileset dir="${cvsexport}/wera/doc/images"> <include name="iipc.png"/> </fileset> --- 181,190 ---- <copy todir="./selfextract"> ! <fileset dir="${cvsexport}/archive-access/projects/wera/src/installer"> <include name="install_info.txt"/> </fileset> </copy> <copy todir="./selfextract"> ! <fileset dir="${cvsexport}/archive-access/projects/wera/src/articles/images"> <include name="iipc.png"/> </fileset> --- NEW FILE: build-retriever.xml --- <project name="webmodulebuilder" default="compile" basedir="."> <description> Build file WERA arcretriever </description> <property name="extralib" value="extralib"/> <!-- set global properties for this build --> <property name="webappsourcedir" value="cvsexport/archive-access/projects/wera/src/webapps/arcretriever" /> <property name="module" value="arcretriever" /> <property name="src" value="cvsexport/archive-access/projects/wera/src/java" /> <property name="lib" value="cvsexport/archive-access/projects/wera/lib" /> <copy todir="${lib}"> <fileset dir="${extralib}"> <!-- additional lib needed to build the arcretriever (servlet-2.3.jar). Don't know why this is not part of wera lib. What you say stack ? --> <include name="servlet-2.3.jar" /> </fileset> </copy> <property name="dist" value="arcretriever" /> <property name="warfile" value="${module}.war" /> <target name="clean"> <delete file="${warfile}" failonerror="false" /> <delete dir="${dist}" failonerror="false" /> </target> <target name="init"> <!-- Create the dist directory structure used by compile and copy the deployment descriptors into it--> <mkdir dir="${dist}" /> <mkdir dir="${dist}/images" /> <mkdir dir="${dist}/WEB-INF" /> <mkdir dir="${dist}/WEB-INF/classes" /> <mkdir dir="${dist}/WEB-INF/lib" /> <copy todir="${dist}"> <fileset dir="${webappsourcedir}"> <include name="**/*.jsp" /> <include name="**/*.css" /> <include name="LICENSE.TXT" /> </fileset> </copy> <copy todir="${dist}/WEB-INF"> <fileset dir="${webappsourcedir}/WEB-INF"> <include name="web.xml" /> <include name="arcretriever.properties" /> </fileset> </copy> <copy todir="${dist}/WEB-INF/lib"> <fileset dir="${lib}"> <include name="*.jar" /> </fileset> <fileset dir="${extralib}"> <include name="servlet-2.3.jar" /> </fileset> </copy> <copy todir="${dist}/images"> <fileset dir="${webappsourcedir}/images"> <include name="*.jpg" /> <include name="*.png" /> <include name="*.gif" /> </fileset> </copy> </target> <target name="compile" depends="init"> <javac destdir="${dist}/WEB-INF/classes" srcdir="${src}"> <classpath> <fileset dir="${lib}"> <include name="**/*.jar" /> </fileset> </classpath> </javac> </target> <!-- Move this to installer, because installer should update web.xml <target name="war" depends="compile"> <jar jarfile="${warfile}" basedir="${dist}" /> </target> --> </project> Index: build.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/installer/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.xml 4 Oct 2005 22:59:27 -0000 1.1 --- build.xml 21 Oct 2005 11:12:07 -0000 1.2 *************** *** 35,39 **** <mkdir dir="${apacheWebRootDir}/wera"/> <copy todir="${apacheWebRootDir}/wera"> ! <fileset dir="${basedir}/temp/wera/gui"/> </copy> --- 35,39 ---- <mkdir dir="${apacheWebRootDir}/wera"/> <copy todir="${apacheWebRootDir}/wera"> ! <fileset dir="${basedir}/temp"/> </copy> *************** *** 41,71 **** <mkdir dir="${apacheWebRootDir}/wera/manual/images"/> <copy file="${basedir}/temp/manual/manual.html" tofile="${apacheWebRootDir}/wera/manual/manual.html"/> ! <copy file="${basedir}/temp/manual/manual.pdf" tofile="${apacheWebRootDir}/wera/manual/manual.pdf"/> ! <copy file="${basedir}/temp/manual/RELEASE-NOTES" tofile="${apacheWebRootDir}/wera/RELEASE-NOTES"/> <copy todir="${apacheWebRootDir}/wera/manual/images"> <fileset dir="${basedir}/temp/manual/images"/> </copy> ! <copy file="${basedir}/temp/wera/gui/lib/config.inc.template" tofile="${apacheWebRootDir}/wera/lib/config.inc"/> <replace file="${apacheWebRootDir}/wera/lib/config.inc"> - <replacefilter token="@aidPrefix@" value="${arcDirectory}"/> - <replacefilter token="@aidSuffix@" value=".arc.gz"/> <replacefilter token="@guiInstallDir@" value="${apacheWebRootDir}/wera"/> <replacefilter token="@hostName@" value="${hostName}"/> ! <replacefilter token="@retrieverUrl@" value="http://${hostName}:${tomcatPort}/ArcRetriever/ArcRetriever"/> <replacefilter token="@guiUrl@" value="http://${apacheHostPort}/wera"/> - <!--<replacefilter token="@guiCollection@" value="${guiCollection}"/>--> <replacefilter token="@collection@" value="test"/> <replacefilter token="@searchEngine@" value="nutch"/> <replacefilter token="@searchEngineUrl@" value="http://${hostName}:${tomcatPort}/nutchwax/opensearch"/> </replace> - <echo message="Installing wera ARC Retriever"/> - <copy file="${basedir}/temp/ArcRetriever.war" tofile="${tomcatWebAppDir}/ArcRetriever.war"/> - - <!--<echo message="Installing Nutch ARC-indexer"/> - - <echo message="Installing Nutch Search Web Application"/> - <copy file="${basedir}/temp/archive-access-nutch.war" tofile="${tomcatWebAppDir}/archive-access-nutch.war"/>--> </target> --- 41,72 ---- <mkdir dir="${apacheWebRootDir}/wera/manual/images"/> <copy file="${basedir}/temp/manual/manual.html" tofile="${apacheWebRootDir}/wera/manual/manual.html"/> ! <!--<copy file="${basedir}/temp/manual/manual.pdf" tofile="${apacheWebRootDir}/wera/manual/manual.pdf"/>--> <copy todir="${apacheWebRootDir}/wera/manual/images"> <fileset dir="${basedir}/temp/manual/images"/> </copy> ! <copy file="${basedir}/temp/lib/config.inc.template" tofile="${apacheWebRootDir}/wera/lib/config.inc"/> <replace file="${apacheWebRootDir}/wera/lib/config.inc"> <replacefilter token="@guiInstallDir@" value="${apacheWebRootDir}/wera"/> <replacefilter token="@hostName@" value="${hostName}"/> ! <replacefilter token="@retrieverUrl@" value="http://${hostName}:${tomcatPort}/arcretriever/arcretriever"/> <replacefilter token="@guiUrl@" value="http://${apacheHostPort}/wera"/> <replacefilter token="@collection@" value="test"/> <replacefilter token="@searchEngine@" value="nutch"/> <replacefilter token="@searchEngineUrl@" value="http://${hostName}:${tomcatPort}/nutchwax/opensearch"/> </replace> + + <echo message="Installing ARC Retriever"/> + <replace file="${basedir}/temp/arcretriever/WEB-INF/web.xml"> + <replacefilter token="@arcdir@" value="${arcDirectory}"/> + </replace> + <jar jarfile="${tomcatWebAppDir}/arcretriever.war" basedir="${basedir}/temp/arcretriever" /> + + <!-- + <mkdir dir="${tomcatWebAppDir}/arcretriever"/> + <copy todir="${tomcatWebAppDir}/arcretriever"> + <fileset dir="${basedir}/temp/arcretriever"/> + </copy>--> </target> Index: antinstall-config.xml =================================================================== RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/installer/antinstall-config.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** antinstall-config.xml 4 Oct 2005 22:59:27 -0000 1.1 --- antinstall-config.xml 21 Oct 2005 11:12:07 -0000 1.2 *************** *** 8,13 **** displayText="" explanatoryText="Copyright (C) 2001-2005 Royal Library in Stockholm, Royal Library in Copenhagen, Helsinki University Library of Finland, National Library of Norway, National and University Library of Iceland."/> ! <comment displayText="http://nwatoolset.sourceforge.net/"/> ! <comment displayText="http://netpreserve.org/"/> </page> --- 8,12 ---- displayText="" explanatoryText="Copyright (C) 2001-2005 Royal Library in Stockholm, Royal Library in Copenhagen, Helsinki University Library of Finland, National Library of Norway, National and University Library of Iceland."/> ! <comment displayText="http://archive-access.sourceforge.net/projects/wera/"/> </page> *************** *** 21,26 **** <comment displayText=""/> <directory property="arcDirectory" defaultValue="/var/arcs" displayText="ARC file directory:" explanatoryText="Please enter the directory where the ARC files you have indexed /plan to index with nutchwax. The ARC retriever in this release has no knowledge of where ARC files recide. When WERA retrieves a specific archived document from the retriever the request has to include the full path to the ARC file in question. This will change in later releases."/> - <!--<directory property="nutchwaxDir" defaultValue="/usr/local/nutchwax" displayText="NutchWax install dir" create="true"/>--> - <!--<text property="guiCollection" defaultValue="test" displayText="Collection name:"/>--> </page> --- 20,23 ---- *************** *** 30,38 **** <text property="apachePort" defaultValue="80" displayText="Apache port number:"/> </page> ! <!-- ! <page type="input" name="searchengine" displayText="Nutch Search Engine" target="tginstall"> ! <text property="searchEngineUrl" defaultValue="http://${hostName}:${tomcatPort}/nutchwax/opensearch" displayText="Nutch A9 opensearch url:"/> ! </page> ! --> <page type="progress" name="progress" displayText="Installation progress" target="cleanuptarget"></page> --- 27,31 ---- <text property="apachePort" defaultValue="80" displayText="Apache port number:"/> </page> ! <page type="progress" name="progress" displayText="Installation progress" target="cleanuptarget"></page> |
