[jboss-cvs] jboss-seam ...

[Ales Justin]

  User: alesj   
  Date: 07/02/28 10:43:13

  Modified:    jboss-seam  build.xml
  Log:
  Initial MC int code (some parts still commented - waiting for MC upgrade), fixing builds for separate Spring and MC handling.
  
  Revision  Changes    Path
  1.164     +21 -10    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.163
  retrieving revision 1.164
  diff -u -b -r1.163 -r1.164
  --- build.xml	28 Feb 2007 02:29:48 -0000	1.163
  +++ build.xml	28 Feb 2007 15:43:12 -0000	1.164
  @@ -113,7 +113,7 @@
           <include name="jboss-seam-debug.jar"    if="example.seam.debug.lib"/>
           <include name="jboss-seam-ui.jar"       if="example.seam.ui.lib"/>
           <include name="jboss-seam-pdf.jar"      if="example.seam.pdf.lib"/>
  -        <include name="jboss-seam-ioc.jar"      if="example.seam.ioc.lib"/>
  +        <include name="jboss-seam-ioc.jar"      if="example.seam.ioc.war.lib"/>
           <include name="jboss-seam-mail.jar"     if="example.seam.mail.lib"/>
           <include name="jboss-seam-remoting.jar" if="example.seam.remoting.lib"/>
       </zipfileset>
  @@ -130,7 +130,7 @@
                  dir="${lib.dir}"
              
         description="the spring jar">
  -        <include name="spring*.jar" if="example.seam.ioc.lib"/>
  +        <include name="spring*.jar" if="example.spring.lib"/>
       </zipfileset>        
   
       <zipfileset id="example.seam.main.jar" 
  @@ -139,6 +139,12 @@
           <include name="${name}.jar"/>
       </zipfileset>
   
  +    <zipfileset id="example.seam.ioc.main.jar"
  +               dir="${imported.basedir}"
  +       description="the ioc Seam jar">
  +        <include name="${name}-ioc.jar" if="example.seam.ioc.main.lib"/>
  +    </zipfileset>
  +
       <zipfileset id="example.facelets.jar" 
                  dir="${lib.dir}"
              prefix="WEB-INF/lib"
  @@ -162,7 +168,6 @@
           <include name="jboss-cache-jdk50.jar" if="example.cache.lib"/>
           <include name="jboss-aop-jdk50.jar" if="example.cache.lib"/>
           <include name="jgroups.jar" if="example.cache.lib"/> 
  -        <include name="jgroups.jar" if="example.cache.lib"/> 
       </zipfileset>
       
       <zipfileset id="example.drools.jar" 
  @@ -226,6 +231,10 @@
           <include name="*.drl"/>
       </zipfileset>
   
  +    <zipfileset id="example.beans.files" dir="${example.resources.dir}">
  +        <include name="META-INF/*-beans.xml"  if="example.mc.beans"/>
  +    </zipfileset>
  +
       <fileset id="example.deploy"
               dir="${example.resources.dir}">
           <include name="${example.ds}"/>
  @@ -298,7 +307,7 @@
           <include name="jboss-seam-debug.jar" if="example.seam.debug.lib"/>
           <include name="jboss-seam-ui.jar"    if="example.seam.ui.lib"/>
           <include name="jboss-seam-pdf.jar"   if="example.seam.pdf.lib"/>
  -        <include name="jboss-seam-ioc.jar"   if="example.seam.ioc.lib"/>
  +        <include name="jboss-seam-ioc.jar"      if="example.seam.ioc.war.lib"/>
           <include name="jboss-seam-remoting.jar"   if="example.seam.remoting.lib"/>
       </zipfileset>
       
  @@ -1338,11 +1347,13 @@
       <target name="ear" depends="ejb3, war">
           <jar destfile="${build.dir}/${example.name}.ear">
               <fileset refid="example.seam.main.jar"/>
  +            <fileset refid="example.seam.ioc.main.jar"/>
               <fileset refid="example.drools.jar"/>           
               <fileset refid="example.extra.jar"/>
               <fileset refid="example.local.jar" />
               <fileset refid="example.jcaptcha.jar"/>
               <fileset refid="example.spring.jar"/>
  +            <fileset refid="example.beans.files"/>
               <zipfileset dir="${build.dir}">
                   <include name="${example.name}.jar"/>
               </zipfileset>