See below ..

On 9 May 2004 22:44:30 -0000, <[EMAIL PROTECTED]> wrote:

aheritier 2004/05/09 15:44:30

  Modified:    ant/src/plugin-test maven.xml project.xml
  Added:       ant/src/plugin-test/src/data-1 file1.properties
               ant/src/plugin-test/src/data-2 file2.properties
               ant/src/plugin-test/src/testdata-1 file1.properties
               ant/src/plugin-test/src/testdata-2 file2.properties
  Log:
  add a test case for MPANT-14

  Revision  Changes    Path
  1.4       +8 -0      maven-plugins/ant/src/plugin-test/maven.xml

  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/ant/src/plugin-test/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml 28 Mar 2004 23:02:04 -0000      1.3
  +++ maven.xml 9 May 2004 22:44:30 -0000       1.4
  @@ -17,6 +17,7 @@
    -->
   <project xmlns:util="jelly:util"
            xmlns:j="jelly:core"
  +         xmlns:ant="jelly:ant"
            xmlns:assert="assert">

     <goal name="testPlugin" prereqs="test-ant">
  @@ -27,6 +28,13 @@
       <attainGoal name="ant"/>

<assert:assertFileExists file="${basedir}/build.xml"/>
+
+ <ant:ant/>
+
+ <assert:assertFileExists file="${maven.build.dest}/directory-1/file1.properties"/>
+ <assert:assertFileExists file="${maven.build.dest}/file2.properties"/>
+ <assert:assertFileExists file="${maven.test.dest}/directory-1/file1.properties"/>
+ <assert:assertFileExists file="${maven.test.dest}/file2.properties"/>


       <delete file="${basedir}/build.xml"/>
     </goal>



1.4 +42 -0 maven-plugins/ant/src/plugin-test/project.xml

  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/maven-plugins/ant/src/plugin-test/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml       4 Mar 2004 17:59:03 -0000       1.3
  +++ project.xml       9 May 2004 22:44:30 -0000       1.4
  @@ -53,5 +53,47 @@
     </developers>

     <build>
  +    <sourceDirectory>src/main</sourceDirectory>
  +    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
  +
  +    <unitTest>
  +      <includes>
  +        <include>**/*Test.java</include>
  +      </includes>
  +      <!-- unit test resources -->
  +      <resources>
  +        <resource>
  +          <directory>src/testdata-1</directory>
  +          <targetPath>directory-1</targetPath>
  +          <includes>
  +            <include>**</include>
  +          </includes>
  +        </resource>
  +
  +        <resource>
  +          <directory>src/testdata-2</directory>
  +          <includes>
  +            <include>**</include>
  +          </includes>
  +        </resource>
  +      </resources>
  +    </unitTest>
  +
  +    <resources>
  +        <resource>
  +          <directory>src/data-1</directory>
  +          <targetPath>directory-1</targetPath>
  +          <includes>
  +            <include>**</include>
  +          </includes>
  +        </resource>
  +
  +        <resource>
  +          <directory>src/data-2</directory>
  +          <includes>
  +            <include>**</include>
  +          </includes>
  +        </resource>
  +    </resources>
     </build>
   </project>


Did you really mean to add these files as binary files? If so, why?



1.1 maven-plugins/ant/src/plugin-test/src/data-1/file1.properties

<<Binary file>>


1.1 maven-plugins/ant/src/plugin-test/src/data-2/file2.properties


<<Binary file>>


1.1 maven-plugins/ant/src/plugin-test/src/testdata-1/file1.properties


<<Binary file>>


1.1 maven-plugins/ant/src/plugin-test/src/testdata-2/file2.properties


<<Binary file>>



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


-- Trygve

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



Reply via email to