Changeset 15028

Show
Ignore:
Timestamp:
02.03.2008 13:08:33 (12 years ago)
Author:
shaoqun
Message:

copy xalan.jar into tomcat endorsed dir on mac

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/trunk/build.xml

    r14995 r15028  
    2323    <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="project.classpath"/> 
    2424    <taskdef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpath="${basedir}/lib/java/anttasks.jar"/> 
    25  
    2625 
    2726<!-- ===================== Property Definitions =========================== --> 
     
    458457  <target name="activate-xalan-jar" if="need.xalan.jar"> 
    459458    <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/> 
     459    <copy file="${web.lib}/xalan.jar.tmp" tofile="${tomcat.installed.path}/common/endorsed/xalan.jar" if="current.os.ismac"/>  
    460460  </target> 
    461461   
     
    14341434      <checkout url="${flax.svn.root}/flax1.0/trunk/web/sites/flax/"  
    14351435                destPath="${basedir}/web/sites/flax"/> 
     1436      <checkout url="${flax.svn.root}/flax1.0/trunk/resources/flax-build.xml" 
     1437                destPath="${basedir}"/> 
    14361438    </svn> 
    14371439    <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/> 
    14381440    <copy file="${basedir}/web/WEB-INF/classes/flax/web.xml" todir="${basedir}/web/WEB-INF" /> 
    1439  
     1441  
    14401442    <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/> 
    1441     <!-- betterfa --> 
    1442     <unzip src="${coll.dir}/betterfa/archives/archives.zip" dest="${coll.dir}/betterfa/archives"/> 
    1443     <unzip src="${coll.dir}/betterfa/import/import.zip" dest="${coll.dir}/betterfa/import"/> 
    1444     <unzip src="${coll.dir}/betterfa/index/index.zip" dest="${coll.dir}/betterfa/index"/> 
    1445     <!-- imagegue --> 
    1446     <unzip src="${coll.dir}/imagegue/archives/archives.zip" dest="${coll.dir}/imagegue/archives"/> 
    1447     <unzip src="${coll.dir}/imagegue/import/import.zip" dest="${coll.dir}/imagegue/import"/> 
    1448     <unzip src="${coll.dir}/imagegue/index/index.zip" dest="${coll.dir}/imagegue/index"/> 
    1449     <!-- wikill --> 
    1450     <unzip src="${coll.dir}/wikill/archives/archives.zip" dest="${coll.dir}/wikill/archives"/> 
    1451     <unzip src="${coll.dir}/wikill/import/import.zip" dest="${coll.dir}/wikill/import"/> 
    1452     <unzip src="${coll.dir}/wikill/index/index.zip" dest="${coll.dir}/wikill/index"/> 
    1453  
     1443    <unzip dest="${coll.dir}">   
     1444       <fileset dir="${coll.dir}"> 
     1445          <include name="*.zip"/> 
     1446       </fileset>     
     1447    </unzip>     
     1448    <delete> 
     1449     <fileset dir="${coll.dir}" includes="*.zip"/> 
     1450    </delete> 
    14541451  </target> 
    14551452