Author: carlos
Date: Tue Jun 13 06:18:42 2006
New Revision: 413892
URL: http://svn.apache.org/viewvc?rev=413892&view=rev
Log:
Merging revision 413090-413092 from trunk. [MNG-2357] Ignore temp files,
refactor code and add missing it tests
Modified:
maven/components/branches/maven-2.0.x/maven-core-it/README.txt
maven/components/branches/maven-2.0.x/maven-core-it/integration-tests.txt
maven/components/branches/maven-2.0.x/maven-core-it/it0103/ (props
changed)
maven/components/branches/maven-2.0.x/maven-core-it/it0103/level1/level2/level3/
(props changed)
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
Modified: maven/components/branches/maven-2.0.x/maven-core-it/README.txt
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core-it/README.txt?rev=413892&r1=413891&r2=413892&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core-it/README.txt (original)
+++ maven/components/branches/maven-2.0.x/maven-core-it/README.txt Tue Jun 13
06:18:42 2006
@@ -281,6 +281,12 @@
when they contain ${project.build.directory} in the string value of a
Map.Entry.
+it0105: MRESOURCES-18
+
+it0106: When a project has modules and its parent is not preinstalled
[MNG-2318]
+
+it0107: Verify that default implementation of an implementation for a complex
object works as
+ expected [MNG-2293]
-------------------------------------------------------------------------------
- generated sources
Modified:
maven/components/branches/maven-2.0.x/maven-core-it/integration-tests.txt
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core-it/integration-tests.txt?rev=413892&r1=413891&r2=413892&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core-it/integration-tests.txt
(original)
+++ maven/components/branches/maven-2.0.x/maven-core-it/integration-tests.txt
Tue Jun 13 06:18:42 2006
@@ -1,3 +1,5 @@
+#it0106 MNG-2318 not yet fixed
+#it0105 not fixed until 2.1
#it0104 Commenting out, not fixed until post-2.0.4, due to dependency on new
plexus-container-default version.
it0103
it0102
Propchange: maven/components/branches/maven-2.0.x/maven-core-it/it0103/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 13 06:18:42 2006
@@ -0,0 +1 @@
+log.txt
Propchange:
maven/components/branches/maven-2.0.x/maven-core-it/it0103/level1/level2/level3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 13 06:18:42 2006
@@ -0,0 +1 @@
+target
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=413892&r1=413891&r2=413892&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Tue Jun 13 06:18:42 2006
@@ -289,6 +289,11 @@
// circle around and set the artifacts and class realm
PluginDescriptor addedPlugin = pluginCollector.getPluginDescriptor(
plugin );
+ if ( addedPlugin == null )
+ {
+ throw new IllegalStateException( "The PluginDescriptor for the
plugin " + plugin + " was not found." );
+ }
+
addedPlugin.setClassRealm( child.getContainerRealm() );
// we're only setting the plugin's artifact itself as the artifact
list, to allow it to be retrieved
Modified:
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java?rev=413892&r1=413891&r2=413892&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
Tue Jun 13 06:18:42 2006
@@ -70,17 +70,12 @@
URL resourceUrl = cloader.getResource( resource );
- File resourceFile = null;
- if ( resourceUrl != null )
- {
- resourceFile = new File( resourceUrl.getPath() );
- }
- else
+ if ( resourceUrl == null )
{
throw new FileNotFoundException( "Unable to find: " + resource );
}
- return resourceFile;
+ return new File( resourceUrl.getPath() );
}
protected ArtifactRepository getLocalRepository()
