cvs commit: maven/src/conf driver.jelly

[brett]

brett       2003/10/02 22:33:05

  Modified:    src/conf driver.jelly
  Log:
  clean up name spaces
  
  Revision  Changes    Path
  1.28      +12 -14    maven/src/conf/driver.jelly
  
  Index: driver.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/conf/driver.jelly,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- driver.jelly      19 Aug 2003 04:19:01 -0000      1.27
  +++ driver.jelly      3 Oct 2003 05:33:05 -0000       1.28
  @@ -2,9 +2,7 @@
   
   <project
     xmlns:j="jelly:core"
  -  xmlns:ant="jelly:ant"
  -  xmlns:define="jelly:define"
  -  xmlns:util="jelly:util">
  +  xmlns:ant="jelly:ant">
   
       <!-- ================================================================== -->
       <!-- D R I V E R  I N I T I A L I Z A T I O N                           -->
  @@ -15,7 +13,7 @@
   
       <j:set var="dir__" value="${pom.build.sourceDirectory}X"/>
       <j:if test="${dir__ != 'X'}">
  -      <available
  +      <ant:available
           property="sourcesPresent"
           file="${pom.build.sourceDirectory}"
         />
  @@ -23,30 +21,30 @@
   
       <j:set var="dir__" value="${pom.build.unitTestSourceDirectory}X"/>
       <j:if test="${dir__ != 'X'}">
  -      <available
  +      <ant:available
           property="unitTestSourcesPresent"
           file="${pom.build.unitTestSourceDirectory}"
         />
       </j:if>
   
  -    <path id="maven-classpath">
  -      <fileset dir="${maven.home}/lib"/>
  -    </path>
  +    <ant:path id="maven-classpath">
  +      <ant:fileset dir="${maven.home}/lib"/>
  +    </ant:path>
   
       <j:if test="${sourcesPresent == 'true'}">
         <!--
          | FIXME: It would be nice for other plugins to have the source available
          |        as a fileset
          |-->
  -      <path id="maven.compile.src.set">
  -        <pathelement location="${pom.build.sourceDirectory}"/>
  -      </path>
  +      <ant:path id="maven.compile.src.set">
  +        <ant:pathelement location="${pom.build.sourceDirectory}"/>
  +      </ant:path>
       </j:if>
   
       <j:if test="${unitTestSourcesPresent == 'true'}">
  -      <path id="maven.test.compile.src.set">
  -        <pathelement location="${pom.build.unitTestSourceDirectory}"/>
  -      </path>
  +      <ant:path id="maven.test.compile.src.set">
  +        <ant:pathelement location="${pom.build.unitTestSourceDirectory}"/>
  +      </ant:path>
       </j:if>
   
       <goal name="build:end">
  
  
  

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