You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/10/03 15:10:52 UTC
svn commit: r293328 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/lifecycle/ maven-model/
maven-project/src/main/java/org/apache/maven/project/
maven-project/src/test/java/org/apache/maven/project/canonical/
maven-project/src/...
Author: brett
Date: Mon Oct 3 06:10:39 2005
New Revision: 293328
URL: http://svn.apache.org/viewcvs?rev=293328&view=rev
Log:
PR: MNG-644
remove deprecated goal syntax
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/trunk/maven-model/maven.mdo
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
maven/components/trunk/maven-project/src/test/resources/canonical-pom.xml
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=293328&r1=293327&r2=293328&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Mon Oct 3 06:10:39 2005
@@ -27,7 +27,6 @@
import org.apache.maven.extension.ExtensionManager;
import org.apache.maven.lifecycle.mapping.LifecycleMapping;
import org.apache.maven.model.Extension;
-import org.apache.maven.model.Goal;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.model.PluginManagement;
@@ -1037,8 +1036,6 @@
// use the plugin if inherit was true in a base class, or it is in the current POM, otherwise use the default inheritence setting
if ( plugin.isInheritanceApplied() || pluginDescriptor.isInheritedByDefault() )
{
- bindGoalMapToLifecycle( pluginDescriptor, plugin.getGoalsAsMap(), phaseMap, settings );
-
List executions = plugin.getExecutions();
if ( executions != null )
@@ -1072,33 +1069,6 @@
throw new LifecycleExecutionException( "Error resolving plugin version", e );
}
return pluginDescriptor;
- }
-
- /**
- * @deprecated
- */
- private void bindGoalMapToLifecycle( PluginDescriptor pluginDescriptor, Map goalMap, Map phaseMap,
- Settings settings )
- {
- for ( Iterator i = pluginDescriptor.getMojos().iterator(); i.hasNext(); )
- {
- MojoDescriptor mojoDescriptor = (MojoDescriptor) i.next();
-
- Goal goal = (Goal) goalMap.get( mojoDescriptor.getGoal() );
-
- if ( goal != null )
- {
- // We have to check to see that the inheritance rules have been applied before binding this mojo.
- if ( mojoDescriptor.isInheritedByDefault() )
- {
- if ( mojoDescriptor.getPhase() != null )
- {
- MojoExecution mojoExecution = new MojoExecution( mojoDescriptor );
- addToLifecycleMappings( phaseMap, mojoDescriptor.getPhase(), mojoExecution, settings );
- }
- }
- }
- }
}
private void bindExecutionToLifecycle( PluginDescriptor pluginDescriptor, Map phaseMap, PluginExecution execution,
Modified: maven/components/trunk/maven-model/maven.mdo
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-model/maven.mdo?rev=293328&r1=293327&r2=293328&view=diff
==============================================================================
--- maven/components/trunk/maven-model/maven.mdo (original)
+++ maven/components/trunk/maven-model/maven.mdo Mon Oct 3 06:10:39 2005
@@ -2516,22 +2516,6 @@
</field>
</fields>
</class>
- <!-- TODO: deprecated -->
- <class>
- <name>Goal</name>
- <version>4.0.0</version>
- <fields>
- <field>
- <name>id</name>
- <version>4.0.0</version>
- <type>String</type>
- </field>
- <field>
- <name>configuration</name>
- <type>DOM</type>
- </field>
- </fields>
- </class>
<class>
<name>DependencyManagement</name>
<version>4.0.0</version>
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=293328&r1=293327&r2=293328&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java Mon Oct 3 06:10:39 2005
@@ -30,7 +30,6 @@
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Developer;
import org.apache.maven.model.DistributionManagement;
-import org.apache.maven.model.Goal;
import org.apache.maven.model.IssueManagement;
import org.apache.maven.model.License;
import org.apache.maven.model.MailingList;
@@ -1233,21 +1232,6 @@
if ( pluginGroupId.equals( plugin.getGroupId() ) && pluginArtifactId.equals( plugin.getArtifactId() ) )
{
dom = (Xpp3Dom) plugin.getConfiguration();
-
- // TODO: this part is deprecated
- if ( goalId != null )
- {
- Goal goal = (Goal) plugin.getGoalsAsMap().get( goalId );
- if ( goal != null )
- {
- Xpp3Dom goalConfiguration = (Xpp3Dom) goal.getConfiguration();
- if ( goalConfiguration != null )
- {
- Xpp3Dom newDom = new Xpp3Dom( goalConfiguration );
- dom = Xpp3Dom.mergeXpp3Dom( newDom, dom );
- }
- }
- }
if ( executionId != null )
{
Modified: maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java?rev=293328&r1=293327&r2=293328&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java (original)
+++ maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java Mon Oct 3 06:10:39 2005
@@ -26,7 +26,6 @@
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Exclusion;
import org.apache.maven.model.Extension;
-import org.apache.maven.model.Goal;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.apache.maven.model.Plugin;
@@ -199,9 +198,6 @@
child.setVersion( parent.getVersion() );
}
- // merge the lists of goals that are not attached to an <execution/>
- mergeGoalContainerDefinitions( child, parent );
-
// from here to the end of the method is dealing with merging of the <executions/> section.
String parentInherited = parent.getInherited();
@@ -328,74 +324,6 @@
child.flushReportSetMap();
}
- }
-
- /**
- * @param child
- * @param parent
- * @deprecated
- */
- private static void mergeGoalContainerDefinitions( Plugin child, Plugin parent )
- {
- List parentGoals = parent.getGoals();
-
- // if the supplemental goals are non-existent, then nothing related to goals changes.
- if ( parentGoals != null && !parentGoals.isEmpty() )
- {
- Map assembledGoals = new TreeMap();
-
- Map childGoals = child.getGoalsAsMap();
-
- if ( childGoals != null )
- {
- for ( Iterator it = parentGoals.iterator(); it.hasNext(); )
- {
- Goal parentGoal = (Goal) it.next();
-
- Goal assembledGoal = parentGoal;
-
- Goal childGoal = (Goal) childGoals.get( parentGoal.getId() );
-
- if ( childGoal != null )
- {
- Xpp3Dom childGoalConfig = (Xpp3Dom) childGoal.getConfiguration();
- Xpp3Dom parentGoalConfig = (Xpp3Dom) parentGoal.getConfiguration();
-
- childGoalConfig = Xpp3Dom.mergeXpp3Dom( childGoalConfig, parentGoalConfig );
-
- childGoal.setConfiguration( childGoalConfig );
-
- assembledGoal = childGoal;
- }
-
- assembledGoals.put( assembledGoal.getId(), assembledGoal );
- }
-
- for ( Iterator it = childGoals.entrySet().iterator(); it.hasNext(); )
- {
- Map.Entry entry = (Map.Entry) it.next();
-
- String key = (String) entry.getKey();
- Goal childGoal = (Goal) entry.getValue();
-
- if ( !assembledGoals.containsKey( key ) )
- {
- assembledGoals.put( key, childGoal );
- }
- }
-
- child.setGoals( new ArrayList( assembledGoals.values() ) );
-
- child.flushGoalMap();
- }
- }
-
- Xpp3Dom childConfiguration = (Xpp3Dom) child.getConfiguration();
- Xpp3Dom parentConfiguration = (Xpp3Dom) parent.getConfiguration();
-
- childConfiguration = Xpp3Dom.mergeXpp3Dom( childConfiguration, parentConfiguration );
-
- child.setConfiguration( childConfiguration );
}
private static void mergePluginExecutionDefinitions( PluginExecution child, PluginExecution parent )
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java?rev=293328&r1=293327&r2=293328&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java Mon Oct 3 06:10:39 2005
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.apache.maven.model.Goal;
import org.apache.maven.model.Plugin;
-import org.apache.maven.project.MavenProject;
+import org.apache.maven.model.PluginExecution;
import org.apache.maven.project.AbstractMavenProjectTestCase;
+import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.io.File;
@@ -55,21 +55,21 @@
// Plugin0 [plexus]
String key = "org.apache.maven.plugins:maven-plexus-plugin";
-
+
Plugin plugin = null;
for ( Iterator it = plugins.iterator(); it.hasNext(); )
{
Plugin check = (Plugin) it.next();
-
+
if ( key.equals( check.getKey() ) )
{
plugin = check;
break;
}
}
-
+
assertNotNull( plugin );
-
+
assertEquals( "1.0", plugin.getVersion() );
Xpp3Dom configuration = (Xpp3Dom) plugin.getConfiguration();
@@ -85,13 +85,15 @@
// Goal specific configuration
// ----------------------------------------------------------------------
- List goals = plugin.getGoals();
+ List executions = plugin.getExecutions();
+
+ PluginExecution execution = (PluginExecution) executions.get( 0 );
- Goal g0 = (Goal) goals.get( 0 );
+ String g0 = (String) execution.getGoals().get( 0 );
- assertEquals( "plexus:runtime", g0.getId() );
+ assertEquals( "plexus:runtime", g0 );
- configuration = (Xpp3Dom) g0.getConfiguration();
+ configuration = (Xpp3Dom) execution.getConfiguration();
assertEquals( "ContinuumPro", configuration.getChild( "plexusApplicationName" ).getValue() );
Modified: maven/components/trunk/maven-project/src/test/resources/canonical-pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-project/src/test/resources/canonical-pom.xml?rev=293328&r1=293327&r2=293328&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources/canonical-pom.xml (original)
+++ maven/components/trunk/maven-project/src/test/resources/canonical-pom.xml Mon Oct 3 06:10:39 2005
@@ -16,14 +16,16 @@
<plexusConfigurationPropertiesFile>src/conf/plexus.properties</plexusConfigurationPropertiesFile>
<plexusApplicationName>Continuum</plexusApplicationName>
</configuration>
- <goals>
- <goal>
- <id>plexus:runtime</id>
+ <executions>
+ <execution>
+ <goals>
+ <goal>plexus:runtime</goal>
+ </goals>
<configuration>
<plexusApplicationName>ContinuumPro</plexusApplicationName>
</configuration>
- </goal>
- </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org