Index: jetspeed-installer/etc/ant-installer/build.xml
===================================================================
--- jetspeed-installer/etc/ant-installer/build.xml	(revision 765898)
+++ jetspeed-installer/etc/ant-installer/build.xml	(working copy)
@@ -50,7 +50,7 @@
     </delete>
     <chmod perm="700" dir="${installDir}/bin" includes="**/*.sh" />
 
-    <echo>Setting up the database configuration</echo>
+   	<echo>Setting up the database configuration</echo>
     <condition property="jdbcjar" value="${installDir}/database/lib/derby-10.3.2.1.jar">
       <equals arg1="${jdbc.driver.jar}" arg2="" />
     </condition>
@@ -69,10 +69,38 @@
         <filter token="dbImportPsml" value="${dbImportPsml}" />
       </filterset>
     </move>
+
+  	<echo>Moving pages out of jetspeed webapp</echo>
+    <move file="${installDir}/webapps/jetspeed/WEB-INF/pages" todir="${installDir}" />
+    <move file="${installDir}/webapps/jetspeed/WEB-INF/conf/jetspeed.properties" 
+        tofile="${installDir}/webapps/jetspeed/WEB-INF/conf/jetspeed.properties.unfiltered"/>
+    <move file="${installDir}/webapps/jetspeed/WEB-INF/conf/jetspeed.properties.unfiltered" 
+        tofile="${installDir}/webapps/jetspeed/WEB-INF/conf/jetspeed.properties"
+       	overwrite="true">
+		 <!-- note that the $ is escaped here -->
+       <filterset begintoken="psml.pages.path" endtoken="$${applicationRoot}/WEB-INF/pages">
+         <filter token=" = " value="psml.pages.path = $${applicationRoot}/../../pages" />
+       </filterset>
+    </move>
+
+  	<echo>Configuring log directories</echo>
+    <delete dir="${installDir}/webapps/jetspeed/WEB-INF/logs" />
+    <move file="${installDir}/webapps/jetspeed/WEB-INF/conf/Log4j.properties" 
+        tofile="${installDir}/webapps/jetspeed/WEB-INF/conf/Log4j.properties.unfiltered"/>
+    <move file="${installDir}/webapps/jetspeed/WEB-INF/conf/Log4j.properties.unfiltered" 
+        tofile="${installDir}/webapps/jetspeed/WEB-INF/conf/Log4j.properties"
+       	overwrite="true">
+		 <!-- note that the $ is escaped here -->
+       <filterset begintoken="$${applicationRoot}" endtoken="logs/">
+         <filter token="/" value="$${applicationRoot}/../../logs/jetspeed/" />
+       </filterset>
+    </move>
+
     <echo>Setting up the Jetspeed database (if selected)</echo>
     <ant antfile="${installDir}/database/build.xml" target="${setupDBAntTarget}" dir="${installDir}/database" />
-  </target>
 
+ </target>
+
   <target name="antinstaller-checkdb" depends="">
 
     <checkConnection driver="${jdbcDriverClass}" url="${jdbcUrl}" userid="${dbUser}" password="${dbPassword}">