Changeset 4042


Ignore:
Timestamp:
Dec 6, 2007, 12:55:29 PM (16 years ago)
Author:
Nicklas Nordborg
Message:

Fixes problem with 'ant web.jsp' target if Tomcat 6 is used.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r4018 r4042  
    901901    <path id="jsp.precompile.classpath">
    902902      <pathelement location="${java.home}/../lib/tools.jar" />
    903       <fileset dir="${env.CATALINA_HOME}/server/lib">
    904         <include name="*.jar" />
    905       </fileset>
    906       <fileset dir="${env.CATALINA_HOME}/common/lib">
    907         <include name="*.jar" />
     903      <fileset dir="${env.CATALINA_HOME}">
     904        <include name="**/lib/*.jar" />
     905        <exclude name="webapps/**" />
    908906      </fileset>
    909907      <fileset dir="${env.CATALINA_HOME}/bin">
    … …  
    913911   
    914912    <path id="jsp.compile.classpath">
    915       <path refid="web.classpath" />
    916       <pathelement location="${java.home}/../lib/tools.jar" />
    917       <fileset dir="${env.CATALINA_HOME}/common/lib">
    918         <include name="*.jar" />
    919       </fileset>
    920       <fileset dir="${env.CATALINA_HOME}/shared/lib">
    921         <include name="*.jar" />
    922       </fileset>
     913      <path refid="jsp.precompile.classpath" />
    923914      <fileset dir="${web.inf}/lib">
    924915        <include name="*.jar" />
    925916      </fileset>
     917      <pathelement location="${info.build}" />
    926918    </path>
    927919
Note: See TracChangeset for help on using the changeset viewer.