Author: bentmann
Date: Sat Sep 20 12:09:51 2008
New Revision: 697412
URL: http://svn.apache.org/viewvc?rev=697412&view=rev
Log:
o Renamed some IT resource directories for more consistency
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2277-aggregatorPlugins/
(props changed)
- copied from r697396,
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2289-useNewParentSnapshots/
(props changed)
- copied from r697396,
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2289-useNewParentSnapshots/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861-relocationsAndRanges/
(props changed)
- copied from r697396,
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2972-overridingPluginDependency/
(props changed)
- copied from r697396,
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3052-depRepoAggregation/
(props changed)
- copied from r697396,
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3052depRepoAggregation/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3284-usingCachedPlugins/
(props changed)
- copied from r697396,
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3426-overridingPluginDependency/
(props changed)
- copied from r697396,
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3426-overridingPluginDependency/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473-PluginReportCrash/
(props changed)
- copied from r697396,
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473PluginReportCrash/
Removed:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3052depRepoAggregation/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473PluginReportCrash/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2289-useNewParentSnapshots/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3426-overridingPluginDependency/
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2972OverridePluginDependency.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3503Xpp3ShadingTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3645POMSyntaxErrorTest.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java?rev=697412&r1=697411&r2=697412&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java
Sat Sep 20 12:09:51 2008
@@ -28,7 +28,7 @@
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng2277aggregatorPlugins" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2277-aggregatorPlugins" );
Verifier verifier;
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java?rev=697412&r1=697411&r2=697412&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java
Sat Sep 20 12:09:51 2008
@@ -23,7 +23,7 @@
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2861relocationsAndRanges" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2861-relocationsAndRanges" );
Verifier verifier;
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2972OverridePluginDependency.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2972OverridePluginDependency.java?rev=697412&r1=697411&r2=697412&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2972OverridePluginDependency.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2972OverridePluginDependency.java
Sat Sep 20 12:09:51 2008
@@ -28,7 +28,7 @@
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng2972-overridingPluginDependency" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2972-overridingPluginDependency" );
Verifier verifier;
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java?rev=697412&r1=697411&r2=697412&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3052DepRepoAggregationTest.java
Sat Sep 20 12:09:51 2008
@@ -60,7 +60,7 @@
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
-
"/mng-3052depRepoAggregation" )
+
"/mng-3052-depRepoAggregation" )
.getCanonicalFile();
File foo = new File( testDir, "foo" );
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java?rev=697412&r1=697411&r2=697412&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
Sat Sep 20 12:09:51 2008
@@ -28,7 +28,7 @@
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng3284-usingCachedPlugins" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3284-usingCachedPlugins" );
Verifier verifier;
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java?rev=697412&r1=697411&r2=697412&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3426PluginsClasspathOverrideTest.java
Sat Sep 20 12:09:51 2008
@@ -49,7 +49,7 @@
// The testdir is computed from the location of this
// file.
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng3426-overridingPluginDependency" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3426-overridingPluginDependency" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java?rev=697412&r1=697411&r2=697412&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3473PluginReportCrash.java
Sat Sep 20 12:09:51 2008
@@ -25,7 +25,7 @@
public void testitMNG3473 ()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3473PluginReportCrash" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3473-PluginReportCrash" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3503Xpp3ShadingTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3503Xpp3ShadingTest.java?rev=697412&r1=697411&r2=697412&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3503Xpp3ShadingTest.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3503Xpp3ShadingTest.java
Sat Sep 20 12:09:51 2008
@@ -29,7 +29,7 @@
import org.apache.maven.it.util.ResourceExtractor;
/**
- * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-xxxx";>MNG-xxxx</a>.
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-3503";>MNG-3503</a>.
*
* @todo Fill in a better description of what this test verifies!
*
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3645POMSyntaxErrorTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3645POMSyntaxErrorTest.java?rev=697412&r1=697411&r2=697412&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3645POMSyntaxErrorTest.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3645POMSyntaxErrorTest.java
Sat Sep 20 12:09:51 2008
@@ -27,7 +27,7 @@
import java.io.File;
/**
- * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-xxxx";>MNG-xxxx</a>.
+ * This is a test set for <a
href="http://jira.codehaus.org/browse/MNG-3645";>MNG-3645</a>.
*
* @todo Fill in a better description of what this test verifies!
*
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2277-aggregatorPlugins/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2289-useNewParentSnapshots/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861-relocationsAndRanges/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2972-overridingPluginDependency/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3052-depRepoAggregation/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3284-usingCachedPlugins/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3426-overridingPluginDependency/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3473-PluginReportCrash/
------------------------------------------------------------------------------
svn:mergeinfo =
