gatormail-cvs

[Sandy M. <san...@us...>]

Update of /cvsroot/gatormail/GatorMail
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14137

Modified Files:
	build.xml 
Log Message:
Adds LDAP Connection pooling.

Index: build.xml
===================================================================
RCS file: /cvsroot/gatormail/GatorMail/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** build.xml	26 Aug 2005 18:55:01 -0000	1.22
--- build.xml	20 Sep 2005 15:22:15 -0000	1.23
***************
*** 20,24 ****
          <property name="gatormail.attachment.path" value="" description="Local path to hold attachments until they are sent."/>
  
!         <property name="VERSION" value="1.0.15.f"/>
  
          <tstamp/>
--- 20,24 ----
          <property name="gatormail.attachment.path" value="" description="Local path to hold attachments until they are sent."/>
  
!         <property name="VERSION" value="1.0.16.a"/>
  
          <tstamp/>
***************
*** 36,39 ****
--- 36,40 ----
          <property name="ver.nekohtml" value="0.7.7"/>
          <property name="ver.xalan" value="2.5.2"/>
+         <property name="ver.commons-pool" value="1.2"/>
  
          <property name="src.dir" value="src"/>
***************
*** 52,55 ****
--- 53,57 ----
          <property name="lib.xalan.dir" value="${lib.dir}/xalan-${ver.xalan}"/>
          <property name="lib.gatorlinkauth.dir" value="${lib.dir}/gatorlinkauth"/>
+         <property name="lib.commons-pool.dir" value="${lib.dir}/commons-pool-${ver.commons-pool}"/>
          <property name="lib.managesievecraplib.dir" value="${lib.dir}/managesievecraplib"/>
  
***************
*** 117,120 ****
--- 119,126 ----
          </fileset>
  
+         <fileset dir="${lib.commons-pool.dir}" id="fileset.commons-pool.lib">
+             <include name="*.jar"/>
+         </fileset>
+ 
          <fileset dir="${lib.managesievecraplib.dir}" id="fileset.managesievecraplib.lib">
              <include name="*.jar"/>
***************
*** 154,157 ****
--- 160,167 ----
          </path>
  
+         <path id="classpath.commons-pool">
+             <fileset refid="fileset.commons-pool.lib"/>
+         </path>
+ 
          <path id="classpath.managesievecraplib">
              <fileset refid="fileset.managesievecraplib.lib"/>
***************
*** 161,166 ****
      <target name="build.classes" depends="init">
          <mkdir dir="${build.classes.dir}"/>
!         <javac debug="${javac.debug}" destdir="${build.classes.dir}"
!             optimize="${javac.optimize}" srcdir="${src.java.dir}" deprecation="true">
              <classpath refid="classpath.servlet-api"/>
              <classpath refid="classpath.javamail"/>
--- 171,175 ----
      <target name="build.classes" depends="init">
          <mkdir dir="${build.classes.dir}"/>
!         <javac debug="${javac.debug}" destdir="${build.classes.dir}" optimize="${javac.optimize}" srcdir="${src.java.dir}" deprecation="true">
              <classpath refid="classpath.servlet-api"/>
              <classpath refid="classpath.javamail"/>
***************
*** 169,172 ****
--- 178,182 ----
              <classpath refid="classpath.j2ee"/>
              <classpath refid="classpath.xalan"/>
+             <classpath refid="classpath.commons-pool"/>
              <classpath refid="classpath.managesievecraplib"/>
          </javac>
***************
*** 225,230 ****
          <mkdir dir="${build.webinf.dir}"/>
          <copy todir="${build.webinf.dir}" overwrite="true">
! 	        <fileset refid="fileset.struts.webinf"/>
! 	        <fileset refid="fileset.jstl.webinf"/>
              <fileset dir="${src.webapp.dir}/WEB-INF">
                  <include name="**/GatorMail.tld"/>
--- 235,240 ----
          <mkdir dir="${build.webinf.dir}"/>
          <copy todir="${build.webinf.dir}" overwrite="true">
!             <fileset refid="fileset.struts.webinf"/>
!             <fileset refid="fileset.jstl.webinf"/>
              <fileset dir="${src.webapp.dir}/WEB-INF">
                  <include name="**/GatorMail.tld"/>
***************
*** 251,256 ****
      <target name="build.war" depends="init,build.jar,build.jsp,build.webinf" description="Generate a war">
          <mkdir dir="${build.war.dir}"/>
!         <war destfile="${build.war.dir}/GatorMail.war" webxml="${build.webinf.dir}/web.xml"
!             compress="true" index="true">
              <!-- / -->
              <fileset dir="${build.jsp.dir}"/>
--- 261,265 ----
      <target name="build.war" depends="init,build.jar,build.jsp,build.webinf" description="Generate a war">
          <mkdir dir="${build.war.dir}"/>
!         <war destfile="${build.war.dir}/GatorMail.war" webxml="${build.webinf.dir}/web.xml" compress="true" index="true">
              <!-- / -->
              <fileset dir="${build.jsp.dir}"/>
***************
*** 276,279 ****
--- 285,289 ----
              <lib refid="fileset.xalan.lib"/>
              <lib refid="fileset.gatorlinkauth.lib"/>
+             <lib refid="fileset.commons-pool.lib"/>
          </war>
      </target>
***************
*** 281,286 ****
      <target name="build.ear" depends="build.war">
          <mkdir dir="${build.ear.dir}"/>
!         <ear destfile="${build.ear.dir}/GatorMail.ear" appxml="${src.xml.dir}/application.xml"
!             compress="true" index="true">
              <fileset dir="${build.war.dir}" includes="*.war"/>
          </ear>
--- 291,295 ----
      <target name="build.ear" depends="build.war">
          <mkdir dir="${build.ear.dir}"/>
!         <ear destfile="${build.ear.dir}/GatorMail.ear" appxml="${src.xml.dir}/application.xml" compress="true" index="true">
              <fileset dir="${build.war.dir}" includes="*.war"/>
          </ear>
***************
*** 291,298 ****
      <target name="javadoc" depends="init" description="Generate JavaDocs">
          <mkdir dir="${doc.api.dir}"/>
!         <javadoc sourcepath="${src.java.dir}" destdir="${doc.api.dir}"
!             packagenames="edu.ufl.osg.webmail.*" source="1.3" windowtitle="${ant.project.name}"
!             overview="${src.java.dir}/edu/ufl/osg/webmail/overview.html"
!             access="${javadoc.access}" use="true" failonerror="true">
              <doctitle><![CDATA[${ant.project.name}]]></doctitle>
              <header><![CDATA[${ant.project.name}]]></header>
--- 300,304 ----
      <target name="javadoc" depends="init" description="Generate JavaDocs">
          <mkdir dir="${doc.api.dir}"/>
!         <javadoc sourcepath="${src.java.dir}" destdir="${doc.api.dir}" packagenames="edu.ufl.osg.webmail.*" source="1.3" windowtitle="${ant.project.name}" overview="${src.java.dir}/edu/ufl/osg/webmail/overview.html" access="${javadoc.access}" use="true" failonerror="true">
              <doctitle><![CDATA[${ant.project.name}]]></doctitle>
              <header><![CDATA[${ant.project.name}]]></header>