portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r386923 - /portals/jetspeed-2/trunk/applications/jetspeed/build.xml
Date Sun, 19 Mar 2006 03:40:19 GMT
Author: rwatler
Date: Sat Mar 18 19:40:19 2006
New Revision: 386923

URL: http://svn.apache.org/viewcvs?rev=386923&view=rev
Log:
jetspeed.properties resource always required in M2 build profiles

Modified:
    portals/jetspeed-2/trunk/applications/jetspeed/build.xml

Modified: portals/jetspeed-2/trunk/applications/jetspeed/build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/jetspeed/build.xml?rev=386923&r1=386922&r2=386923&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/jetspeed/build.xml (original)
+++ portals/jetspeed-2/trunk/applications/jetspeed/build.xml Sat Mar 18 19:40:19 2006
@@ -47,15 +47,30 @@
 
     <target name="configure" depends="test-deploy-type">
 
-        <!-- Build webapp resources -->        
+        <!-- Build required webapp resources -->        
         <delete dir="${basedir}/target/webapp"/>
         <mkdir dir="${basedir}/target/webapp"/>
         <copy todir="${basedir}/target/webapp">
             <fileset dir="${basedir}/../../src/webapp">
-                <exclude name="WEB-INF/conf/jetspeed.properties"/>
                 <exclude name="WEB-INF/pages/**"/>
             </fileset>
         </copy>
+
+        <!-- Configure runtime jetspeed properties resource -->
+        <replace file="${basedir}/target/webapp/WEB-INF/conf/jetspeed.properties">
+            <replacefilter token="@AUTODEPLOYMENT_SERVER@"
+                           value="${org.apache.jetspeed.services.autodeployment.server}"/>
+            <replacefilter token="@AUTODEPLOYMENT_USER@"
+                           value="${org.apache.jetspeed.services.autodeployment.user}"/>
+            <replacefilter token="@AUTODEPLOYMENT_PASSWORD@"
+                           value="${org.apache.jetspeed.services.autodeployment.password}"/>
+            <replacefilter token="autodeployment.catalina.version.major=5"
+                           value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
+            <replacefilter token="autodeployment.port=8080"
+                           value="autodeployment.port=${org.apache.jetspeed.services.autodeployment.port}"/>
+        </replace>
+
+        <!-- Build variable webapp resources -->        
         <antcall target="configure-min-resources"/>
         <antcall target="configure-full-resources"/>
 
@@ -89,22 +104,6 @@
         <copy todir="${basedir}/target/webapp/WEB-INF/pages">
             <fileset dir="${basedir}/../../src/webapp/WEB-INF/pages"/>
         </copy>
-        <copy file="${basedir}/../../src/webapp/WEB-INF/conf/jetspeed.properties"
-              todir="${basedir}/target/webapp/WEB-INF/conf"/>
-
-        <!-- configure runtime configuration properties resource -->
-        <replace file="${basedir}/target/webapp/WEB-INF/conf/jetspeed.properties">
-            <replacefilter token="@AUTODEPLOYMENT_SERVER@"
-                           value="${org.apache.jetspeed.services.autodeployment.server}"/>
-            <replacefilter token="@AUTODEPLOYMENT_USER@"
-                           value="${org.apache.jetspeed.services.autodeployment.user}"/>
-            <replacefilter token="@AUTODEPLOYMENT_PASSWORD@"
-                           value="${org.apache.jetspeed.services.autodeployment.password}"/>
-            <replacefilter token="autodeployment.catalina.version.major=5"
-                           value="autodeployment.catalina.version.major=${org.apache.jetspeed.catalina.version.major}"/>
-            <replacefilter token="autodeployment.port=8080"
-                           value="autodeployment.port=${org.apache.jetspeed.services.autodeployment.port}"/>
-        </replace>
     </target>
 
     <target name="test-deploy-type">



---------------------------------------------------------------------
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