maven-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject cvs commit: maven/src/test/touchstone-build/src/reactor-build/username_test maven.xml project.xml
Date Thu, 05 Jun 2003 19:55:03 GMT
jvanzyl     2003/06/05 12:55:03

  Modified:    src/test/touchstone-build/src/reactor-build/username_test
                        maven.xml project.xml
  Log:
  o having to do a little coercion which means something is not right
    in the core. Should probably just swap out the old core for the new.
  
  Revision  Changes    Path
  1.2       +28 -13    maven/src/test/touchstone-build/src/reactor-build/username_test/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/test/touchstone-build/src/reactor-build/username_test/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml	5 Jun 2003 19:17:14 -0000	1.1
  +++ maven.xml	5 Jun 2003 19:55:02 -0000	1.2
  @@ -1,13 +1,28 @@
  -<?xml version="1.0" encoding="UTF-8"?>
  -<project default="run"
  -  xmlns:j="jelly:core"
  -  xmlns:maven="jelly:maven"
  -  xmlns:util="jelly:util">
  -
  -    <goal name="run">
  -        <j:if test="${!maven.username.equals('maven')}">
  -            <fail>username_test: maven.username not properly assigned from root project.</fail>
  -        </j:if>
  -    </goal>
  -    
  -</project>
  +<?xml version="1.0" encoding="UTF-8"?>
  +<project default="run"
  +  xmlns:j="jelly:core"
  +  xmlns:ant="jelly:ant"
  +  xmlns:maven="jelly:maven"
  +  xmlns:util="jelly:util">
  +
  +    <goal name="run">
  +      
  +      <!-- 
  +      
  +      In order for this to pass I seem to have to coerce the value in the
  +      JellyContext to a String using the ant:property tag. I don't think
  +      John Casey had to do this so I need to check the code as I probably
  +      changed something that is causing this mixup. The value in the
  +      JellyContext is probably an Expression which is why the evaluation
  +      is coming out false without coercion.
  +      
  +      -->
  +      <ant:property name="mavenUserName" value="${maven.username}"/>
  +      
  +      <j:if test="${mavenUserName != 'maven'}">
  +        <fail>username_test: maven.username not properly assigned from root project.</fail>
  +      </j:if>
  +      
  +    </goal>
  +    
  +</project>
  
  
  
  1.2       +24 -24    maven/src/test/touchstone-build/src/reactor-build/username_test/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/test/touchstone-build/src/reactor-build/username_test/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	5 Jun 2003 19:17:14 -0000	1.1
  +++ project.xml	5 Jun 2003 19:55:02 -0000	1.2
  @@ -1,24 +1,24 @@
  -<?xml version="1.0" encoding="UTF-8"?>
  -<project>
  -  <pomVersion>3</pomVersion>
  -  <currentVersion>1.0</currentVersion>
  -  <name>maven username test when set outside reactor and used within</name>
  -  <organization/>
  -  <inceptionYear/>
  -  <package/>
  -  <logo/>
  -  <shortDescription/>
  -  <url/>
  -  <siteAddress/>
  -  <siteDirectory/>
  -  <distributionSite/>
  -  <distributionDirectory/>
  -  <repository/>
  -  <mailingLists/>
  -  <developers/>
  -  <dependencies/>
  -  <build>
  -    <sourceDirectory/>
  -    <unitTestSourceDirectory/>
  -  </build>
  -</project>
  +<?xml version="1.0" encoding="UTF-8"?>
  +<project>
  +  <pomVersion>3</pomVersion>
  +  <currentVersion>1.0</currentVersion>
  +  <name>maven username test when set outside reactor and used within</name>
  +  <organization/>
  +  <inceptionYear/>
  +  <package/>
  +  <logo/>
  +  <shortDescription/>
  +  <url/>
  +  <siteAddress/>
  +  <siteDirectory/>
  +  <distributionSite/>
  +  <distributionDirectory/>
  +  <repository/>
  +  <mailingLists/>
  +  <developers/>
  +  <dependencies/>
  +  <build>
  +    <sourceDirectory/>
  +    <unitTestSourceDirectory/>
  +  </build>
  +</project>
  
  
  

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


Mime
View raw message