[jboss-cvs] jboss-seam ...

[Peter Muir]

  User: pmuir   
  Date: 07/02/26 20:59:57

  Modified:    jboss-seam  build.xml
  Log:
  Upgrade to meldware-m7
  
  Revision  Changes    Path
  1.154     +35 -9     jboss-seam/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/build.xml,v
  retrieving revision 1.153
  retrieving revision 1.154
  diff -u -b -r1.153 -r1.154
  --- build.xml	23 Feb 2007 22:03:03 -0000	1.153
  +++ build.xml	27 Feb 2007 01:59:56 -0000	1.154
  @@ -39,6 +39,7 @@
       <property name="lib.dir"              value="${imported.basedir}/lib"/>
       <property name="drools.lib.dir"       value="${imported.basedir}/drools/lib"/>
       <property name="mail.lib.dir"         value="${imported.basedir}/mail"/>
  +	<property name="meldware.lib.dir"     value="${mail.lib.dir}/meldware"/>
       <property name="eejb.conf.dir"        value="${imported.basedir}/embedded-ejb/conf"/>
       <property name="mc.conf.dir"          value="${imported.basedir}/microcontainer/conf"/>
       <property name="example.coverage.dir" value="${imported.basedir}/build/coverage"/>
  @@ -229,15 +230,26 @@
       </patternset>
           
           <zipfileset id="meldware.deploy"
  -                   dir="${mail.lib.dir}"
  +               dir="${meldware.lib.dir}"
             description="the meldware ear and ds">
               <include name="meldware-ds.xml" if="example.seam.meldware"/>
  -                <include name="meldware.ear" if="example.seam.meldware" /> 
  +       	<include name="calendar.ear/**" if="example.seam.meldware" /> 
  +    	<include name="mail.ear/**" if="example.seam.meldware" /> 
  +   		<include name="meldwarebase.sar/**" if="example.seam.meldware" /> 
  +  		<include name="runonce.bsh" if="example.seam.meldware" /> 
  +    	<include name="webadmin.war" if="example.seam.meldware" /> 
  +    	<include name="webmail.war" if="example.seam.meldware" />
  +    	<exclude name=""/>
           </zipfileset>
           
       <patternset id="meldware.undeploy">
  -        <include name="meldware.ear"/>
           <include name="meldware-ds.xml" />
  +        <include name="calendar.ear/**" />
  +        <include name="mail.ear/**" /> 
  +       	<include name="meldwarebase.sar/**" /> 
  +      	<include name="runonce.bsh" /> 
  +        <include name="webadmin.war" /> 
  +       	<include name="webmail.war" /> 
       </patternset>
       
       <zipfileset id="example.tomcat.war.webinf"
  @@ -1271,6 +1283,16 @@
           <fail unless="jboss.home">jboss.home MUST be set. Update build.properties to point to a valid JBoss installation.</fail>
           <copy todir="${deploy.dir}">
               <fileset refid="example.deploy"/>
  +        </copy>
  +    	<!-- Need to set up meldware with absolute paths to stuff -->
  +    	<copy tofile="${meldware.lib.dir}/mail.ear/mailjmx.sar/META-INF/jboss-service.xml" file="${meldware.lib.dir}/jboss-service.xml">
  +    		<filterset>
  +    			<filter token="deploy.dir" value="${deploy.dir}"/>
  +    			<filter token="jboss.home" value="${jboss.home}"/>
  +    		</filterset>
  +   		</copy>
  +    	<!-- Can't filter all of meldware, causes corruption of classes -->
  +       	<copy todir="${deploy.dir}">
                   <fileset refid="meldware.deploy" />
           </copy>
           <copy file="${build.dir}/${example.name}.${unit.ext}" todir="${deploy.dir}"/>
  @@ -1283,6 +1305,10 @@
           <delete>
               <fileset dir="${deploy.dir}">
                   <patternset refid="example.undeploy"/>
  +            </fileset>
  +        </delete>
  +    	<delete includeemptydirs="on">
  +	        <fileset dir="${deploy.dir}" >
                   <patternset refid="meldware.undeploy" />
               </fileset>
           </delete>