roller build.xml,1.82,1.83

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

Modified Files:
        build.xml 
Log Message:
Hibernate impl - almost done.

Index: build.xml
===================================================================
RCS file: /cvsroot/roller/roller/build.xml,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** build.xml   27 Mar 2003 20:08:17 -0000      1.82
--- build.xml   31 Mar 2003 02:49:53 -0000      1.83
***************
*** 59,70 ****
  <!-- 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="base.path">
-       <!--fileset dir="../../resin-2.1.6/lib/">
-               <include if="resin.path" name="${resin.path}" />
-       </fileset-->
      <fileset dir="${ro.tools}/lib">
!         <include name="junit-3.8.1.jar"/>
          <include name="jdom-b8.jar"/>
          <include name="log4j-1.2.4.jar"/> 
--- 59,67 ----
  <!-- 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="base.path">
      <fileset dir="${ro.tools}/lib">
!           <include name="junit-3.8.1.jar"/>
          <include name="jdom-b8.jar"/>
          <include name="log4j-1.2.4.jar"/> 
***************
*** 79,105 ****
          <include name="mail.jar"/>
          <include name="activation.jar"/>
!     </fileset>
      <fileset dir="${ro.tools}/struts-1.1-rc1/lib">
          <include name="commons*.jar"/>
          <include name="jdbc2_0-stdext.jar"/>
!     </fileset>
!     <!-- TODO move Castor dependency to business.path -->
!     <fileset dir="${ro.tools}/lib">
!         <include name="castor-0.9.4.3-xml.jar"/>
!         <include name="castor-0.9.4.3.jar"/>
!         <include name="jta-spec1_0_1.jar"/>
!     </fileset>
!     <!-- TODO move Hibernate dependency to business.path -->
!     <fileset dir="${ro.tools}/hibernate-2.0">
!         <include name="hibernate2.jar"/>
!         <include name="lib/jdom.jar"/>
!         <include name="lib/dom4j.jar"/>
!     </fileset>
!     <!-- TODO move Prevayler dependency to business.path -->
!     <fileset dir="${ro.tools}/Prevayler-2.00.000dev1">
!         <include name="Prevayler-2.00.000dev1.jar"/>
!         <include name="commons-jxpath-1.1b1.jar"/>
!     </fileset>
! 
  </path>
  
--- 76,87 ----
          <include name="mail.jar"/>
          <include name="activation.jar"/>
!     </fileset>    
      <fileset dir="${ro.tools}/struts-1.1-rc1/lib">
          <include name="commons*.jar"/>
          <include name="jdbc2_0-stdext.jar"/>
!     </fileset>    
!       <!--fileset dir="../../resin-2.1.6/lib/">
!               <include if="resin.path" name="${resin.path}" />
!       </fileset-->        
  </path>
  
***************
*** 111,114 ****
--- 93,98 ----
          <include name="xmlrpc-1.1.jar"/>
          <include name="oscache-1.7.5.jar" />
+         <!-- Castor-JDO needed for Timestampable interface -->
+         <include name="castor-0.9.4.3.jar"/>
      </fileset>
      <fileset dir="${ro.tools}/struts-1.1-rc1/lib">
***************
*** 125,132 ****
  
  <path id="business.path">
      <path refid="base.path"/> 
!     <path location="${build.compile_beans}"/>
!     <fileset dir="${ro.tools}/struts-1.1-rc1/lib">
!         <include name="struts.jar"/>
      </fileset>
  </path>
--- 109,128 ----
  
  <path id="business.path">
+ 
      <path refid="base.path"/> 
!     <path location="${build.compile_beans}"/>   
!     <fileset dir="${ro.tools}/lib">
!         <include name="castor-0.9.4.3-xml.jar"/>
!         <include name="castor-0.9.4.3.jar"/>
!         <include name="jta-spec1_0_1.jar"/>
!     </fileset>
!     <fileset dir="${ro.tools}/hibernate-2.0">
!         <include name="hibernate2.jar"/>
!         <include name="lib/jdom.jar"/>
!         <include name="lib/dom4j.jar"/>
!     </fileset>
!     <fileset dir="${ro.tools}/Prevayler-2.00.000dev1">
!         <include name="Prevayler-2.00.000dev1.jar"/>
!         <include name="commons-jxpath-1.1b1.jar"/>
      </fileset>
  </path>
***************
*** 223,227 ****
      <!-- generate hibernate files --> 
        <hibernatedoclet
!         destdir="${build.generated}/src.business"
          mergedir="./deploy/mergedir"
          excludedtags="@version,@author"
--- 219,223 ----
      <!-- generate hibernate files --> 
        <hibernatedoclet
!         destdir="${build.compile_beans}"
          mergedir="./deploy/mergedir"
          excludedtags="@version,@author"
***************
*** 404,407 ****
--- 400,408 ----
      </copy>
      
+     <!-- Copy database configs to classpath in staging -->
+     <copy todir="${build.stage_web}/WEB-INF/classes">
+         <fileset dir="./database/hibernate" includes="hibernate.properties"/> 
+     </copy>
+ 
      <!-- Copy WEB-INF contents to staging -->
      <copy todir="${build.stage_web}/WEB-INF">
***************
*** 431,434 ****
--- 432,439 ----
                        <include name="commons-jxpath-1.1b1.jar"/>
                </fileset>
+         
+         <fileset dir="${ro.tools}/hibernate-2.0/lib">
+             <include name="*.jar"/>
+         </fileset>
          
          <fileset dir="${ro.tools}/lib">




-------------------------------------------------------
This SF.net email is sponsored by:
The Definitive IT and Networking Event. Be There!
NetWorld+Interop Las Vegas 2003 -- Register today!
http://ads.sourceforge.net/cgi-bin/redirect.pl?keyn0001en