[jboss-cvs] jboss-seam ...

[Norman Richards]

  User: nrichards
  Date: 07/02/27 21:28:13

  Modified:    jboss-seam  build.xml
  Log:
  temporary patch1
  
  Revision  Changes    Path
  1.162     +10 -37    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.161
  retrieving revision 1.162
  diff -u -b -r1.161 -r1.162
  --- build.xml	28 Feb 2007 02:18:41 -0000	1.161
  +++ build.xml	28 Feb 2007 02:28:13 -0000	1.162
  @@ -42,7 +42,6 @@
       <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}/buni-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"/>
  @@ -80,7 +79,6 @@
       <property name="dist.seamgen.dir"     value="${dist.dir}/seam-gen"/>
       
       <property name="deploy.dir"           value="${jboss.home}/server/default/deploy"/>
  -	<property name="conf.dir"             value="${jboss.home}/server/default/conf"/>
       <property name="webroot.dir"          value="${deploy.dir}/jbossweb-tomcat55.sar/ROOT.war"/>
       
       <property name="testng.jar"           value="${imported.basedir}/lib/testng-4.5.1-jdk15.jar"/>
  @@ -236,32 +234,15 @@
       </patternset>
           
       <zipfileset id="meldware.deploy"
  -               dir="${meldware.lib.dir}"
  -      description="the meldware ears">
  -       	<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>
  -	
  -	<zipfileset id="meldware.conf.deploy" dir="${meldware.lib.dir}" description="The meldware key store">
  -		<include name="meldware.store" if="example.seam.meldware"/>
  +                   dir="${mail.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" /> 
   	</zipfileset>
           
       <patternset id="meldware.undeploy">
  -        <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>
  -	
  -	<patternset id="meldware.conf.undeploy">
  -		<include name="meldware.store" />
  +        <include name="meldware.ear"/>
  +        <include name="meldware-ds.xml" />
   	</patternset>
       
       <zipfileset id="example.tomcat.war.webinf"
  @@ -1361,9 +1342,6 @@
               <fileset refid="example.deploy"/>
          		<fileset refid="meldware.deploy" />
           </copy>
  -    	<copy todir="${conf.dir}">
  -    	  <fileset refid="meldware.conf.deploy" />
  -    	</copy>
           <copy file="${build.dir}/${example.name}.${unit.ext}" todir="${deploy.dir}"/>
       </target>
   
  @@ -1374,12 +1352,7 @@
           <delete>
               <fileset dir="${deploy.dir}">
                   <patternset refid="example.undeploy"/>
  -            	<patternset refid="meldware.undeploy"/>
  -            </fileset>
  -        </delete>
  -    	<delete>
  -            <fileset dir="${conf.dir}">
  -            	<patternset refid="meldware.conf.undeploy"/>
  +                <patternset refid="meldware.undeploy" />
               </fileset>
           </delete>
       </target>