Update of /cvsroot/roller/roller
In directory sc8-pr-cvs1:/tmp/cvs-serv22952
Modified Files:
build.xml
Log Message:
Better organization of the Resin "dependancies" for Roller. All versions of
Resin require certain jars to be copied to /WEB-INF/lib that the Tomcat build
leaves out. Versions prior to 2.1.9 require ServletFilter mangling. These two
requirements have been split out into seperate Ant properties.
Index: build.xml
===================================================================
RCS file: /cvsroot/roller/roller/build.xml,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** build.xml 20 Apr 2003 20:26:53 -0000 1.96
--- build.xml 23 Apr 2003 17:10:40 -0000 1.97
***************
*** 58,64 ****
<property name="build.velocidoc" value="${ro.build}/velocidoc"/>
! <!-- To enable Resin specific changes, uncomment the following
! property and edit the appropriate "dir" attribute in base.path -->
! <!-- property name="resin.path" value="resin.jar" / -->
<path id="xml.path">
--- 58,78 ----
<property name="build.velocidoc" value="${ro.build}/velocidoc"/>
! <!--
! If you would like Ant to copy all the jar files that Resin needs
! into the /WEB-INF/lib, uncomment the "resinServer" property below.
! In order to run Roller properly on versions of Resin prior to 2.1.9
! you will need to uncomment the "resinFilters" and "resin.path" elements
! below. In addition, make sure to uncomment the reference to resin.path
! in the "base.path" definition.
! -->
! <!--property name="resinServer" value="true" /-->
! <!--
! <property name="resinFilters" value="true" />
! <path id="resin.path">
! <fileset dir="../../resin-2.1.8/lib" >
! <include name="resin.jar" />
! </fileset>
! </path>
! -->
<path id="xml.path">
***************
*** 74,77 ****
--- 88,92 ----
<path id="base.path">
+ <!--path refid="resin.path" /-->
<path refid="xml.path"/>
<fileset dir="${ro.tools}/lib">
***************
*** 90,97 ****
<include name="commons*.jar"/>
<include name="jdbc2_0-stdext.jar"/>
! </fileset>
! <!--fileset dir="../../resin-2.1.8/lib/">
! <include if="resin.path" name="${resin.path}" />
! </fileset-->
</path>
--- 105,109 ----
<include name="commons*.jar"/>
<include name="jdbc2_0-stdext.jar"/>
! </fileset>
</path>
***************
*** 108,112 ****
<fileset dir="${ro.tools}/struts-1.1-rc1/lib">
<include name="*.jar"/>
! </fileset>
</path>
--- 120,124 ----
<fileset dir="${ro.tools}/struts-1.1-rc1/lib">
<include name="*.jar"/>
! </fileset>
</path>
***************
*** 311,316 ****
HttpServletResponseWrapper into a CauchoResponseWrapper. We have
to do away with the original or there will be compile errors. -->
! <target name="prepare.resin" if="resin.path">
<replace dir="./src"
token="extends HttpServletResponseWrapper"
--- 323,329 ----
HttpServletResponseWrapper into a CauchoResponseWrapper. We have
to do away with the original or there will be compile errors. -->
! <target name="prepare.resin" if="resinFilters">
+ <echo>Convert HttpServletResponseWrappers to
CauchoResponseWrappers</echo>
<replace dir="./src"
token="extends HttpServletResponseWrapper"
***************
*** 330,335 ****
<!-- Now that the compilation is done, undo the damage from prepare.resin -->
! <target name="undo.resin" if="resin.path">
<replace dir="./src"
value="extends HttpServletResponseWrapper"
--- 343,349 ----
<!-- Now that the compilation is done, undo the damage from prepare.resin -->
! <target name="undo.resin" if="resinFilters">
+ <echo>Convert CauchoResponseWrappers to
HttpServletResponseWrappers</echo>
<replace dir="./src"
value="extends HttpServletResponseWrapper"
***************
*** 461,468 ****
<!-- MR: Might need to include mail.jar and activation.jar
They're included in Tomcat (non-LE) versions by default -->
! <include name="mail.jar" if="resin.path"/>
! <include name="activation.jar" if="resin.path"/>
! <include name="xercesImpl-2.3.0.jar" if="resin.path"/>
! <include name="xmlParserAPIs-2.3.0.jar" if="resin.path"/>
</fileset>
--- 475,482 ----
<!-- MR: Might need to include mail.jar and activation.jar
They're included in Tomcat (non-LE) versions by default -->
! <include name="mail.jar" if="resinServer"/>
! <include name="activation.jar" if="resinServer"/>
! <include name="xercesImpl-2.3.0.jar" if="resinServer"/>
! <include name="xmlParserAPIs-2.3.0.jar" if="resinServer"/>
</fileset>
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
|
