maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jvan...@apache.org
Subject cvs commit: maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/goal/phase GoalAssemblySubProcessTest.java
Date Sun, 24 Oct 2004 18:15:09 GMT
jvanzyl     2004/10/24 11:15:08

  Modified:    maven-core/src/main/java/org/apache/maven/plugin
                        DefaultPluginManager.java
               maven-core/src/test/java/org/apache/maven/lifecycle/goal/phase
                        GoalAssemblySubProcessTest.java
  Log:
  o removal of xstream
  
  Revision  Changes    Path
  1.15      +2 -1      maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
  
  Index: DefaultPluginManager.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DefaultPluginManager.java	24 Oct 2004 12:16:23 -0000	1.14
  +++ DefaultPluginManager.java	24 Oct 2004 18:15:08 -0000	1.15
  @@ -101,7 +101,8 @@
   
       private Set pluginsInProcess = new HashSet();
   
  -    public void processPluginDescriptor( MavenPluginDescriptor mavenPluginDescriptor )
throws CycleDetectedException
  +    public void processPluginDescriptor( MavenPluginDescriptor mavenPluginDescriptor )
  +        throws CycleDetectedException
       {
           if ( pluginsInProcess.contains( mavenPluginDescriptor.getPluginId() ) )
           {
  
  
  
  1.3       +10 -3     maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/goal/phase/GoalAssemblySubProcessTest.java
  
  Index: GoalAssemblySubProcessTest.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/test/java/org/apache/maven/lifecycle/goal/phase/GoalAssemblySubProcessTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GoalAssemblySubProcessTest.java	8 Oct 2004 19:15:01 -0000	1.2
  +++ GoalAssemblySubProcessTest.java	24 Oct 2004 18:15:08 -0000	1.3
  @@ -103,16 +103,19 @@
       public void testT2_ShouldFind_Prereq_MainGoal() throws Exception
       {
           String mainGoal = "resolveTest:t2-main";
  +
           String prereq = "resolveTest:t2-prereq";
   
           Map messages = new TreeMap();
   
           messages.put( mainGoal, "Main goal is missing." );
  +
           messages.put( prereq, "prereq is missing" );
   
           List order = new ArrayList();
   
           order.add( prereq );
  +
           order.add( mainGoal );
   
           runTest( mainGoal, Collections.EMPTY_LIST, Collections.EMPTY_LIST, order, messages
);
  @@ -278,26 +281,30 @@
           ArtifactRepository localRepository = new ArtifactRepository( "local", getTestRepoURL()
);
   
           Model model = new Model();
  +
           model.setPreGoals( preGoals );
  +
           model.setPostGoals( postGoals );
   
           MavenProject project = new MavenProject( model );
   
           MavenGoalExecutionContext context = createGoalExecutionContext( project, localRepository,
mainGoal );
  +
           context.setGoalName( mainGoal );
   
           PluginResolutionPhase pluginPhase = new PluginResolutionPhase();
  +
           GoalMappingPhase mappingPhase = new GoalMappingPhase();
  +
           GoalResolutionPhase goalPhase = new GoalResolutionPhase();
   
           pluginPhase.execute( context );
  +
           mappingPhase.execute( context );
  +
           goalPhase.execute( context );
   
           List goals = context.getResolvedGoals();
  -        
  -        //System.out.println("Expected chain: " + expectedOrder);
  -        //System.out.println("Actual chain: " + goals);
   
           assertNotNull( goals );
   
  
  
  

Mime
View raw message