[jboss-cvs] jbosstest build.xml

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

  User: d_jencks
  Date: 03/03/29 08:02:27

  Modified:    .        Tag: Branch_3_2 build.xml
  Log:
  restore artificial attributes and make the tests work.  user2-xmbean.xml is in a rather non-standard location
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.165.2.50 +7 -4      jbosstest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/build.xml,v
  retrieving revision 1.165.2.49
  retrieving revision 1.165.2.50
  diff -u -r1.165.2.49 -r1.165.2.50
  --- build.xml	29 Mar 2003 06:49:08 -0000	1.165.2.49
  +++ build.xml	29 Mar 2003 16:02:26 -0000	1.165.2.50
  @@ -13,7 +13,7 @@
   <!--                                                                        -->
   <!-- ====================================================================== -->
   
  -<!-- $Id: build.xml,v 1.165.2.49 2003/03/29 06:49:08 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.165.2.50 2003/03/29 16:02:26 d_jencks Exp $ -->
   
   <project default="main" name="JBoss/Testsuite">
   
  @@ -876,7 +876,7 @@
   
     <target name="compile-mbean-sources" depends="init" unless="noxdoclet">
   	<taskdef name="jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" classpathref="xdoclet.task.classpath"/>
  -<echo message="xdoclet.mergedir: ${xdoclet.mergedir}"/>
  +
       <mkdir dir="${build.gen-src}"/>
       <jmxdoclet destdir="${build.gen-src}"
                  force="true"
  @@ -895,8 +895,8 @@
     <target name="compile-xmbean-dds" depends="init" unless="noxdoclet">
   	<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"/>
  +    <jmxdoclet destdir="${build.resources}/jmx/xmbean"
                  force="true"
   	       excludedtags="@version,@author">
         <fileset dir="${source.java}">
  @@ -2169,6 +2169,9 @@
         <metainf dir="${build.resources}/jmx/xmbean/META-INF" />
         <fileset dir="${build.classes}">
           <include name="org/jboss/test/jmx/xmbean/*.class"/>
  +      </fileset>
  +      <fileset dir="${build.resources}/jmx/xmbean">
  +        <include name="**/*.xml"/>
         </fileset>
       </jar>