You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/09/12 00:15:00 UTC

svn commit: r814054 - in /maven/plugins/trunk/maven-remote-resources-plugin: ./ src/it/resources/000-generateFromBundle/ src/it/resources/001-generateFromOverride/ src/it/resources/002-filterLocalOverride/ src/it/resources/custom-filter-delim/ src/it/r...

Author: jdcasey
Date: Fri Sep 11 22:14:59 2009
New Revision: 814054

URL: http://svn.apache.org/viewvc?rev=814054&view=rev
Log:
clean up ITs a little bit. There's probably still more to do to make it simpler to deploy accessory projects for ITs.

Added:
    maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/filter-local-override/   (props changed)
      - copied from r811529, maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/002-filterLocalOverride/
    maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle/   (props changed)
      - copied from r811529, maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/000-generateFromBundle/
    maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-override/   (props changed)
      - copied from r811529, maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/001-generateFromOverride/
    maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java   (contents, props changed)
      - copied, changed from r814046, maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT002_FilterLocalOverride.java
    maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java   (contents, props changed)
      - copied, changed from r811529, maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT000_GenerateFromBundle.java
    maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java   (contents, props changed)
      - copied, changed from r811529, maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT001_GenerateFromOverride.java
Removed:
    maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/000-generateFromBundle/
    maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/001-generateFromOverride/
    maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/002-filterLocalOverride/
    maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT000_GenerateFromBundle.java
    maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT001_GenerateFromOverride.java
    maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT002_FilterLocalOverride.java
Modified:
    maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
    maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/pom.xml
    maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/filter-local-override/pom.xml
    maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle/pom.xml
    maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-override/pom.xml
    maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/get-dependency-projects/project/pom.xml
    maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/run-only-at-execution-root/pom.xml
    maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/pom.xml

Modified: maven/plugins/trunk/maven-remote-resources-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/pom.xml?rev=814054&r1=814053&r2=814054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/pom.xml Fri Sep 11 22:14:59 2009
@@ -204,6 +204,7 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
+        <version>1.1</version>
         <executions>
           <execution>
             <id>site-docs</id>
@@ -242,6 +243,7 @@
             </goals>
             <configuration>
               <version>1.1.0</version>
+              <useJava5>true</useJava5>
               <models>
                 <model>src/main/mdo/remote-resources.mdo</model>
               </models>
@@ -256,6 +258,7 @@
             </goals>
             <configuration>
               <version>1.0.0</version>
+              <useJava5>true</useJava5>
               <models>
                 <model>src/main/mdo/supplemental-model.mdo</model>
               </models>

Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/pom.xml?rev=814054&r1=814053&r2=814054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/custom-filter-delim/pom.xml Fri Sep 11 22:14:59 2009
@@ -2,22 +2,14 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   
-  <groupId>org.apache.maven.plugin.rresource.it</groupId>
-  <artifactId>custom-filter-delim</artifactId>
-  <version>${project.version}</version>
+  <parent>
+    <groupId>org.apache.maven.plugin.rresource.it</groupId>
+    <artifactId>it-parent</artifactId>
+    <version>${project.version}</version>
+    <relativePath>../it-parent/pom.xml</relativePath>
+  </parent>
   
-  <repositories>
-    <repository>
-      <id>main-local</id>
-      <url>file:${localRepository}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
+  <artifactId>custom-filter-delim</artifactId>
   
   <build>
     <resources>
@@ -30,7 +22,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <id>remote-resources</id>

Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/filter-local-override/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/filter-local-override/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/filter-local-override/pom.xml?rev=814054&r1=811529&r2=814054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/filter-local-override/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/filter-local-override/pom.xml Fri Sep 11 22:14:59 2009
@@ -2,22 +2,14 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   
-  <groupId>org.apache.maven.plugin.rresource.it</groupId>
-  <artifactId>002-filterLocalOverride</artifactId>
-  <version>${project.version}</version>
+  <parent>
+    <groupId>org.apache.maven.plugin.rresource.it</groupId>
+    <artifactId>it-parent</artifactId>
+    <version>${project.version}</version>
+    <relativePath>../it-parent/pom.xml</relativePath>
+  </parent>
   
-  <repositories>
-    <repository>
-      <id>main-local</id>
-      <url>file:${localRepository}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
+  <artifactId>filter-local-override</artifactId>
   
   <build>
     <resources>
@@ -30,7 +22,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <id>remote-resources</id>

Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle/pom.xml?rev=814054&r1=811529&r2=814054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-bundle/pom.xml Fri Sep 11 22:14:59 2009
@@ -2,28 +2,19 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   
-  <groupId>org.apache.maven.plugin.rresource.it</groupId>
-  <artifactId>000-generateFromBundle</artifactId>
-  <version>${project.version}</version>
+  <parent>
+    <groupId>org.apache.maven.plugin.rresource.it</groupId>
+    <artifactId>it-parent</artifactId>
+    <version>${project.version}</version>
+    <relativePath>../it-parent/pom.xml</relativePath>
+  </parent>
   
-  <repositories>
-    <repository>
-      <id>main-local</id>
-      <url>file:${localRepository}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
+  <artifactId>generate-from-bundle</artifactId>
   
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <id>remote-resources</id>

Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-override/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-override/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-override/pom.xml?rev=814054&r1=811529&r2=814054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-override/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/generate-from-override/pom.xml Fri Sep 11 22:14:59 2009
@@ -2,28 +2,19 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   
-  <groupId>org.apache.maven.plugin.rresource.it</groupId>
-  <artifactId>001-generateFromOverride</artifactId>
-  <version>${project.version}</version>
+  <parent>
+    <groupId>org.apache.maven.plugin.rresource.it</groupId>
+    <artifactId>it-parent</artifactId>
+    <version>${project.version}</version>
+    <relativePath>../it-parent/pom.xml</relativePath>
+  </parent>
   
-  <repositories>
-    <repository>
-      <id>main-local</id>
-      <url>file:${localRepository}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
+  <artifactId>generate-from-override</artifactId>
   
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <id>remote-resources</id>

Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/get-dependency-projects/project/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/get-dependency-projects/project/pom.xml?rev=814054&r1=814053&r2=814054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/get-dependency-projects/project/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/get-dependency-projects/project/pom.xml Fri Sep 11 22:14:59 2009
@@ -2,33 +2,15 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   
-  <groupId>org.apache.maven.plugin.rresource.it</groupId>
+  <parent>
+    <groupId>org.apache.maven.plugin.rresource.it</groupId>
+    <artifactId>it-parent</artifactId>
+    <version>${project.version}</version>
+    <relativePath>../../it-parent/pom.xml</relativePath>
+  </parent>
+  
   <artifactId>get-dependency-projects</artifactId>
-  <version>${project.version}</version>
   
-  <repositories>
-    <repository>
-      <id>it-remote</id>
-      <url>file:${remoteRepository}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>main-local</id>
-      <url>file:${localRepository}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.plugin.rresource.it.gdp</groupId>
@@ -46,7 +28,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <id>remote-resources</id>

Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/run-only-at-execution-root/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/run-only-at-execution-root/pom.xml?rev=814054&r1=814053&r2=814054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/run-only-at-execution-root/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/run-only-at-execution-root/pom.xml Fri Sep 11 22:14:59 2009
@@ -2,9 +2,15 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   
+  <parent>
+    <groupId>org.apache.maven.plugin.rresource.it</groupId>
+    <artifactId>it-parent</artifactId>
+    <version>${project.version}</version>
+    <relativePath>../it-parent/pom.xml</relativePath>
+  </parent>
+  
   <groupId>org.apache.maven.plugin.rresource.it.mrr41</groupId>
   <artifactId>parent</artifactId>
-  <version>${project.version}</version>
   
   <packaging>pom</packaging>
   
@@ -13,34 +19,10 @@
     <module>child2</module>
   </modules>
   
-  <repositories>
-    <repository>
-      <id>it-remote</id>
-      <url>file:${remoteRepository}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>main-local</id>
-      <url>file:${localRepository}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>${project.version}</version>
         <executions>
           <execution>
             <id>remote-resources</id>

Modified: maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/pom.xml?rev=814054&r1=814053&r2=814054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/pom.xml (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/it/resources/supplemental-artifact/pom.xml Fri Sep 11 22:14:59 2009
@@ -1,35 +1,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.plugin.rresource.it.mrr43</groupId>
+  
+  <parent>
+    <groupId>org.apache.maven.plugin.rresource.it</groupId>
+    <artifactId>it-parent</artifactId>
+    <version>${project.version}</version>
+    <relativePath>../it-parent/pom.xml</relativePath>
+  </parent>
+  
   <artifactId>supplemental-artifact</artifactId>
-  <version>1</version>
   
   <name>Supplemental Artifact Consumer</name>
 
-  <repositories>
-    <repository>
-      <id>it-remote</id>
-      <url>file:${remoteRepository}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>main-local</id>
-      <url>file:${localRepository}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.plugin.rresource.it.mrr43</groupId>
@@ -41,9 +24,7 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>${project.version}</version>
         
         <executions>
           <execution>

Copied: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java (from r814046, maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT002_FilterLocalOverride.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java?p2=maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java&p1=maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT002_FilterLocalOverride.java&r1=814046&r2=814054&rev=814054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT002_FilterLocalOverride.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java Fri Sep 11 22:14:59 2009
@@ -9,14 +9,14 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 
-public class IT002_FilterLocalOverride
+public class IT_FilterLocalOverride
     extends AbstractIT
 {
     
     public void test()
         throws IOException, URISyntaxException, VerificationException
     {
-        File dir = TestUtils.getTestDir( "002-filterLocalOverride" );
+        File dir = TestUtils.getTestDir( "filter-local-override" );
         Verifier verifier = new Verifier( dir.getAbsolutePath() );
         
         verifier.executeGoal( "generate-resources" );
@@ -26,7 +26,7 @@
         File output = new File( dir, "target/maven-shared-archive-resources/DEPENDENCIES" );
         String content = FileUtils.fileRead( output );
         
-        assertTrue( content.indexOf( "Override: 002-filterLocalOverride" ) > -1 );
+        assertTrue( content.indexOf( "Override: filter-local-override" ) > -1 );
     }
 
 }

Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_FilterLocalOverride.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java (from r811529, maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT000_GenerateFromBundle.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java?p2=maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java&p1=maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT000_GenerateFromBundle.java&r1=811529&r2=814054&rev=814054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT000_GenerateFromBundle.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java Fri Sep 11 22:14:59 2009
@@ -9,14 +9,14 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 
-public class IT000_GenerateFromBundle
+public class IT_GenerateFromBundle
     extends AbstractIT
 {
     
     public void test()
         throws IOException, URISyntaxException, VerificationException
     {
-        File dir = TestUtils.getTestDir( "000-generateFromBundle" );
+        File dir = TestUtils.getTestDir( "generate-from-bundle" );
         Verifier verifier = new Verifier( dir.getAbsolutePath() );
         
         verifier.executeGoal( "generate-resources" );

Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromBundle.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java (from r811529, maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT001_GenerateFromOverride.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java?p2=maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java&p1=maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT001_GenerateFromOverride.java&r1=811529&r2=814054&rev=814054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT001_GenerateFromOverride.java (original)
+++ maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java Fri Sep 11 22:14:59 2009
@@ -9,14 +9,14 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 
-public class IT001_GenerateFromOverride
+public class IT_GenerateFromOverride
     extends AbstractIT
 {
     
     public void test()
         throws IOException, URISyntaxException, VerificationException
     {
-        File dir = TestUtils.getTestDir( "001-generateFromOverride" );
+        File dir = TestUtils.getTestDir( "generate-from-override" );
         Verifier verifier = new Verifier( dir.getAbsolutePath() );
         
         verifier.executeGoal( "generate-resources" );

Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-remote-resources-plugin/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_GenerateFromOverride.java
------------------------------------------------------------------------------
    svn:mergeinfo =