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 2010/08/20 00:26:56 UTC
svn commit: r987335 - in /maven/maven-3/trunk:
maven-compat/src/main/java/org/apache/maven/project/
maven-compat/src/main/java/org/apache/maven/project/interpolation/
maven-core/src/main/java/org/apache/maven/project/
Author: bentmann
Date: Thu Aug 19 22:26:55 2010
New Revision: 987335
URL: http://svn.apache.org/viewvc?rev=987335&view=rev
Log:
[MNG-4765] Failing to determine java version for profile....
Added:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
- copied, changed from r987195, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
- copied, changed from r987195, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
Removed:
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=987335&r1=987334&r2=987335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Thu Aug 19 22:26:55 2010
@@ -23,6 +23,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.Properties;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
@@ -38,6 +39,7 @@ import org.apache.maven.model.building.M
import org.apache.maven.model.building.UrlModelSource;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.profiles.ProfileManager;
+import org.apache.maven.properties.internal.EnvironmentUtils;
import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.wagon.events.TransferListener;
import org.codehaus.plexus.component.annotations.Component;
@@ -65,21 +67,65 @@ public class DefaultMavenProjectBuilder
// MavenProjectBuilder Implementation
// ----------------------------------------------------------------------
- public MavenProject build( File pomFile, ProjectBuilderConfiguration configuration )
- throws ProjectBuildingException
+ private ProjectBuildingRequest toRequest( ProjectBuilderConfiguration configuration )
{
- return projectBuilder.build( pomFile, configuration ).getProject();
+ DefaultProjectBuildingRequest request = new DefaultProjectBuildingRequest();
+
+ request.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 );
+ request.setResolveDependencies( false );
+
+ request.setLocalRepository( configuration.getLocalRepository() );
+ request.setBuildStartTime( configuration.getBuildStartTime() );
+ request.setUserProperties( configuration.getUserProperties() );
+ request.setSystemProperties( configuration.getExecutionProperties() );
+
+ ProfileManager profileManager = configuration.getGlobalProfileManager();
+ if ( profileManager != null )
+ {
+ request.setActiveProfileIds( profileManager.getExplicitlyActivatedIds() );
+ request.setInactiveProfileIds( profileManager.getExplicitlyDeactivatedIds() );
+ }
+
+ return request;
}
- public MavenProject buildFromRepository( Artifact artifact, ProjectBuilderConfiguration configuration, boolean allowStubModel )
- throws ProjectBuildingException
+ private ProjectBuildingRequest injectSession( ProjectBuildingRequest request )
{
- normalizeToArtifactRepositories( configuration );
+ MavenSession session = legacySupport.getSession();
+ if ( session != null )
+ {
+ request.setOffline( session.isOffline() );
+ request.setSystemProperties( session.getSystemProperties() );
+ if ( request.getUserProperties().isEmpty() )
+ {
+ request.setUserProperties( session.getUserProperties() );
+ }
+
+ MavenExecutionRequest req = session.getRequest();
+ if ( req != null )
+ {
+ request.setServers( req.getServers() );
+ request.setMirrors( req.getMirrors() );
+ request.setProxies( req.getProxies() );
+ request.setRemoteRepositories( req.getRemoteRepositories() );
+ request.setTransferListener( req.getTransferListener() );
+ request.setForceUpdate( req.isUpdateSnapshots() );
+ }
+ }
+ else
+ {
+ Properties props = new Properties();
+ EnvironmentUtils.addEnvVars( props );
+ props.putAll( System.getProperties() );
+ request.setSystemProperties( props );
+ }
- return projectBuilder.build( artifact, allowStubModel, configuration ).getProject();
+ return request;
}
- private void normalizeToArtifactRepositories( ProjectBuilderConfiguration configuration )
+ @SuppressWarnings( "unchecked" )
+ private List<ArtifactRepository> normalizeToArtifactRepositories( List<?> repositories,
+ ProjectBuildingRequest request )
throws ProjectBuildingException
{
/*
@@ -87,8 +133,6 @@ public class DefaultMavenProjectBuilder
* populate the builder configuration with model repositories instead of artifact repositories.
*/
- List<?> repositories = configuration.getRemoteRepositories();
-
if ( repositories != null )
{
boolean normalized = false;
@@ -102,9 +146,9 @@ public class DefaultMavenProjectBuilder
try
{
ArtifactRepository repo = repositorySystem.buildArtifactRepository( (Repository) repository );
- repositorySystem.injectMirror( Arrays.asList( repo ), configuration.getMirrors() );
- repositorySystem.injectProxy( Arrays.asList( repo ), configuration.getProxies() );
- repositorySystem.injectAuthentication( Arrays.asList( repo ), configuration.getServers() );
+ repositorySystem.injectMirror( Arrays.asList( repo ), request.getMirrors() );
+ repositorySystem.injectProxy( Arrays.asList( repo ), request.getProxies() );
+ repositorySystem.injectAuthentication( Arrays.asList( repo ), request.getServers() );
repos.add( repo );
}
catch ( InvalidRepositoryException e )
@@ -121,68 +165,79 @@ public class DefaultMavenProjectBuilder
if ( normalized )
{
- configuration.setRemoteRepositories( repos );
+ return repos;
}
}
+
+ return (List<ArtifactRepository>) repositories;
}
- // This is used by the SITE plugin.
- public MavenProject build( File project, ArtifactRepository localRepository, ProfileManager profileManager )
- throws ProjectBuildingException
+ private ProjectBuildingException transformError( ProjectBuildingException e )
{
- ProjectBuilderConfiguration configuration = new DefaultProjectBuilderConfiguration()
- .setLocalRepository( localRepository );
+ if ( e.getCause() instanceof ModelBuildingException )
+ {
+ return new InvalidProjectModelException( e.getProjectId(), e.getMessage(), e.getPomFile() );
+ }
- return build( project, configuration );
+ return e;
}
- public MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteRepositories,
- ArtifactRepository localRepository, boolean allowStubModel )
+ public MavenProject build( File pom, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException
{
- ProjectBuilderConfiguration configuration = new DefaultProjectBuilderConfiguration();
- configuration.setLocalRepository( localRepository );
- configuration.setRemoteRepositories( remoteRepositories );
- configuration.setProcessPlugins( false );
- configuration.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
+ ProjectBuildingRequest request = injectSession( toRequest( configuration ) );
- MavenSession session = legacySupport.getSession();
- if ( session != null )
+ try
{
- MavenExecutionRequest request = session.getRequest();
- if ( request != null )
- {
- configuration.setServers( request.getServers() );
- configuration.setMirrors( request.getMirrors() );
- configuration.setProxies( request.getProxies() );
- configuration.setTransferListener( request.getTransferListener() );
- configuration.setForceUpdate( request.isUpdateSnapshots() );
- }
- configuration.setOffline( session.isOffline() );
- configuration.setSystemProperties( session.getSystemProperties() );
- configuration.setUserProperties( session.getUserProperties() );
+ return projectBuilder.build( pom, request ).getProject();
}
- else
+ catch ( ProjectBuildingException e )
{
- configuration.setSystemProperties( System.getProperties() );
+ throw transformError( e );
}
+ }
+
+ // This is used by the SITE plugin.
+ public MavenProject build( File pom, ArtifactRepository localRepository, ProfileManager profileManager )
+ throws ProjectBuildingException
+ {
+ ProjectBuilderConfiguration configuration = new DefaultProjectBuilderConfiguration();
+ configuration.setLocalRepository( localRepository );
+ configuration.setGlobalProfileManager( profileManager );
+
+ return build( pom, configuration );
+ }
+
+ public MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteRepositories,
+ ProjectBuilderConfiguration configuration, boolean allowStubModel )
+ throws ProjectBuildingException
+ {
+ ProjectBuildingRequest request = injectSession( toRequest( configuration ) );
+ request.setRemoteRepositories( normalizeToArtifactRepositories( remoteRepositories, request ) );
+ request.setProcessPlugins( false );
+ request.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
try
{
- return buildFromRepository( artifact, configuration, allowStubModel );
+ return projectBuilder.build( artifact, allowStubModel, request ).getProject();
}
catch ( ProjectBuildingException e )
{
- if ( e.getCause() instanceof ModelBuildingException )
- {
- throw new InvalidProjectModelException( e.getProjectId(), e.getMessage(), e.getPomFile() );
- }
-
- throw e;
+ throw transformError( e );
}
}
public MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteRepositories,
+ ArtifactRepository localRepository, boolean allowStubModel )
+ throws ProjectBuildingException
+ {
+ ProjectBuilderConfiguration configuration = new DefaultProjectBuilderConfiguration();
+ configuration.setLocalRepository( localRepository );
+
+ return buildFromRepository( artifact, remoteRepositories, configuration, allowStubModel );
+ }
+
+ public MavenProject buildFromRepository( Artifact artifact, List<ArtifactRepository> remoteRepositories,
ArtifactRepository localRepository )
throws ProjectBuildingException
{
@@ -190,16 +245,19 @@ public class DefaultMavenProjectBuilder
}
/**
- * This is used for pom-less execution like running archetype:generate.
- *
- * I am taking out the profile handling and the interpolation of the base directory until we
- * spec this out properly.
+ * This is used for pom-less execution like running archetype:generate. I am taking out the profile handling and the
+ * interpolation of the base directory until we spec this out properly.
*/
- public MavenProject buildStandaloneSuperProject( ProjectBuilderConfiguration config )
+ public MavenProject buildStandaloneSuperProject( ProjectBuilderConfiguration configuration )
throws ProjectBuildingException
{
+ ProjectBuildingRequest request = injectSession( toRequest( configuration ) );
+ request.setProcessPlugins( false );
+ request.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
+
ModelSource modelSource = new UrlModelSource( getClass().getResource( "standalone.xml" ) );
- MavenProject project = projectBuilder.build( modelSource, config ).getProject();
+
+ MavenProject project = projectBuilder.build( modelSource, request ).getProject();
project.setExecutionRoot( true );
return project;
}
@@ -215,42 +273,38 @@ public class DefaultMavenProjectBuilder
{
ProjectBuilderConfiguration configuration = new DefaultProjectBuilderConfiguration();
configuration.setLocalRepository( localRepository );
- configuration.setProcessPlugins( false );
- configuration.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL );
-
- if ( profileManager != null )
- {
- configuration.setActiveProfileIds( profileManager.getExplicitlyActivatedIds() );
- configuration.setInactiveProfileIds( profileManager.getExplicitlyDeactivatedIds() );
- }
+ configuration.setGlobalProfileManager( profileManager );
return buildStandaloneSuperProject( configuration );
}
- public MavenProject buildWithDependencies( File project, ArtifactRepository localRepository,
+ public MavenProject buildWithDependencies( File pom, ArtifactRepository localRepository,
ProfileManager profileManager, TransferListener transferListener )
throws ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException
{
ProjectBuilderConfiguration configuration = new DefaultProjectBuilderConfiguration();
-
configuration.setLocalRepository( localRepository );
+ configuration.setGlobalProfileManager( profileManager );
- if ( profileManager != null )
- {
- configuration.setActiveProfileIds( profileManager.getExplicitlyActivatedIds() );
- configuration.setInactiveProfileIds( profileManager.getExplicitlyDeactivatedIds() );
- }
+ ProjectBuildingRequest request = injectSession( toRequest( configuration ) );
- configuration.setResolveDependencies( true );
+ request.setResolveDependencies( true );
- return build( project, configuration );
+ try
+ {
+ return projectBuilder.build( pom, request ).getProject();
+ }
+ catch ( ProjectBuildingException e )
+ {
+ throw transformError( e );
+ }
}
- public MavenProject buildWithDependencies( File project, ArtifactRepository localRepository,
+ public MavenProject buildWithDependencies( File pom, ArtifactRepository localRepository,
ProfileManager profileManager )
throws ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException
{
- return buildWithDependencies( project, localRepository, profileManager, null );
+ return buildWithDependencies( pom, localRepository, profileManager, null );
}
}
Copied: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java (from r987195, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java?p2=maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java&p1=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java&r1=987195&r2=987335&rev=987335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/DefaultProjectBuilderConfiguration.java Thu Aug 19 22:26:55 2010
@@ -19,51 +19,88 @@ package org.apache.maven.project;
* under the License.
*/
-import java.util.List;
+import java.util.Date;
import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.building.ModelBuildingRequest;
+import org.apache.maven.profiles.ProfileManager;
@Deprecated
public class DefaultProjectBuilderConfiguration
- extends DefaultProjectBuildingRequest
implements ProjectBuilderConfiguration
{
+ private ProfileManager globalProfileManager;
+
+ private ArtifactRepository localRepository;
+
+ private Properties userProperties;
+
+ private Properties executionProperties = System.getProperties();
+
+ private Date buildStartTime;
+
public DefaultProjectBuilderConfiguration()
{
- setProcessPlugins( false );
- setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_MAVEN_2_0 );
+ }
+
+ public ProjectBuilderConfiguration setGlobalProfileManager( ProfileManager globalProfileManager )
+ {
+ this.globalProfileManager = globalProfileManager;
+ return this;
+ }
+
+ public ProfileManager getGlobalProfileManager()
+ {
+ return globalProfileManager;
}
public ProjectBuilderConfiguration setLocalRepository( ArtifactRepository localRepository )
{
- super.setLocalRepository( localRepository );
+ this.localRepository = localRepository;
return this;
}
- public ProjectBuilderConfiguration setRemoteRepositories( List<ArtifactRepository> remoteRepositories )
+ public ArtifactRepository getLocalRepository()
{
- super.setRemoteRepositories( remoteRepositories );
+ return localRepository;
+ }
+
+ public ProjectBuilderConfiguration setUserProperties( Properties userProperties )
+ {
+ this.userProperties = userProperties;
return this;
}
+ public Properties getUserProperties()
+ {
+ if ( userProperties == null )
+ {
+ userProperties = new Properties();
+ }
+
+ return userProperties;
+ }
+
+ public Properties getExecutionProperties()
+ {
+ return executionProperties;
+ }
+
public ProjectBuilderConfiguration setExecutionProperties( Properties executionProperties )
{
- super.setSystemProperties( executionProperties );
+ this.executionProperties = executionProperties;
return this;
}
- public ProjectBuilderConfiguration setProcessPlugins( boolean processPlugins )
+ public Date getBuildStartTime()
{
- super.setProcessPlugins( processPlugins );
- return this;
+ return buildStartTime;
}
- public ProjectBuilderConfiguration setValidationLevel( int validationLevel )
+ public ProjectBuilderConfiguration setBuildStartTime( Date buildStartTime )
{
- super.setValidationLevel( validationLevel );
+ this.buildStartTime = buildStartTime;
return this;
}
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java?rev=987335&r1=987334&r2=987335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/MavenProjectBuilder.java Thu Aug 19 22:26:55 2010
@@ -33,11 +33,11 @@ import org.apache.maven.wagon.events.Tra
public interface MavenProjectBuilder
{
- MavenProject build( File projectFile, ProjectBuilderConfiguration configuration )
+ MavenProject build( File pom, ProjectBuilderConfiguration configuration )
throws ProjectBuildingException;
//TODO maven-site-plugin -- Vincent, Dennis and Lukas are checking but this doesn't appear to be required anymore.
- MavenProject build( File project, ArtifactRepository localRepository, ProfileManager profileManager )
+ MavenProject build( File pom, ArtifactRepository localRepository, ProfileManager profileManager )
throws ProjectBuildingException;
//TODO remote-resources-plugin
@@ -62,11 +62,11 @@ public interface MavenProjectBuilder
MavenProject buildStandaloneSuperProject( ArtifactRepository localRepository, ProfileManager profileManager )
throws ProjectBuildingException;
- MavenProject buildWithDependencies( File project, ArtifactRepository localRepository,
+ MavenProject buildWithDependencies( File pom, ArtifactRepository localRepository,
ProfileManager globalProfileManager, TransferListener transferListener )
throws ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException;
- MavenProject buildWithDependencies( File project, ArtifactRepository localRepository,
+ MavenProject buildWithDependencies( File pom, ArtifactRepository localRepository,
ProfileManager globalProfileManager )
throws ProjectBuildingException, ArtifactResolutionException, ArtifactNotFoundException;
Copied: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java (from r987195, maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java?p2=maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java&p1=maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java&r1=987195&r2=987335&rev=987335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectBuilderConfiguration.java Thu Aug 19 22:26:55 2010
@@ -19,58 +19,34 @@ package org.apache.maven.project;
* under the License.
*/
-import java.util.List;
+import java.util.Date;
import java.util.Properties;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.model.Profile;
+import org.apache.maven.profiles.ProfileManager;
@Deprecated
public interface ProjectBuilderConfiguration
- extends ProjectBuildingRequest
{
- ProjectBuilderConfiguration setLocalRepository( ArtifactRepository localRepository );
ArtifactRepository getLocalRepository();
- ProjectBuilderConfiguration setRemoteRepositories( List<ArtifactRepository> remoteRepositories );
-
- List<ArtifactRepository> getRemoteRepositories();
-
- ProjectBuilderConfiguration setExecutionProperties( Properties executionProperties );
-
- Properties getSystemProperties();
+ ProfileManager getGlobalProfileManager();
- void setProject( MavenProject mavenProject );
+ Properties getUserProperties();
- MavenProject getProject();
+ Properties getExecutionProperties();
- ProjectBuilderConfiguration setProcessPlugins( boolean processPlugins );
+ ProjectBuilderConfiguration setGlobalProfileManager( ProfileManager globalProfileManager );
- boolean isProcessPlugins();
-
- // Profiles
-
- /**
- * Set any active profiles that the {@link ProjectBuilder} should consider while constructing
- * a {@link MavenProject}.
- */
- void setActiveProfileIds( List<String> activeProfileIds );
-
- List<String> getActiveProfileIds();
+ ProjectBuilderConfiguration setLocalRepository( ArtifactRepository localRepository );
- void setInactiveProfileIds( List<String> inactiveProfileIds );
+ ProjectBuilderConfiguration setUserProperties( Properties userProperties );
- List<String> getInactiveProfileIds();
+ ProjectBuilderConfiguration setExecutionProperties( Properties executionProperties );
- /**
- * Add a {@link org.apache.maven.model.Profile} that has come from an external source. This may be from a custom
- * configuration like the MavenCLI settings.xml file, or from a custom dialog in an IDE integration like M2Eclipse.
- * @param profile
- */
- void addProfile( Profile profile );
+ Date getBuildStartTime();
- void setProfiles( List<Profile> profiles );
+ ProjectBuilderConfiguration setBuildStartTime( Date buildStartTime );
- List<Profile> getProfiles();
}
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java?rev=987335&r1=987334&r2=987335&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/project/interpolation/AbstractStringBasedModelInterpolator.java Thu Aug 19 22:26:55 2010
@@ -261,12 +261,12 @@ public abstract class AbstractStringBase
valueSources.add( modelValueSource1 );
valueSources.add( new MapBasedValueSource( config.getUserProperties() ) );
valueSources.add( new MapBasedValueSource( modelProperties ) );
- valueSources.add( new MapBasedValueSource( config.getSystemProperties() ) );
+ valueSources.add( new MapBasedValueSource( config.getExecutionProperties() ) );
valueSources.add( new AbstractValueSource( false )
{
public Object getValue( String expression )
{
- return config.getSystemProperties().getProperty( "env." + expression );
+ return config.getExecutionProperties().getProperty( "env." + expression );
}
} );
valueSources.add( modelValueSource2 );