You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sc...@apache.org on 2005/07/11 22:48:13 UTC

svn commit: r210211 - /myfaces/build/trunk/build.xml

Author: schof
Date: Mon Jul 11 13:48:11 2005
New Revision: 210211

URL: http://svn.apache.org/viewcvs?rev=210211&view=rev
Log:
no longer need to build standard.war; moved manifest.properties so it will work with bootstrap.xml

Modified:
    myfaces/build/trunk/build.xml

Modified: myfaces/build/trunk/build.xml
URL: http://svn.apache.org/viewcvs/myfaces/build/trunk/build.xml?rev=210211&r1=210210&r2=210211&view=diff
==============================================================================
--- myfaces/build/trunk/build.xml (original)
+++ myfaces/build/trunk/build.xml Mon Jul 11 13:48:11 2005
@@ -157,7 +157,7 @@
     directory, or from settings in a superior build.xml script.
     -->
     <property environment="env"/>
-
+    <property file="manifest.properties"/>
 
     <!-- ========== Derived Properties ==================================== -->
 
@@ -200,7 +200,6 @@
     <!-- ========== Configurable Subproject Properties ==================== -->
 
     <property file="../build.properties"/>
-    <property file="manifest.properties"/>
 
     <!-- ========== User Supplied Properties ============================== -->
 
@@ -652,14 +651,6 @@
             <property name="classes.dir" value="${temp.dir}/simple/classes"/>
             <property name="src.dir" value="${subproject.dir}/simple/src/java"/>
             <property name="web.xml.file" value="${subproject.dir}/conf/web.xml"/>
-        </ant>
-
-        <ant target="war" dir="${subproject.dir}/build">
-            <property name="war.file" value="${dist.dir}/standard.war"/>
-            <property name="web.dir" value="${subproject.dir}/standard"/>
-            <property name="classes.dir" value="${temp.dir}/standard/classes"/>
-            <property name="src.dir" value="${subproject.dir}/standard/src/java"/>
-            <property name="web.xml.file" value="${subproject.dir}/conf/basic-web.xml"/>
         </ant>
 
         <ant target="war" dir="${subproject.dir}/build">