[jboss-cvs] jbosstest build.xml

[David J. <d_j...@us...>]

  User: d_jencks
  Date: 02/09/29 12:45:55

  Modified:    .        build.xml
  Log:
  fixed mbean tests and some broken functionality
  
  Revision  Changes    Path
  1.178     +21 -4     jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.177
  retrieving revision 1.178
  diff -u -r1.177 -r1.178
  --- build.xml	23 Sep 2002 20:25:16 -0000	1.177
  +++ build.xml	29 Sep 2002 19:45:54 -0000	1.178
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.177 2002/09/23 20:25:16 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.178 2002/09/29 19:45:54 d_jencks Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -840,8 +840,8 @@
     <target name="compile-xmbean-dds" depends="init">
       <taskdef name="jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
   <echo message="xdoclet.mergedir: ${xdoclet.mergedir}"/>
  -    <mkdir dir="${build.resources}/jmx/xmbean/META-INF"/>
  -    <jmxdoclet destdir="${build.resources}/jmx/xmbean/META-INF"
  +    <mkdir dir="${build.resources}/jmx/xmbean/org/jboss/test/jmx/xmbean"/>
  +    <jmxdoclet destdir="${build.resources}/jmx/xmbean"
                  force="true"
   	       excludedtags="@version,@author">
         <fileset dir="${source.java}">
  @@ -2046,18 +2046,35 @@
       </jar>
   
       <!--xmbean test deployment-->
  +    <jar jarfile="${build.lib}/user-xmbean.jar">
  +      <fileset dir="${build.classes}">
  +        <include name="org/jboss/test/jmx/xmbean/*.class"/>
  +      </fileset>
  +      <fileset dir="${build.resources}/jmx/xmbean">
  +        <include name="org/jboss/test/jmx/xmbean/User.xml"/>
  +      </fileset>
  +    </jar>
  +
       <jar jarfile="${build.lib}/user-xmbean.sar">
         <fileset dir="${build.classes}">
           <include name="org/jboss/test/jmx/xmbean/*.class"/>
         </fileset>
         <fileset dir="${build.resources}/jmx/xmbean">
  -        <include name="META-INF/**/*.xml"/>
  +        <include name="META-INF/jboss-service.xml"/>
  +      </fileset>
  +      <fileset dir="${build.resources}/jmx/xmbean">
  +        <include name="org/jboss/test/jmx/xmbean/User.xml"/>
         </fileset>
       </jar>
   
       <copy todir="${build.lib}" filtering="no">
         <fileset dir="${build.resources}/jmx/xmbean">
            <include name="inline-xmbean-service.xml"/>
  +      </fileset>
  +    </copy>
  +    <copy tofile="${build.lib}/user-xmbean-service.xml" filtering="no">
  +      <fileset dir="${build.resources}/jmx/xmbean/META-INF">
  +         <include name="jboss-service.xml"/>
         </fileset>
       </copy>