X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build.xml;h=638550908ed167a5f2e0f4d092ab0d42ecfc8734;hb=96bf21dac3192e475bd470dcb8e9581393161895;hp=0dcf3ec1777768332a65c6e787ae76ac1ba6d38a;hpb=7a93fcce539898c65edf71fe3dc341a7e3cc94ca;p=mir.git

diff --git a/build.xml b/build.xml
index 0dcf3ec1..63855090 100755
--- a/build.xml
+++ b/build.xml
@@ -114,33 +114,36 @@
 
   <target name="prepare">
     <mkdir  dir="${deploy.home}"/>
+    <mkdir  dir="${deploy.webinf}"/>
+    <mkdir  dir="${deploy.classes}"/>
+    <mkdir  dir="${deploy.webinf}/log"/>
+
     <copy todir="${deploy.home}">
       <fileset dir="web"/>
     </copy>
-    <mkdir  dir="${deploy.home}/templates"/>
-    <copy todir="${deploy.home}/templates">
+
+    <copy todir="${deploy.webinf}/etc">
+      <fileset dir="etc" excludes="bundles/** web.xml"/>
+    </copy>
+    <copy todir="${deploy.classes}/bundles">
+        <fileset dir="etc/bundles"/>
+    </copy>
+    <copy todir="${deploy.webinf}" file="etc/web.xml"/>
+
+    <copy todir="${deploy.webinf}/templates">
       <fileset dir="templates"/>
     </copy>
-    <!--??? why do we need the source in deployment? - br1
-    <mkdir  dir="${deploy.home}/src"/>
-    <copy todir="${deploy.home}/src">
-      <fileset dir="source"/>
+
+    <copy todir="${deploy.classes}/bundles">
+      <fileset dir="bundles"/>
     </copy>
-    -->
 
-    <mkdir  dir="${deploy.home}/WEB-INF"/>
-    <copy  file="etc/web.xml"          tofile="${deploy.home}/WEB-INF/web.xml"/>
-    <mkdir  dir="${deploy.classes}"/>
-    <mkdir  dir="${deploy.home}/WEB-INF/lib"/>
     <copy todir="${deploy.home}/WEB-INF/lib">
       <fileset dir="lib">
         <exclude name="ant.jar"/>
         <exclude name="xerces.jar"/>
       </fileset>
     </copy>
-    <mkdir  dir="${javadoc.home}"/>
-    <mkdir  dir="${deploy.home}/log"/>
-
   </target>
 
 
@@ -153,7 +156,7 @@
 
   <target name="clean">
     <delete dir="${deploy.classes}"/>
-	<mkdir dir="${deploy.classes}"/>
+    <mkdir dir="${deploy.classes}"/>
   </target>
 
 
@@ -208,24 +211,12 @@
            debug="on" optimize="off" deprecation="on">
       <classpath refid="project.class.path"/>
     </javac>
-    <copy   todir="${deploy.classes}">
-      <fileset dir="source" includes="**/*.properties"/>
-    </copy>
-    <copy   todir="${deploy.home}">
-      <fileset dir="source" includes="**/content-types.properties"/>
-      <!-- server.xml is currently not used
-      <fileset dir="source" includes="**/server.xml"/>
-      -->
-    </copy>
-    <copy   todir="${deploy.classes}/bundles">
-      <fileset dir="bundles" includes="**/*.properties"/>
-    </copy>
   </target>
 
 
 
   <target name="perms">
-	<exec executable="./perms.sh"/>
+    <exec executable="./perms.sh"/>
   </target>