Author: jdcasey
Date: Tue Aug 19 10:17:59 2008
New Revision: 687098
URL: http://svn.apache.org/viewvc?rev=687098&view=rev
Log:
Rolling back this change; it made things worse.
Modified:
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
maven/components/branches/maven-2.0.10-RC/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
Modified:
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=687098&r1=687097&r2=687098&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
(original)
+++
maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
Tue Aug 19 10:17:59 2008
@@ -58,7 +58,6 @@
import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.plugin.PluginNotFoundException;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.lifecycle.Execution;
import org.apache.maven.plugin.lifecycle.Phase;
@@ -568,7 +567,8 @@
calculateConcreteState( project, session );
- boolean usesAllProjects = mojoDescriptor.isAggregator() ||
usesSessionOrReactorProjects( mojoDescriptor );
+ PlexusConfiguration configuration =
mojoDescriptor.getMojoConfiguration();
+ boolean usesAllProjects = mojoDescriptor.isAggregator() ||
usesSessionOrReactorProjects( configuration );
if ( usesAllProjects )
{
@@ -735,27 +735,15 @@
project.setExecutionProject( executionProject );
}
- private boolean usesSessionOrReactorProjects( MojoDescriptor
mojoDescriptor )
+ private boolean usesSessionOrReactorProjects( PlexusConfiguration
configuration )
{
- List params = mojoDescriptor.getParameters();
- if ( params != null )
+ String value = configuration != null ? String.valueOf( configuration )
: null;
+
+ if ( value != null )
{
- for ( Iterator it = params.iterator(); it.hasNext(); )
+ if ( value.indexOf( "${session" ) > -1 || value.indexOf(
"${reactorProjects}" ) > -1 )
{
- Parameter param = (Parameter) it.next();
- String value = param.getExpression();
- if ( value != null && value.trim().length() > 0
- && ( value.indexOf( "${session" ) > -1 || value.indexOf(
"${reactorProjects}" ) > -1 ) )
- {
- return true;
- }
-
- value = param.getDefaultValue();
- if ( value != null && value.trim().length() > 0
- && ( value.indexOf( "${session" ) > -1 || value.indexOf(
"${reactorProjects}" ) > -1 ) )
- {
- return true;
- }
+ return true;
}
}
@@ -1279,7 +1267,7 @@
if ( lifecycleForkers.contains( execution.getMojoDescriptor()
) )
{
taskIterator.remove();
- getLogger().warn( "Removing: " +
execution.getMojoDescriptor().getFullGoalName()
+ getLogger().warn( "Removing: " +
execution.getMojoDescriptor().getGoal()
+ " from forked lifecycle, to prevent
recursive invocation." );
}
}
Modified:
maven/components/branches/maven-2.0.10-RC/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java?rev=687098&r1=687097&r2=687098&view=diff
==============================================================================
---
maven/components/branches/maven-2.0.10-RC/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
(original)
+++
maven/components/branches/maven-2.0.10-RC/maven-plugin-descriptor/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
Tue Aug 19 10:17:59 2008
@@ -30,10 +30,7 @@
import java.io.IOException;
import java.io.Reader;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
-import java.util.Map;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
@@ -283,37 +280,6 @@
parameters.add( parameter );
}
-
- PlexusConfiguration[] parameterConfigs = c.getChild( "configuration"
).getChildren();
- if ( parameterConfigs != null && parameterConfigs.length > 0 )
- {
- Map configMap = new HashMap( parameterConfigs.length );
- for ( int i = 0; i < parameterConfigs.length; i++ )
- {
- configMap.put( parameterConfigs[i].getName(),
parameterConfigs[i] );
- }
-
- for ( Iterator it = parameters.iterator(); it.hasNext(); )
- {
- Parameter param = (Parameter) it.next();
- PlexusConfiguration paramConfig = (PlexusConfiguration)
configMap.get( param.getName() );
-
- if ( paramConfig != null )
- {
- String expr = paramConfig.getValue();
- if ( expr != null && expr.trim().length() > 0 )
- {
- param.setExpression( expr );
- }
-
- String defaultValue = paramConfig.getAttribute(
"default-value" );
- if ( defaultValue != null && defaultValue.trim().length()
> 0 )
- {
- param.setDefaultValue( defaultValue );
- }
- }
- }
- }
mojo.setParameters( parameters );
