[Sandev-cvs] sand/platform/tools/build build.xml,1.2,1.3

[Eric P. <th...@us...>]

Update of /cvsroot/sandev/sand/platform/tools/build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26981

Modified Files:
	build.xml 
Log Message:
Redid the wardeploy so it repacks and deploys the tools.war in addition to 
the app war file, provided that we are not in release mode.  The config
editor and SandUI editor now work.  The control panel is nowhere though.


Index: build.xml
===================================================================
RCS file: /cvsroot/sandev/sand/platform/tools/build/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	1 Dec 2005 15:13:49 -0000	1.2
--- build.xml	4 Dec 2005 02:56:04 -0000	1.3
***************
*** 145,162 ****
  -->
  
! <!-- if the config has changed, delete the repacked war.  Otherwise set a 
! property if all the env jars are up to date.  Call to repack the war.
! -->
! <target name="build.repacked.war">
!     <uptodate property="repack.noconfigchange"
!               targetfile="./wardeploy/${targetwar}">
!         <srcfiles dir="${deploymentenv}"/>
!     </uptodate>
!     <antcall target="delete.repackwar.ifconfigchange"/>
!     <uptodate property="repack.uptodate" 
!               targetfile="./wardeploy/${targetwar}">
!         <srcfiles dir="${main.envdir}"/>
!     </uptodate>
!     <antcall target="build.repacked.war.work"/>
  </target>
  
--- 145,161 ----
  -->
  
! <!-- check for config change, repack and deploy warfiles -->
! <target name="build.deployment.war">
!   <echo message="repacking and deploying ${targetwar} as needed."/>
!   <echo message="sandevMode: ${sandevMode}"/>
!   <uptodate property="repack.noconfigchange"
!             targetfile="./wardeploy/${targetwar}">
!       <srcfiles dir="${deploymentenv}"/>
!   </uptodate>
!   <antcall target="delete.repackwar.ifconfigchange"/>
!   <antcall target="build.deployment.war.work">
!     <param name="warfile" value="${targetwar}"/>
!   </antcall>
!   <antcall target="build.deploy.tools.war"/>
  </target>
  
***************
*** 164,176 ****
  <!-- delete the repacked war if the config has changed. -->
  <target name="delete.repackwar.ifconfigchange" unless="repack.noconfigchange">
!     <antcall target="clean.repacked.war"/>
  </target>
  
  
  <!-- repack the target war file to include the other runtime files -->
! <target name="build.repacked.war.work" unless="repack.uptodate">
    <!-- unpack the deployment war to a temp area  -->
      <mkdir dir="./repack"/>
!     <unzip src="${main.envdir}/${targetwar}" dest="./repack"/>
    <!-- copy all jars into unpacked war lib  -->
      <mkdir dir="./repack/WEB-INF/lib"/>
--- 163,198 ----
  <!-- delete the repacked war if the config has changed. -->
  <target name="delete.repackwar.ifconfigchange" unless="repack.noconfigchange">
!   <antcall target="clean.deployment.war.work"/>
! </target>
! 
! 
! <!-- build and deploy the supporting tools if dev deployment  -->
! <target name="build.deploy.tools.war" unless="sandevMode">
!   <antcall target="build.deployment.war.work">
!     <param name="warfile" value="${DeploymentPrefix}tools.war"/>
!   </antcall>
! </target>
! 
! 
! <!-- repack and deploy the specified war -->
! <target name="build.deployment.war.work">
!     <uptodate property="repack.${warfile}.uptodate" 
!               targetfile="./wardeploy/${warfile}">
!         <srcfiles dir="${main.envdir}"/>
!     </uptodate>
!     <antcall target="build.repacked.war.work"/>
!     <copy todir="${deploymentDir}">
!         <fileset dir="./wardeploy">
!             <include name="${warfile}"/>
!         </fileset>
!     </copy>
  </target>
  
  
  <!-- repack the target war file to include the other runtime files -->
! <target name="build.repacked.war.work" unless="repack.${warfile}.uptodate">
    <!-- unpack the deployment war to a temp area  -->
      <mkdir dir="./repack"/>
!     <unzip src="${main.envdir}/${warfile}" dest="./repack"/>
    <!-- copy all jars into unpacked war lib  -->
      <mkdir dir="./repack/WEB-INF/lib"/>
***************
*** 194,198 ****
    <!-- repack the new war and copy it into the deployment area -->
      <mkdir dir="./wardeploy"/>
!     <war destfile="./wardeploy/${targetwar}" 
           webxml="./repack/WEB-INF/web.xml"
           manifest="./repack/META-INF/MANIFEST.MF"
--- 216,220 ----
    <!-- repack the new war and copy it into the deployment area -->
      <mkdir dir="./wardeploy"/>
!     <war destfile="./wardeploy/${warfile}" 
           webxml="./repack/WEB-INF/web.xml"
           manifest="./repack/META-INF/MANIFEST.MF"
***************
*** 202,225 ****
  
  
! <!-- delete the repacked warfile and associated work files -->
! <target name="clean.repacked.war">
!     <delete dir="./repack" failonerror="false"/>
!     <delete dir="./wardeploy" failonerror="false"/>
! </target>
! 
! 
! <!-- copy the repacked warfile to the deployment area -->
! <target name="build.deploy.war">
!     <copy todir="${deploymentDir}">
!         <fileset dir="./wardeploy">
!             <include name="${targetwar}"/>
!         </fileset>
!     </copy>
  </target>
  
  
! <!-- delete the repacked warfile from the deployment area -->
! <target name="clean.deploy.war">
!     <delete file="${deploymentDir}/${targetwar}" failonerror="false"/>
  </target>
  
--- 224,244 ----
  
  
! <!-- undeploy and remove the specified war -->
! <target name="clean.deployment.war">
!   <echo message="undeploying and deleting ${targetwar}"/>
!   <antcall target="clean.deployment.war.work">
!     <param name="warfile" value="${targetwar}"/>
!   </antcall>
!   <antcall target="clean.deployment.war.work">
!     <param name="warfile" value="${DeploymentPrefix}tools.war"/>
!   </antcall>
  </target>
  
  
! <!-- undeploy and delete the repacked warfile and associated work files -->
! <target name="clean.deployment.war.work">
!     <delete dir="./repack" failonerror="false"/>
!     <delete dir="./wardeploy" failonerror="false"/>
!     <delete file="${deploymentDir}/${warfile}" failonerror="false"/>
  </target>