roller build.xml,1.78,1.79

Update of /cvsroot/roller/roller
In directory sc8-pr-cvs1:/tmp/cvs-serv6349

Modified Files:
        build.xml 
Log Message:
Improvements/fixes to the Resin-specific build steps.

Index: build.xml
===================================================================
RCS file: /cvsroot/roller/roller/build.xml,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** build.xml   17 Mar 2003 18:29:41 -0000      1.78
--- build.xml   18 Mar 2003 03:10:53 -0000      1.79
***************
*** 62,66 ****
  
  <path id="base.path">
!       <!--fileset dir="../../resin-2.1.8/lib/">
                <include if="resin.path" name="${resin.path}" />
        </fileset-->
--- 62,66 ----
  
  <path id="base.path">
!       <!--fileset dir="../../resin-2.1.5/lib/">
                <include if="resin.path" name="${resin.path}" />
        </fileset-->
***************
*** 102,108 ****
      </fileset>
  
-     <!--fileset dir="../../resin-2.1.8/lib" >
-         <include name="resin.jar"/>
-     </fileset-->
  </path>
  
--- 102,105 ----
***************
*** 262,266 ****
  
      <javac debug="${build.debug}" srcdir="./src" 
destdir="${build.compile_beans}" 
!         excludes="org/roller/business/beans/**,org/roller/presentation/**">
          <classpath>
              <path refid="business.path"/> 
--- 259,263 ----
  
      <javac debug="${build.debug}" srcdir="./src" 
destdir="${build.compile_beans}" 
!         
excludes="org/roller/business/beans/**,org/roller/presentation/**,**/prevayler/**">
          <classpath>
              <path refid="business.path"/> 
***************
*** 282,286 ****
--- 279,288 ----
  </target>
  
+ <!-- For versions of Resin before 2.1.9 we have to turn the 
+       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">
+ 
      <copy todir="${build.generated}/src">
        <fileset dir="./src">
***************
*** 292,295 ****
--- 294,302 ----
          token="extends HttpServletResponseWrapper"
          value="extends com.caucho.http.filter.CauchoResponseWrapper" />
+         
+     <delete>
+         <fileset dir="./src" 
+               
includes="org/roller/presentation/caching/CommonsPageCache.java"/>
+     </delete>
        
      <replace file="${build.stage_web}/WEB-INF/web.xml" 
***************
*** 302,305 ****
--- 309,333 ----
                ]]></replacevalue>
        </replace>
+       
+ </target>
+ 
+ <!-- Now that the compilation is done, undo the damage from prepare.resin -->
+ <target name="undo.resin" if="resin.path">
+ 
+     <replace 
file="${build.generated}/src/org/roller/presentation/caching/CommonsPageCache.java"
+         value="extends HttpServletResponseWrapper"
+         token="extends com.caucho.http.filter.CauchoResponseWrapper" />
+         
+     <copy todir="./src">
+       <fileset dir="${build.generated}/src">
+               <include 
name="org/roller/presentation/caching/CommonsPageCache.java" />
+       </fileset>
+     </copy>
+     
+     <delete>
+         <fileset dir="${build.generated}/src" 
+               
includes="org/roller/presentation/caching/CommonsPageCache.java"/>
+     </delete>
+     
  </target>
  
***************
*** 312,319 ****
      <mkdir dir="${build.compile_web}"/>
  
-     <delete>
-         <fileset dir="${build.generated}/src" 
-               
includes="org/roller/presentation/caching/CommonsPageCache.java"/>
-     </delete>
      <antcall target="prepare.resin" />
  
--- 340,343 ----
***************
*** 334,337 ****
--- 358,363 ----
      </copy>
  
+     <antcall target="undo.resin" />
+     
  </target>
  




-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open! 
Get cracking and register here for some mind boggling fun and 
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en