You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2003/01/02 08:23:28 UTC

cvs commit: jakarta-turbine-maven/src/test/touchstone-build project.properties project.xml

jvanzyl     2003/01/01 23:23:28

  Modified:    src/test/touchstone-build project.properties project.xml
  Log:
  o updated the touchstone to include tests for interpolation. there are two
    in there. i cleaned up the way interpolation is done so that properties are
    once again available. there is one which takes a property for an anonymous
    cvs password and inserts it into the repository/connection field, and the
    use of ${basedir} in one of the resource entries.
  
  o update the touchstone with an example of the source modification feature.
  
  Revision  Changes    Path
  1.5       +3 -0      jakarta-turbine-maven/src/test/touchstone-build/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/test/touchstone-build/project.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.properties	9 Dec 2002 00:02:45 -0000	1.4
  +++ project.properties	2 Jan 2003 07:23:28 -0000	1.5
  @@ -20,3 +20,6 @@
   # ------------------------------------------------------------------------
   # 
   # ------------------------------------------------------------------------
  +
  +anonymousUser = testuser
  +excludeFoo = true
  
  
  
  1.14      +72 -2     jakarta-turbine-maven/src/test/touchstone-build/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/test/touchstone-build/project.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- project.xml	12 Dec 2002 00:39:09 -0000	1.13
  +++ project.xml	2 Jan 2003 07:23:28 -0000	1.14
  @@ -29,7 +29,7 @@
     <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
   
     <repository>
  -    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven</connection>
  +    <connection>scm:cvs:pserver:${anonymousUser}@cvs.apache.org:/home/cvspublic:jakarta-turbine-maven</connection>
       <url>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/</url>
     </repository>
   
  @@ -120,6 +120,56 @@
       </dependency>
       -->
   
  +    <!--
  +     |
  +     | Jelly runtime dependencies.
  +     |
  +    -->
  +    <dependency>
  +      <id>commons-jelly</id>
  +      <version>SNAPSHOT</version>
  +    </dependency>
  +
  +    <dependency>
  +      <id>commons-betwixt</id>
  +      <version>SNAPSHOT</version>
  +    </dependency>
  +
  +    <dependency>
  +      <id>commons-digester</id>
  +      <version>1.2</version>
  +    </dependency>
  +
  +    <dependency>
  +      <id>commons-logging</id>
  +      <version>1.0.1</version>
  +    </dependency>
  +
  +    <dependency>
  +      <id>commons-beanutils</id>
  +      <version>SNAPSHOT</version>
  +    </dependency>
  +
  +    <dependency>
  +      <id>commons-collections</id>
  +      <version>2.1</version>
  +    </dependency>
  +
  +    <dependency>
  +      <id>dom4j</id>
  +      <version>1.4-dev-8</version>
  +    </dependency>
  +    
  +    <dependency>
  +      <id>werkz</id>
  +      <version>1.0-beta-5</version>
  +    </dependency>
  +
  +    <dependency>
  +      <id>commons-jexl</id>
  +      <version>1.0-beta-1</version>
  +    </dependency>
  +
     </dependencies>
   
     <build>
  @@ -147,7 +197,7 @@
   
       <resources>
         <resource>
  -        <directory>src/conf</directory>
  +        <directory>${basedir}/src/conf</directory>
           <includes>
             <include>*.properties</include>
           </includes>
  @@ -166,6 +216,26 @@
           <directory>src/resources</directory>
         </resource>
       </resources>
  +    
  +    <!--
  +     |
  +     | Source Modifications. In the first case we are excluding **/Foo.java
  +     | if the specified className DOES NOT exist. So org.foo.bar.Lulu
  +     | doesn't exist anywhere in this build so **/Foo.java files are
  +     | removed from the compilcation phase. This is how we exclude the
  +     | JDK 1.4 classes in the commons-logging maven build.
  +     |
  +     -->
  +    
  +    <sourceModifications>
  +      <sourceModification>
  +        <className>org.foo.bar.Lulu</className>
  +        <excludes>
  +          <exclude>**/Foo.java</exclude>
  +        </excludes>
  +      </sourceModification>
  +    </sourceModifications>
  +    
     </build>
   </project>