brett       2003/08/18 04:24:02

  Modified:    src/test/touchstone-build/src/reactor-build/resources Tag:
                        MAVEN_RC1_STABLE maven.xml
  Log:
  additional test
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.4.1   +24 -2     
maven/src/test/touchstone-build/src/reactor-build/resources/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: 
/home/cvs/maven/src/test/touchstone-build/src/reactor-build/resources/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- maven.xml 28 Jan 2003 17:19:50 -0000      1.1
  +++ maven.xml 18 Aug 2003 11:24:02 -0000      1.1.4.1
  @@ -5,6 +5,28 @@
     xmlns:util="jelly:util">
   
       <goal name="run">
  +      <attainGoal name="run-maven" />
  +      <attainGoal name="run-reactor" />
  +    </goal>
  +
  +    <goal name="run-maven">
  +        <delete dir="subproject/target" quiet="true"/>
  +
  +        <maven:maven
  +          descriptor="subproject/project.xml"
  +          goals="java:jar-resources"
  +          ignoreFailures="false"
  +          />
  +        
  +        <util:available file="subproject/target/classes/test.properties">
  +            <j:set var="resourcesCopied" value="true"/>
  +        </util:available>
  +        <j:if test="${resourcesCopied != 'true'}">
  +            <fail>resource:copy fails for subproject using maven:maven</fail>
  +        </j:if>
  +    </goal>
  +
  +    <goal name="run-reactor">
           <delete dir="subproject/target" quiet="true"/>
   
           <maven:reactor
  @@ -19,8 +41,8 @@
               <j:set var="resourcesCopied" value="true"/>
           </util:available>
           <j:if test="${resourcesCopied != 'true'}">
  -            <fail>resource:copy fails for subproject</fail>
  +            <fail>resource:copy fails for subproject using maven:reactor</fail>
           </j:if>
       </goal>
       
  -</project>
  \ No newline at end of file
  +</project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to