rebuilding head

[mir.git] / build.xml

diff --git a/build.xml b/build.xml
index 7e84a78..4f7d893 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -85,6 +85,9 @@
     <fileset dir="lib">
       <include name="*.jar"/>
     </fileset>
+    <fileset dir="lib/struts">
+      <include name="*.jar"/>
+    </fileset>
     <fileset dir="lib/hibernate">
       <include name="*.jar"/>
     </fileset>
@@ -132,6 +135,12 @@
     <copy todir="${deploy.home}">
       <fileset dir="web"/>
     </copy>
+        
+    <copy todir="${deploy.webinf}/classes">
+       <fileset dir="source">
+               <include name="**/*.xml"/>
+       </fileset>
+    </copy>
 
     <copy todir="${deploy.webinf}/etc">
       <fileset dir="etc" excludes="bundles/** hibernate.cfg.xml web.xml"/>
@@ -158,8 +167,8 @@
         <exclude name="ant.jar"/>
         <exclude name="xerces.jar"/>
       </fileset>
-      <fileset dir="lib/hibernate">
-      </fileset>
+      <fileset dir="lib/hibernate"/>
+      <fileset dir="lib/struts"/>
     </copy>
   </target>
 
@@ -253,7 +262,7 @@
 
   <target name="javadoc" depends="prepare">
     <javadoc packagenames="mir.*, mircoders.*"
-            sourcefiles="source/${app.name}.java,source/Open${app.name}.java"
+            sourcefiles="source/Mir.java,source/OpenMir.java"
             sourcepath="source"
              destdir="${javadoc.home}">
          <classpath refid="project.class.path"/>
@@ -287,10 +296,16 @@
   </target>
   
   <target name="rundbtest" depends="compile">
-       <java classname="mir.core.test.Test">
+       <java fork="true" classname="mir.core.test.Test">
                <classpath>
+                       <fileset dir="${tomcat.home}/common/endorsed">
+                               <include name="**/*.jar"/>
+                       </fileset>
+                       <fileset dir="${tomcat.home}/common/lib">
+                               <include name="**/*.jar"/>
+                       </fileset>
                        <fileset dir="${deploy.webinf}/lib">
-                               <include name="*.jar"/>
+                               <include name="**/*.jar"/>
                        </fileset>
                        <path id="classes" path="${deploy.classes}"/>
                </classpath>