antlets/webapp/src xbuild.xml,1.2,1.3

Update of /cvsroot/metamorphosis/antlets/webapp/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2412/webapp/src

Modified Files:
	xbuild.xml 
Log Message:
standardising antlets

Index: xbuild.xml
===================================================================
RCS file: /cvsroot/metamorphosis/antlets/webapp/src/xbuild.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xbuild.xml	26 Feb 2004 17:12:20 -0000	1.2
--- xbuild.xml	2 Mar 2004 21:16:36 -0000	1.3
***************
*** 1,27 ****
  <?xml version="1.0"?>
! <project default="war" name="webapp.cent">
  
! <!--<property name="webapp.cent.content.xdocs" value="${webapp.cent.work.dir}/xdocs"/>-->
! <property name="webapp.antlet.webxml.file" value="${project.src.dir}/../web/WEB-INF/web.xml"/>
! <property name="webapp.antlet.web.dir" value="${project.src.dir}/../web"/>
! <property name="webapp.antlet.classes.dir" value="${project.build.dir}/classes"/>
! <property name="webapp.antlet.lib.dir" value="${basedir}/lib"/>
! <property name="webapp.antlet.compress" value="true"/>
! <property name="webapp.antlet.update" value="false"/>
! <property name="webapp.antlet.duplicate" value="fail"/>
  
  <target name="war" description="builds war-archive of build-product">
  
  <war destfile="${project.build.dir}/${project.name}-${project.version}.war" 
!      webxml="${webapp.antlet.webxml.file}" 
!      compress="${webapp.antlet.compress}" 
!      update="${webapp.antlet.update}" 
!      duplicate="${webapp.antlet.duplicate}"> 
!   <fileset dir="${webapp.antlet.web.dir}">
    	<exclude name="**/web.xml"/>
    </fileset>
  
!   <classes dir="${webapp.antlet.classes.dir}"/>
!   <lib dir="${webapp.antlet.lib.dir}"/>
  </war>
  
--- 1,26 ----
  <?xml version="1.0"?>
! <project default="war" name="webapp.antlet">
!   <import file="usage.xml"/>
  
! <dirname property="webapp.antlet.dir" file="${ant.file.webapp.antlet}"/>
  
  <target name="war" description="builds war-archive of build-product">
+ 	<xmlproperty file="${webapp.antlet.dir}/conf/properties.xml"                   
+     			 keeproot="false" 
+     			 collapseAttributes="true"
+     			 semanticAttributes="true"
+                  includeSemanticAttribute="true" />   
  
  <war destfile="${project.build.dir}/${project.name}-${project.version}.war" 
!      webxml="${webapp.webxml}" 
!      compress="${webapp.compress}" 
!      update="${webapp.update}" 
!      duplicate="${webapp.duplicate}"> 
!   <fileset dir="${webapp.webdir}">
    	<exclude name="**/web.xml"/>
    </fileset>
  
!   <classes dir="${webapp.classesdir}"/>
!   <lib dir="${webapp.libdir}"/>
  </war>
  



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click