Changeset 25570

Show
Ignore:
Timestamp:
10.05.2012 16:56:37 (7 years ago)
Author:
sjm84
Message:

CGI capabilities are now on by default. The build.xml file will insert the necessary perl path into the web.xml file

Location:
main/trunk/greenstone3
Files:
1 added
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/build.xml

    r25549 r25570  
    912912    <filter token="tomcat.port" value="${tomcat.port}"/> 
    913913    <filter token="perlpath" value="${escaped.perl.path}"/> 
     914    <filter token="disable.collection.building" value="${disable.collection.building}"/> 
    914915    <copy file="${basedir}/resources/java/global.properties.in" tofile="${web.classes}/global.properties" filtering="true" overwrite="true"/> 
    915916    <copy file="${basedir}/resources/java/log4j.properties.in" tofile="${web.classes}/log4j.properties" filtering="true" overwrite="true"/> 
     
    10351036  <target name="configure-tomcat" depends="init,configure-tomcat-local,configure-tomcat-external"/> 
    10361037   
    1037   <target name="configure-tomcat-local" depends="init" if="tomcat.islocal"> 
     1038  <target name="configure-tomcat-local" depends="init,perl-for-building" if="tomcat.islocal"> 
    10381039    <!-- re-setup the server.xml file --> 
    10391040    <copy file="${basedir}/resources/tomcat/server_tomcat${tomcat.version.major}.xml" 
     
    10511052      </filterset> 
    10521053    </copy> 
     1054     
     1055    <!-- set up the greenstone3 web.xml file --> 
     1056    <copy file="${basedir}/resources/tomcat/web.xml" tofile="${packages.home}/tomcat/conf/web.xml" overwrite="true"> 
     1057        <filterset> 
     1058            <filter token="perlpath" value="${perl.path}"/> 
     1059        </filterset> 
     1060    </copy> 
    10531061  </target> 
    10541062 
     
    19761984      <arg value="export"/> 
    19771985      <arg value="-r"/><arg value="${branch.revision}"/> 
    1978       <arg value="${svn.root}/main/${branch.path}/greenstone2/cgi-bin/gliserver.pl"/> 
     1986      <arg value="${svn.root}/main/${branch.path}/greenstone2/common-src/cgi-bin/gliserver.pl"/> 
    19791987    </exec> 
    19801988    <exec executable="svn" dir="web/WEB-INF/cgi"> 
    19811989      <arg value="export"/> 
    19821990      <arg value="-r"/><arg value="${branch.revision}"/> 
    1983       <arg value="${svn.root}/main/${branch.path}/greenstone2/cgi-bin/gsdlCGI.pm"/> 
     1991      <arg value="${svn.root}/main/${branch.path}/greenstone2/common-src/cgi-bin/gsdlCGI.pm"/> 
    19841992    </exec> 
    19851993