You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/06/11 09:08:21 UTC
svn commit: r783651 - in
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin:
DefaultPluginManager.java PluginManager.java
Author: jvanzyl
Date: Thu Jun 11 07:08:21 2009
New Revision: 783651
URL: http://svn.apache.org/viewvc?rev=783651&view=rev
Log:
o removing an exception not used
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=783651&r1=783650&r2=783651&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Thu Jun 11 07:08:21 2009
@@ -77,11 +77,8 @@
import org.codehaus.plexus.util.xml.XmlStreamReader;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-// TODO: get plugin groups
// TODO: the antrun plugin has its own configurator, the only plugin that does. might need to think about how that works
// TODO: remove the coreArtifactFilterManager
-// TODO: rework the plugin classloader/plugin descriptor caching
-// TODO: surface all exceptions to the handler: get rid of generic useless exceptions
@Component(role = PluginManager.class)
public class DefaultPluginManager
@@ -90,7 +87,7 @@
@Requirement
private Logger logger;
- @Requirement(role=PlexusContainer.class)
+ @Requirement
protected PlexusContainer container;
@Requirement
@@ -121,15 +118,6 @@
public synchronized PluginDescriptor loadPlugin( Plugin plugin, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, CycleDetectedInPluginGraphException, InvalidPluginDescriptorException
{
-// PluginDescriptor pluginDescriptor = getPluginDescriptor( plugin );
-
- // There are cases where plugins are discovered but not actually populated. These are edge cases where you are working in the IDE on
- // Maven itself so this speaks to a problem we have with the system not starting entirely clean.
-// if ( pluginDescriptor != null && pluginDescriptor.getClassRealm() != null )
-// {
-// return pluginDescriptor;
-// }
-
PluginDescriptor pluginDescriptor = pluginCache.getPluginDescriptor( plugin, localRepository, remoteRepositories );
if ( pluginDescriptor != null )
@@ -137,7 +125,6 @@
return pluginDescriptor;
}
-
Artifact pluginArtifact = repositorySystem.createPluginArtifact( plugin );
ArtifactResolutionRequest request = new ArtifactResolutionRequest()
@@ -373,7 +360,8 @@
* TODO pluginDescriptor classRealm and artifacts are set as a side effect of this
* call, which is not nice.
*/
- public synchronized ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor ) throws PluginManagerException
+ public synchronized ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor )
+ throws PluginManagerException
{
ClassRealm pluginRealm = pluginDescriptor.getClassRealm();
if ( pluginRealm != null )
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=783651&r1=783650&r2=783651&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java Thu Jun 11 07:08:21 2009
@@ -29,16 +29,6 @@
*/
public interface PluginManager
{
- // - find the plugin [extension point: any client may wish to do whatever they choose]
- // - load the plugin into a classloader [extension point: we want to take them from a repository, some may take from disk or whatever]
- // - configure the plugin [extension point] -- actually this should happen before the plugin manager gets anything i.e. do whatever you want to get the information
- // - execute the plugin
-
- // Use more meaningful exceptions
- // plugin not found
- // plugin resolution exception
- // plugin configuration can't be parsed -- and this may be a result of client insertion of configuration
- // plugin component deps have a cycle -- this should be prevented for the most part but client code may inject an override component which itself has a cycle
// igorf: Way too many declared exceptions!
PluginDescriptor loadPlugin( Plugin plugin, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, CycleDetectedInPluginGraphException, InvalidPluginDescriptorException;
@@ -51,10 +41,9 @@
MojoDescriptor getMojoDescriptor( Plugin plugin, String goal, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, CycleDetectedInPluginGraphException, MojoNotFoundException, InvalidPluginDescriptorException;
- // Why do we have a plugin execution exception as well?
- // igorf: Way too many declared exceptions!
void executeMojo( MavenSession session, MojoExecution execution )
- throws MojoFailureException, MojoExecutionException, PluginConfigurationException, PluginExecutionException, PluginManagerException;
+ throws MojoFailureException, MojoExecutionException, PluginConfigurationException, PluginManagerException;
- ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor ) throws PluginManagerException;
+ ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor )
+ throws PluginManagerException;
}
\ No newline at end of file