Changeset dd9cae5 for build.xml


Ignore:
Timestamp:
Jan 2, 2012 12:59:33 AM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
0ad4789
Parents:
84e4558 (diff), 33b25b57 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '83079d347b764886d77d9d9de902011f09f5dcce'

and 'c76215859aa3b76a04c4a83a1ded20548a8773a6'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • build.xml

    r84e4558 rdd9cae5  
    421421                <pathelement location="apps/jetty/jettylib/jetty-sslengine.jar" />
    422422                <pathelement location="apps/jetty/jettylib/jetty-start.jar" />
    423                 <pathelement location="apps/jetty/jettylib/jetty-threadpool.jar" />
     423                <pathelement location="apps/jetty/jettylib/jetty-java5-threadpool.jar" />
    424424                <pathelement location="apps/jetty/jettylib/jetty-util.jar" />
    425425                <pathelement location="apps/jetty/jettylib/jsp-api.jar" />
     
    944944          -->
    945945        <copy todir="pkg-temp/eepsite-jetty6" >
    946             <fileset dir="installer/resources/eepsite" includes="jetty.xml jetty-ssl.xml contexts/* etc/*" />
     946            <fileset dir="installer/resources/eepsite" includes="*.xml contexts/* etc/*" />
    947947        </copy>
    948948    </target>
Note: See TracChangeset for help on using the changeset viewer.