portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r766837 - /portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
Date Mon, 20 Apr 2009 20:01:50 GMT
Author: taylor
Date: Mon Apr 20 20:01:49 2009
New Revision: 766837

URL: http://svn.apache.org/viewvc?rev=766837&view=rev
Log:
patch from Jeroen Hoffman to move site and logs into directory outside webapp

Modified:
    portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml

Modified: portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml?rev=766837&r1=766836&r2=766837&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/etc/ant-installer/build.xml Mon Apr
20 20:01:49 2009
@@ -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,9 +69,37 @@
         <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="">
 



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message