X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build.xml;h=4f7d893d562178a54d45900a06712beccbd42a56;hb=ee179c67cd47f2158b3502134166c5be297a62fe;hp=e1aae85e58d3ab589aa366a19f2f34e35550cb1a;hpb=e031825cc463c605583d55865516ff9d532c38e9;p=mir.git

diff --git a/build.xml b/build.xml
index e1aae85e..4f7d893d 100755
--- a/build.xml
+++ b/build.xml
@@ -56,10 +56,10 @@
 
 -->
 
-  <property name="app.name"       value="Mir"/>
-  <property name="deploy.home"    value="../${app.name}"/>
+  <property name="app.name"       value="mir"/>
+  <property name="deploy.home"    value="./bin/${app.name}"/>
 
-  <!-- don't use unless your Jikes is >= v1.17 and you know what you are doing -->
+  <!-- don't use unless your Jikes is >= v1.18 -->
   <!-- <property name="build.compiler"   value="jikes"/>-->
 
 
@@ -81,9 +81,16 @@
     <pathelement path="${deploy.home}"/>
     <pathelement path="${deploy.classes}"/>
     <pathelement path="source"/>
+    <pathelement path="etc/extrasource"/>
     <fileset dir="lib">
       <include name="*.jar"/>
     </fileset>
+    <fileset dir="lib/struts">
+      <include name="*.jar"/>
+    </fileset>
+    <fileset dir="lib/hibernate">
+      <include name="*.jar"/>
+    </fileset>
     <pathelement path="${tomcat.home}/lib/tomcat.jar"/>
   <!-- for libs shared between tomcat and webapps (tomcat 3.3.x) -->
 	<fileset dir="${tomcat.home}">
@@ -93,7 +100,7 @@
 	<fileset dir="${tomcat.home}">
 		<include name="lib/apps/*.jar" />
 	</fileset>
-  <!-- for libs shared between tomcat and webapps (tomcat 4.0.x) -->
+  <!-- for libs shared between tomcat and webapps (tomcat 4.x.x) -->
 	<fileset dir="${tomcat.home}">
 		<include name="common/lib/*.jar" />
 	</fileset>
@@ -101,6 +108,13 @@
 	<fileset dir="${tomcat.home}">
 		<include name="lib/*.jar" />
 	</fileset>
+  <!-- for libs shared between webapps (tomcat 4.1.x) -->
+	<fileset dir="${tomcat.home}">
+		<include name="shared/lib/*.jar" />
+	</fileset>
+	<fileset dir="${tomcat.home}">
+		<include name="common/endorsed/*.jar" />
+	</fileset>
   </path>
 
 
@@ -121,9 +135,15 @@
     <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/** web.xml"/>
+      <fileset dir="etc" excludes="bundles/** hibernate.cfg.xml web.xml"/>
     </copy>
     <copy todir="${deploy.classes}/bundles">
         <fileset dir="etc/bundles"/>
@@ -133,17 +153,22 @@
     <copy todir="${deploy.webinf}/templates">
       <fileset dir="templates"/>
     </copy>
-
+    
+    <copy todir="${deploy.webinf}" file="source/default.properties" />
+    
     <copy todir="${deploy.classes}/bundles">
       <fileset dir="bundles"/>
     </copy>
-
+    
+    <copy todir="${deploy.classes}" file="etc/hibernate.cfg.xml"/>
+    
     <copy todir="${deploy.home}/WEB-INF/lib">
       <fileset dir="lib">
         <exclude name="ant.jar"/>
         <exclude name="xerces.jar"/>
-        <exclude name="servlet-2.2.jar"/>
       </fileset>
+      <fileset dir="lib/hibernate"/>
+      <fileset dir="lib/struts"/>
     </copy>
   </target>
 
@@ -201,6 +226,10 @@
       <srcfileset
         dir="source"
         includes="**/*.java"/>
+<!-- ML: now why can't this be added?
+      <srcfileset
+        dir="etc/extrasource"
+        includes="**/*.java"/> -->
       <srcfileset
         dir="lib"
         includes="*.jar"/>
@@ -208,8 +237,10 @@
         dir="${deploy.classes}"
         includes="**/*.class"/>
     </dependset>
-    <javac srcdir="source" destdir="${deploy.classes}"
+    <javac destdir="${deploy.classes}"
            debug="on" optimize="off" deprecation="on">
+      <src path="source"/>
+      <src path="etc/extrasource"/>
       <classpath refid="project.class.path"/>
     </javac>
   </target>
@@ -231,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"/>
@@ -263,5 +294,23 @@
          basedir="${deploy.home}"
          excludes="${dist.war}"/>
   </target>
+  
+  <target name="rundbtest" depends="compile">
+  	<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"/>
+  			</fileset>
+  			<path id="classes" path="${deploy.classes}"/>
+  		</classpath>
+  		<sysproperty key="org.xml.sax.driver" value="org.apache.xerces.parsers.SAXParser"/> 
+  	</java>
+  </target>
 
 </project>