You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/10/02 18:24:55 UTC
svn commit: r821082 - in
/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven:
execution/MavenSession.java execution/ReactorManager.java monitor/
monitor/event/ monitor/event/EventDispatcher.java
monitor/event/EventMonitor.java
Author: bentmann
Date: Fri Oct 2 16:24:54 2009
New Revision: 821082
URL: http://svn.apache.org/viewvc?rev=821082&view=rev
Log:
o Restored backward-compat for plugins that create MavenSession
Added:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
- copied, changed from r817195, maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/ (with props)
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/ (with props)
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java
- copied, changed from r817195, maven/maven-2/branches/maven-2.2.x/maven-monitor/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java
- copied, changed from r817195, maven/maven-2/branches/maven-2.2.x/maven-monitor/src/main/java/org/apache/maven/monitor/event/EventMonitor.java
Modified:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java?rev=821082&r1=821081&r2=821082&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/MavenSession.java Fri Oct 2 16:24:54 2009
@@ -19,8 +19,10 @@
* under the License.
*/
+import java.io.File;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -29,6 +31,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.RepositoryCache;
+import org.apache.maven.monitor.event.EventDispatcher;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
@@ -73,6 +76,32 @@
}
@Deprecated
+ public MavenSession( PlexusContainer container, Settings settings, ArtifactRepository localRepository,
+ EventDispatcher eventDispatcher, ReactorManager unused, List<String> goals,
+ String executionRootDir, Properties executionProperties, Date startTime )
+ {
+ this( container, settings, localRepository, eventDispatcher, unused, goals, executionRootDir,
+ executionProperties, null, startTime );
+ }
+
+ @Deprecated
+ public MavenSession( PlexusContainer container, Settings settings, ArtifactRepository localRepository,
+ EventDispatcher eventDispatcher, ReactorManager unused, List<String> goals,
+ String executionRootDir, Properties executionProperties, Properties userProperties,
+ Date startTime )
+ {
+ this.container = container;
+ this.settings = settings;
+ this.executionProperties = executionProperties;
+ this.request = new DefaultMavenExecutionRequest();
+ this.request.setUserProperties( userProperties );
+ this.request.setLocalRepository( localRepository );
+ this.request.setGoals( goals );
+ this.request.setBaseDirectory( ( executionRootDir != null ) ? new File( executionRootDir ) : null );
+ this.request.setStartTime( startTime );
+ }
+
+ @Deprecated
public MavenSession( PlexusContainer container, MavenExecutionRequest request, MavenExecutionResult result, List<MavenProject> projects )
{
this.container = container;
@@ -321,4 +350,15 @@
return project.getGroupId() + ':' + project.getArtifactId() + ':' + project.getVersion();
}
+ @Deprecated
+ public EventDispatcher getEventDispatcher()
+ {
+ return null;
+ }
+
+ public Date getStartTime()
+ {
+ return request.getStartTime();
+ }
+
}
Copied: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java (from r817195, maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java&p1=maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java&r1=817195&r2=821082&rev=821082&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java Fri Oct 2 16:24:54 2009
@@ -22,10 +22,7 @@
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.MissingProjectException;
-import org.apache.maven.project.ProjectSorter;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import java.util.ArrayList;
@@ -34,6 +31,7 @@
import java.util.List;
import java.util.Map;
+@Deprecated
public class ReactorManager
{
public static final String FAIL_FAST = "fail-fast";
@@ -62,43 +60,11 @@
private Map buildSuccessesByProject = new HashMap();
public ReactorManager( List projects )
- throws CycleDetectedException, DuplicateProjectException, MissingProjectException
+ throws CycleDetectedException, DuplicateProjectException
{
this.sorter = new ProjectSorter( projects );
}
- public ReactorManager( List projects, List selectedProjects, String resumeFrom, String makeBehavior )
- throws CycleDetectedException, DuplicateProjectException, MissingProjectException
- {
- boolean make, makeDependents;
- if ( makeBehavior == null )
- {
- make = false;
- makeDependents = false;
- }
- else if ( MAKE_MODE.equals( makeBehavior ) )
- {
- make = true;
- makeDependents = false;
- }
- else if ( MAKE_DEPENDENTS_MODE.equals( makeBehavior ) )
- {
- make = false;
- makeDependents = true;
- }
- else if ( MAKE_BOTH_MODE.equals( makeBehavior ) )
- {
- make = true;
- makeDependents = true;
- }
- else
- {
- throw new IllegalArgumentException( "Invalid make behavior (must be one of: \'" + MAKE_MODE + "\', \'"
- + MAKE_DEPENDENTS_MODE + "\', \'" + MAKE_BOTH_MODE + "\')." );
- }
- this.sorter = new ProjectSorter( projects, selectedProjects, resumeFrom, make, makeDependents );
- }
-
public Map getPluginContext( PluginDescriptor plugin, MavenProject project )
{
Map pluginContextsByKey = (Map) pluginContextsByProjectAndPluginKey.get( project.getId() );
@@ -185,7 +151,7 @@
public void registerBuildFailure( MavenProject project, Exception error, String task, long time )
{
- buildFailuresByProject.put( getProjectKey( project ), new BuildFailure( error, task, time ) );
+ buildFailuresByProject.put( getProjectKey( project ), new BuildFailure( project, time, error ) );
}
public boolean hasBuildFailures()
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Copied: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java (from r817195, maven/maven-2/branches/maven-2.2.x/maven-monitor/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java&p1=maven/maven-2/branches/maven-2.2.x/maven-monitor/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java&r1=817195&r2=821082&rev=821082&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-monitor/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/EventDispatcher.java Fri Oct 2 16:24:54 2009
@@ -22,6 +22,7 @@
/**
* @author jdcasey
*/
+@Deprecated
public interface EventDispatcher
{
Copied: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java (from r817195, maven/maven-2/branches/maven-2.2.x/maven-monitor/src/main/java/org/apache/maven/monitor/event/EventMonitor.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java?p2=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java&p1=maven/maven-2/branches/maven-2.2.x/maven-monitor/src/main/java/org/apache/maven/monitor/event/EventMonitor.java&r1=817195&r2=821082&rev=821082&view=diff
==============================================================================
--- maven/maven-2/branches/maven-2.2.x/maven-monitor/src/main/java/org/apache/maven/monitor/event/EventMonitor.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/monitor/event/EventMonitor.java Fri Oct 2 16:24:54 2009
@@ -22,6 +22,7 @@
/**
* @author jdcasey
*/
+@Deprecated
public interface EventMonitor
{