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/07/22 15:43:56 UTC
svn commit: r220319 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/lifecycle/ maven-model/
maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/
Author: brett
Date: Fri Jul 22 06:43:45 2005
New Revision: 220319
URL: http://svn.apache.org/viewcvs?rev=220319&view=rev
Log:
general cleanup
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-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/DefaultPluginMappingBuilder.java
maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/PluginMappingManager.java
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=220319&r1=220318&r2=220319&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 Fri Jul 22 06:43:45 2005
@@ -45,8 +45,8 @@
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.codehaus.plexus.util.xml.Xpp3Dom;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.IOException;
import java.util.ArrayList;
@@ -126,8 +126,7 @@
}
private void executeGoal( String task, MavenSession session, MavenProject project )
- throws LifecycleExecutionException, PluginNotFoundException, MojoExecutionException,
- ArtifactResolutionException
+ throws LifecycleExecutionException, PluginNotFoundException, MojoExecutionException, ArtifactResolutionException
{
if ( phases.contains( task ) )
{
@@ -142,7 +141,7 @@
}
private void executeGoalWithLifecycle( String task, MavenSession session, Map lifecycleMappings,
- MavenProject project )
+ MavenProject project )
throws ArtifactResolutionException, LifecycleExecutionException, MojoExecutionException
{
List goals = processGoalChain( task, lifecycleMappings );
@@ -224,7 +223,8 @@
String goal = (String) k.next();
MojoDescriptor desc = mojoDescriptor.getPluginDescriptor().getMojo( goal );
MojoExecution mojoExecution = new MojoExecution( desc, (Xpp3Dom) e.getConfiguration() );
- addToLifecycleMappings( lifecycleMappings, phase.getId(), mojoExecution, session.getSettings() );
+ addToLifecycleMappings( lifecycleMappings, phase.getId(), mojoExecution,
+ session.getSettings() );
}
}
}
@@ -286,11 +286,11 @@
return lifecycleMappings;
}
- private Map findMappingsForLifecycle( MavenSession session, MavenProject project )
+ private Map findMappingsForLifecycle( MavenSession session, MavenProject project )
throws LifecycleExecutionException
{
Map mappings;
-
+
String packaging = project.getPackaging();
try
{
@@ -298,14 +298,15 @@
Plugin pluginContainingLifecycleMapping = mappingManager.getByPackaging( packaging );
- LifecycleMapping m = null;
+ LifecycleMapping m;
if ( pluginContainingLifecycleMapping != null )
{
try
{
- pluginManager.verifyPlugin( pluginContainingLifecycleMapping, project, session.getSettings(), session.getLocalRepository() );
-
+ pluginManager.verifyPlugin( pluginContainingLifecycleMapping, project, session.getSettings(),
+ session.getLocalRepository() );
+
m = (LifecycleMapping) pluginManager.getPluginComponent( pluginContainingLifecycleMapping,
LifecycleMapping.ROLE, packaging );
@@ -313,9 +314,9 @@
}
catch ( ComponentLookupException e )
{
- throw new LifecycleExecutionException( "Plugin: " + pluginContainingLifecycleMapping.getKey()
- + " declares lifecycle mapping for: \'" + packaging
- + "\', but does not appear to contain the actual mapping among its component descriptors.", e );
+ throw new LifecycleExecutionException( "Plugin: " + pluginContainingLifecycleMapping.getKey() +
+ " declares lifecycle mapping for: \'" + packaging +
+ "\', but does not appear to contain the actual mapping among its component descriptors.", e );
}
}
else
@@ -329,8 +330,7 @@
catch ( ComponentLookupException e )
{
getLogger().warn(
- "Lifecycle mappings not found for packaging: \'" + packaging
- + "\'. Using defaults." );
+ "Lifecycle mappings not found for packaging: \'" + packaging + "\'. Using defaults." );
getLogger().debug( "Lifecycle mappings not found for packaging: \'" + packaging + "\'.", e );
@@ -340,21 +340,23 @@
}
catch ( ArtifactResolutionException e )
{
- throw new LifecycleExecutionException( "Cannot load plugin which defines lifecycle mappings for: \'" + packaging + "\'.", e );
+ throw new LifecycleExecutionException(
+ "Cannot load plugin which defines lifecycle mappings for: \'" + packaging + "\'.", e );
}
catch ( PluginVersionResolutionException e )
{
- throw new LifecycleExecutionException( "Cannot load plugin which defines lifecycle mappings for: \'" + packaging + "\'.", e );
+ throw new LifecycleExecutionException(
+ "Cannot load plugin which defines lifecycle mappings for: \'" + packaging + "\'.", e );
}
catch ( PluginManagerException e )
{
throw new LifecycleExecutionException( "Cannot load lifecycle mappings.", e );
}
-
+
return mappings;
}
- private PluginMappingManager getPluginMappingManager( MavenSession session, MavenProject project )
+ private PluginMappingManager getPluginMappingManager( MavenSession session, MavenProject project )
throws LifecycleExecutionException
{
PluginMappingManager mappingManager = session.getPluginMappingManager();
@@ -383,7 +385,7 @@
throw new LifecycleExecutionException( "Cannot load plugin mappings.", e );
}
}
-
+
return mappingManager;
}
@@ -401,8 +403,7 @@
if ( plugin.getGoals() != null && !plugin.getGoals().isEmpty() )
{
getLogger().warn(
- "DEPRECATED: goal definitions for plugin '" + plugin.getKey()
- + "' must be in an executions element" );
+ "DEPRECATED: goal definitions for plugin '" + plugin.getKey() + "' must be in an executions element" );
}
PluginDescriptor pluginDescriptor;
@@ -455,7 +456,8 @@
/**
* @deprecated
*/
- private void bindGoalMapToLifecycle( PluginDescriptor pluginDescriptor, Map goalMap, Map phaseMap, Settings settings )
+ private void bindGoalMapToLifecycle( PluginDescriptor pluginDescriptor, Map goalMap, Map phaseMap,
+ Settings settings )
{
for ( Iterator i = pluginDescriptor.getMojos().iterator(); i.hasNext(); )
{
@@ -479,7 +481,7 @@
}
private void bindExecutionToLifecycle( PluginDescriptor pluginDescriptor, Map phaseMap, PluginExecution execution,
- Settings settings )
+ Settings settings )
throws LifecycleExecutionException
{
for ( Iterator i = execution.getGoals().iterator(); i.hasNext(); )
@@ -510,7 +512,7 @@
}
private void addToLifecycleMappings( Map lifecycleMappings, String phase, MojoExecution mojoExecution,
- Settings settings )
+ Settings settings )
{
List goals = (List) lifecycleMappings.get( phase );
@@ -556,7 +558,7 @@
private MojoDescriptor getMojoDescriptor( String task, MavenSession session, MavenProject project )
throws ArtifactResolutionException, LifecycleExecutionException
{
- String goal = null;
+ String goal;
Plugin plugin = null;
PluginDescriptor pluginDescriptor = null;
@@ -576,9 +578,10 @@
}
catch ( PluginManagerException e )
{
- throw new LifecycleExecutionException( "Cannot resolve plugin-prefix: \'" + prefix + "\' from plugin collector.", e );
+ throw new LifecycleExecutionException(
+ "Cannot resolve plugin-prefix: \'" + prefix + "\' from plugin collector.", e );
}
-
+
if ( pluginDescriptor == null )
{
try
@@ -587,7 +590,8 @@
}
catch ( PluginManagerException e )
{
- throw new LifecycleExecutionException( "Cannot resolve plugin-prefix: \'" + prefix + "\' from plugin mappings metadata.", e );
+ throw new LifecycleExecutionException(
+ "Cannot resolve plugin-prefix: \'" + prefix + "\' from plugin mappings metadata.", e );
}
}
@@ -631,8 +635,8 @@
}
else
{
- String message = "Invalid task '" + task + "': you must specify a valid lifecycle phase, or"
- + " a goal in the format plugin:goal or pluginGroupId:pluginArtifactId:pluginVersion:goal";
+ String message = "Invalid task '" + task + "': you must specify a valid lifecycle phase, or" +
+ " a goal in the format plugin:goal or pluginGroupId:pluginArtifactId:pluginVersion:goal";
throw new LifecycleExecutionException( message );
}
@@ -640,8 +644,8 @@
{
try
{
- pluginDescriptor = pluginManager.verifyPlugin( plugin, project, session.getSettings(), session
- .getLocalRepository() );
+ pluginDescriptor = pluginManager.verifyPlugin( plugin, project, session.getSettings(),
+ session.getLocalRepository() );
}
catch ( PluginManagerException e )
{
Modified: maven/components/trunk/maven-model/maven.mdo
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-model/maven.mdo?rev=220319&r1=220318&r2=220319&view=diff
==============================================================================
--- maven/components/trunk/maven-model/maven.mdo (original)
+++ maven/components/trunk/maven-model/maven.mdo Fri Jul 22 06:43:45 2005
@@ -1165,8 +1165,6 @@
<field>
<name>version</name>
<version>3.0.0+</version>
- <!-- [ jdcasey:01-Feb-2005 ] No longer required. We'll validate after injecting defaults. -->
- <!-- required>true</required -->
<description><![CDATA[
The version of the dependency, e.g. <code>3.2.1</code>
]]></description>
@@ -1368,12 +1366,14 @@
<version>4.0.0</version>
<description><![CDATA[The artifact id of the project to exclude.]]></description>
<type>String</type>
+ <required>true</required>
</field>
<field>
<name>groupId</name>
<version>4.0.0</version>
<description><![CDATA[The group id of the project to exclude.]]></description>
<type>String</type>
+ <required>true</required>
</field>
</fields>
</class>
@@ -1652,12 +1652,14 @@
<name>artifactId</name>
<version>4.0.0</version>
<description><![CDATA[The artifact id of the project to extend.]]></description>
+ <required>true</required>
<type>String</type>
</field>
<field>
<name>groupId</name>
<version>4.0.0</version>
<description><![CDATA[The group id of the project to extend.]]></description>
+ <required>true</required>
<type>String</type>
</field>
<field>
@@ -2132,6 +2134,7 @@
<name>groupId</name>
<version>4.0.0</version>
<type>String</type>
+ <required>true</required>
<defaultValue>org.apache.maven.plugins</defaultValue>
</field>
<field>
@@ -2503,6 +2506,7 @@
<name>groupId</name>
<version>4.0.0</version>
<type>String</type>
+ <required>true</required>
<defaultValue>org.apache.maven.plugins</defaultValue>
</field>
<field>
Modified: maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/DefaultPluginMappingBuilder.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/DefaultPluginMappingBuilder.java?rev=220319&r1=220318&r2=220319&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/DefaultPluginMappingBuilder.java (original)
+++ maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/DefaultPluginMappingBuilder.java Fri Jul 22 06:43:45 2005
@@ -11,6 +11,7 @@
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
@@ -27,79 +28,79 @@
private RepositoryMetadataManager repositoryMetadataManager;
public PluginMappingManager loadPluginMappings( List groupIds, List pluginRepositories,
- ArtifactRepository localRepository )
+ ArtifactRepository localRepository )
throws RepositoryMetadataManagementException, PluginMappingManagementException
{
return loadPluginMappings( groupIds, pluginRepositories, localRepository, new PluginMappingManager() );
}
- public PluginMappingManager refreshPluginMappingManager( PluginMappingManager mappingManager, List pluginRepositories,
+ public PluginMappingManager refreshPluginMappingManager( PluginMappingManager mappingManager,
+ List pluginRepositories,
ArtifactRepository localRepository )
throws RepositoryMetadataManagementException, PluginMappingManagementException
{
// prevent performance drag from abuse of this method.
if ( mappingManager.isRefreshed() )
{
- throw new PluginMappingManagementException( "Plugin-mappings have already been refreshed. Cannot re-refresh." );
+ throw new PluginMappingManagementException(
+ "Plugin-mappings have already been refreshed. Cannot re-refresh." );
}
-
+
getLogger().info( "Refreshing plugin-mapping metadata..." );
-
+
List groupIds = new ArrayList();
-
+
for ( Iterator it = mappingManager.getPluginMaps().iterator(); it.hasNext(); )
{
PluginMap map = (PluginMap) it.next();
-
+
String groupId = map.getGroupId();
-
+
groupIds.add( groupId );
-
+
repositoryMetadataManager.purgeLocalCopy( new PluginMappingMetadata( groupId ), localRepository );
}
-
+
mappingManager.markRefreshed();
-
- return loadPluginMappings(groupIds, pluginRepositories, localRepository, mappingManager);
+
+ return loadPluginMappings( groupIds, pluginRepositories, localRepository, mappingManager );
}
private PluginMappingManager loadPluginMappings( List groupIds, List pluginRepositories,
- ArtifactRepository localRepository,
- PluginMappingManager mappingManager )
- throws RepositoryMetadataManagementException, PluginMappingManagementException
+ ArtifactRepository localRepository,
+ PluginMappingManager mappingManager )
+ throws PluginMappingManagementException
{
List pluginGroupIds = new ArrayList( groupIds );
+ // TODO: use constant
if ( !pluginGroupIds.contains( "org.apache.maven.plugins" ) )
{
pluginGroupIds.add( "org.apache.maven.plugins" );
}
- if ( pluginGroupIds != null )
+ for ( Iterator it = pluginGroupIds.iterator(); it.hasNext(); )
{
- for ( Iterator it = pluginGroupIds.iterator(); it.hasNext(); )
- {
- String groupId = (String) it.next();
+ String groupId = (String) it.next();
- try
- {
- File mappingFile = resolveMappingMetadata( groupId, pluginRepositories, localRepository );
+ try
+ {
+ File mappingFile = resolveMappingMetadata( groupId, pluginRepositories, localRepository );
- PluginMap pluginMap = readPluginMap( mappingFile );
+ PluginMap pluginMap = readPluginMap( mappingFile );
- if ( pluginMap != null )
- {
- mappingManager.addPluginMap( pluginMap );
- }
- }
- catch ( RepositoryMetadataManagementException e )
+ if ( pluginMap != null )
{
- getLogger()
- .warn( "Cannot resolve plugin-mapping metadata for groupId: " + groupId + " - IGNORING." );
-
- getLogger().debug( "Error resolving plugin-mapping metadata for groupId: " + groupId + ".", e );
+ mappingManager.addPluginMap( pluginMap );
}
}
+ catch ( RepositoryMetadataManagementException e )
+ {
+ getLogger()
+ .warn( "Cannot resolve plugin-mapping metadata for groupId: " + groupId + " - IGNORING." );
+
+ getLogger().debug( "Error resolving plugin-mapping metadata for groupId: " + groupId + ".", e );
+ }
}
return mappingManager;
@@ -109,7 +110,7 @@
throws PluginMappingManagementException
{
PluginMap result = null;
-
+
if ( mappingFile.exists() )
{
Reader fileReader = null;
@@ -121,6 +122,10 @@
result = mappingReader.read( fileReader );
}
+ catch ( FileNotFoundException e )
+ {
+ throw new PluginMappingManagementException( "Cannot read plugin mappings from: " + mappingFile, e );
+ }
catch ( IOException e )
{
throw new PluginMappingManagementException( "Cannot read plugin mappings from: " + mappingFile, e );
@@ -134,7 +139,7 @@
IOUtil.close( fileReader );
}
}
-
+
return result;
}
@@ -157,7 +162,7 @@
repositoryException = null;
File metadataFile = metadata.getFile();
-
+
if ( metadataFile != null && metadataFile.exists() )
{
break;
Modified: maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/PluginMappingManager.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/PluginMappingManager.java?rev=220319&r1=220318&r2=220319&view=diff
==============================================================================
--- maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/PluginMappingManager.java (original)
+++ maven/components/trunk/maven-plugin-mapping/src/main/java/org/apache/maven/plugin/mapping/PluginMappingManager.java Fri Jul 22 06:43:45 2005
@@ -1,5 +1,21 @@
package org.apache.maven.plugin.mapping;
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
import org.apache.maven.model.Plugin;
import java.util.ArrayList;
@@ -12,33 +28,35 @@
{
private List mappings = new ArrayList();
- private boolean refreshed = false;
+
+ private boolean refreshed;
private Map pluginDefinitionsByPrefix = new HashMap();
+
private Map pluginDefinitionsByPackaging = new HashMap();
public void addPluginMap( PluginMap pluginMap )
{
mappings.add( pluginMap );
-
+
clearCache();
}
-
+
public void markRefreshed()
{
this.refreshed = true;
}
-
+
public boolean isRefreshed()
{
return refreshed;
}
-
+
public List getPluginMaps()
{
return mappings;
}
-
+
public void clear()
{
this.mappings = null;
@@ -53,8 +71,7 @@
public Plugin getByPrefix( String pluginPrefix )
{
- synchronized ( this )
- {
+ synchronized ( this ) {
if ( pluginDefinitionsByPrefix == null )
{
calculatePluginDefinitionsByPrefix();
@@ -66,8 +83,7 @@
public Plugin getByPackaging( String packaging )
{
- synchronized ( this )
- {
+ synchronized ( this ) {
if ( pluginDefinitionsByPackaging == null )
{
calculatePluginDefinitionsByPackaging();
@@ -99,10 +115,11 @@
plugin.setArtifactId( artifactId );
- for ( Iterator packagingIterator = mapping.getPackagingHandlers().iterator(); packagingIterator.hasNext(); )
+ for ( Iterator packagingIterator = mapping.getPackagingHandlers().iterator();
+ packagingIterator.hasNext(); )
{
String packaging = (String) packagingIterator.next();
-
+
pluginDefinitionsByPackaging.put( packaging, plugin );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org