Author: olamy
Date: Mon Aug 3 19:21:57 2009
New Revision: 800502
URL: http://svn.apache.org/viewvc?rev=800502&view=rev
Log:
cleanup previous stuff not needed for the site plugin.
Issue id: MNG-4162
Modified:
maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
Modified:
maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java?rev=800502&r1=800501&r2=800502&view=diff
==============================================================================
---
maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
(original)
+++
maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
Mon Aug 3 19:21:57 2009
@@ -28,11 +28,13 @@
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.CycleDetectedInPluginGraphException;
import org.apache.maven.plugin.InvalidPluginDescriptorException;
+import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoNotFoundException;
import org.apache.maven.plugin.PluginDescriptorParsingException;
import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.plugin.PluginNotFoundException;
import org.apache.maven.plugin.PluginResolutionException;
+import org.apache.maven.project.MavenProject;
/**
* @author Jason van Zyl
@@ -72,4 +74,6 @@
throws LifecycleExecutionException;
void execute( MavenSession session );
+
+ void populateMojoExecutionConfiguration( MavenProject project,
MojoExecution mojoExecution, boolean directInvocation );
}
Modified:
maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=800502&r1=800501&r2=800502&view=diff
==============================================================================
---
maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Mon Aug 3 19:21:57 2009
@@ -380,6 +380,7 @@
}
}
+ // FIXME factorisation with the other getPluginRealm
public synchronized ClassRealm getPluginRealm( MavenSession session,
PluginDescriptor pluginDescriptor,
ClassRealm importedRealm,
List<String> importedPackages )
throws PluginManagerException
@@ -461,9 +462,13 @@
return pluginRealm;
}
-
- public synchronized ClassRealm getPluginRealm( MavenSession session,
PluginDescriptor pluginDescriptor, List<ArtifactFilter> artifactFilters )
- throws PluginManagerException
+
+ /**
+ * 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
{
ClassRealm pluginRealm = pluginDescriptor.getClassRealm();
if ( pluginRealm != null )
@@ -493,14 +498,7 @@
try
{
- if (artifactFilters == null)
- {
- pluginArtifacts = getPluginArtifacts( pluginArtifact, plugin,
localRepository, remoteRepositories );
- }
- else
- {
- pluginArtifacts = getPluginArtifacts( pluginArtifact, plugin,
localRepository, remoteRepositories, artifactFilters);
- }
+ pluginArtifacts = getPluginArtifacts( pluginArtifact, plugin,
localRepository, remoteRepositories );
}
catch ( ArtifactNotFoundException e )
{
@@ -525,7 +523,7 @@
pluginDescriptor.setClassRealm( pluginRealm );
pluginDescriptor.setArtifacts( pluginArtifacts );
-
+
try
{
for ( ComponentDescriptor<?> componentDescriptor :
pluginDescriptor.getComponents() )
@@ -546,19 +544,9 @@
}
pluginCache.put( plugin, localRepository, remoteRepositories,
pluginRealm, pluginArtifacts );
-
+
return pluginRealm;
}
-
- /**
- * 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
- {
- return getPluginRealm(session, pluginDescriptor, null);
- }
/**
* Creates ClassRealm with unique id for the given plugin
Modified:
maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=800502&r1=800501&r2=800502&view=diff
==============================================================================
---
maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
(original)
+++
maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
Mon Aug 3 19:21:57 2009
@@ -18,7 +18,6 @@
import java.util.List;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@@ -59,7 +58,8 @@
MojoExecution mojoExecution, ClassRealm
pluginRealm )
throws PluginConfigurationException, PluginManagerException;
- ClassRealm getPluginRealm(MavenSession session,
- PluginDescriptor pluginDescriptor, List<ArtifactFilter>
artifactFilter)
- throws PluginManagerException;
+ ClassRealm getPluginRealm( MavenSession session, PluginDescriptor
pluginDescriptor, ClassRealm importedRealm,
+ List<String> importedPackages )
+ throws PluginManagerException;
+
}
\ No newline at end of file
Modified:
maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java?rev=800502&r1=800501&r2=800502&view=diff
==============================================================================
---
maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
(original)
+++
maven/components/branches/MNG-4162/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java
Mon Aug 3 19:21:57 2009
@@ -79,4 +79,10 @@
throws LifecycleExecutionException
{
}
+
+ public void populateMojoExecutionConfiguration( MavenProject project,
MojoExecution mojoExecution,
+ boolean directInvocation )
+ {
+ // nothing here
+ }
}
