[Pfc-prolog-cvs] prolix build.xml,1.21,1.22

[<iva...@us...>]

Update of /cvsroot/pfc-prolog/prolix
In directory sc8-pr-cvs1:/tmp/cvs-serv23014

Modified Files:
	build.xml 
Log Message:
Reestructured build dir

Index: build.xml
===================================================================
RCS file: /cvsroot/pfc-prolog/prolix/build.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** build.xml	9 Jul 2003 17:50:36 -0000	1.21
--- build.xml	10 Jul 2003 18:23:38 -0000	1.22
***************
*** 92,100 ****
     <property name="build.dir" value="${basedir}/build"/>
     <property name="build.generate.dir" value="${build.dir}/generate"/>
!    <property name="build.classes.dir" value="${build.dir}/beans"/>
  
     <property name="dist.dir" value="${basedir}/dist"/>
-    <property name="client.conf" value="${build.generate.dir}/web/WEB-INF"/>
-    <property name="client.generated" value="${build.generate.dir}/web"/>
     <property name="src.web.dir" value="${basedir}/web"/>
  
--- 92,100 ----
     <property name="build.dir" value="${basedir}/build"/>
     <property name="build.generate.dir" value="${build.dir}/generate"/>
!    <property name="build.classes.dir" value="${build.dir}/classes"/>
!    <property name="build.generate.ejb-conf" value="${build.generate.dir}/ejb-conf"/>
!    <property name="build.generate.web-conf" value="${build.generate.dir}/web-conf"/>
  
     <property name="dist.dir" value="${basedir}/dist"/>
     <property name="src.web.dir" value="${basedir}/web"/>
  
***************
*** 177,181 ****
        
        <!-- Beans Deployment descriptor -->
!       <deploymentdescriptor destdir="${build.classes.dir}/META-INF"/>
        <!-- AS 4/29/02 Do not validate XML files because JBoss 3.0
        message driven will report an wrong error because it uses the wrong jboss.dtd -->
--- 177,181 ----
        
        <!-- Beans Deployment descriptor -->
!       <deploymentdescriptor destdir="${build.generate.ejb-conf}/META-INF"/>
        <!-- AS 4/29/02 Do not validate XML files because JBoss 3.0
        message driven will report an wrong error because it uses the wrong jboss.dtd -->
***************
*** 184,188 ****
  	     typemapping="${type.mapping}"
  	     datasource="${datasource.name}"
! 	     destdir="${build.classes.dir}/META-INF"
  	     validateXml="false"
  	     />
--- 184,188 ----
  	     typemapping="${type.mapping}"
  	     datasource="${datasource.name}"
! 	     destdir="${build.generate.ejb-conf}/META-INF"
  	     validateXml="false"
  	     />
***************
*** 198,202 ****
      <webdoclet
  		 sourcepath="${src.ejb.dir}"
! 		 destdir="${client.conf}"
  		 classpathref="base.path"
  		 excludedtags="@version,@author"
--- 198,202 ----
      <webdoclet
  		 sourcepath="${src.ejb.dir}"
! 		 destdir="${build.generate.web-conf}/WEB-INF"
  		 classpathref="base.path"
  		 excludedtags="@version,@author"
***************
*** 303,307 ****
        </fileset>
        <fileset
! 	       dir="${build.classes.dir}"
  	       includes="META-INF/**"
  	       >
--- 303,307 ----
        </fileset>
        <fileset
! 	       dir="${build.generate.ejb-conf}"
  	       includes="META-INF/**"
  	       >
***************
*** 342,347 ****
            </fileset>
            <fileset
!                    dir="${client.generated}"
!                    includes="**/*.xml"
                     >
            </fileset>
--- 342,347 ----
            </fileset>
            <fileset
!                    dir="${build.generate.web-conf}"
!                    includes="WEB-INF/*.xml"
                     >
            </fileset>