Author: bentmann
Date: Fri Aug 7 14:41:10 2009
New Revision: 802024
URL: http://svn.apache.org/viewvc?rev=802024&view=rev
Log:
[MNG-4287] Make ToolchainManagerPrivate session-aware
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java?rev=802024&r1=802023&r2=802024&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainManagerPrivate.java
Fri Aug 7 14:41:10 2009
@@ -41,10 +41,10 @@
@Requirement
private ToolchainsBuilder toolchainsBuilder;
- public ToolchainPrivate[] getToolchainsForType( String type )
+ public ToolchainPrivate[] getToolchainsForType( String type, MavenSession
context )
throws MisconfiguredToolchainException
{
- PersistedToolchains pers = toolchainsBuilder.build();
+ PersistedToolchains pers = toolchainsBuilder.build(
context.getRequest().getUserToolchainsFile() );
List<ToolchainPrivate> toRet = new ArrayList<ToolchainPrivate>();
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java?rev=802024&r1=802023&r2=802024&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/DefaultToolchainsBuilder.java
Fri Aug 7 14:41:10 2009
@@ -41,12 +41,7 @@
@Requirement
private Logger logger;
- /**
- * The path to the user's toolchains file or <code>null</code> if not
configured.
- */
- private File userToolchainsFile;
-
- public PersistedToolchains build()
+ public PersistedToolchains build( File userToolchainsFile )
throws MisconfiguredToolchainException
{
PersistedToolchains toolchains = null;
@@ -77,9 +72,4 @@
return toolchains;
}
- public void setUserToolchainsFile( File userToolchainsFile )
- {
- this.userToolchainsFile = userToolchainsFile;
- }
-
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java?rev=802024&r1=802023&r2=802024&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainManagerPrivate.java
Fri Aug 7 14:41:10 2009
@@ -29,16 +29,16 @@
*/
public interface ToolchainManagerPrivate
{
+
/**
* Retrieves the toolchains of given type from the user settings.
*/
- ToolchainPrivate[] getToolchainsForType( String type )
+ ToolchainPrivate[] getToolchainsForType( String type, MavenSession context
)
throws MisconfiguredToolchainException;
/**
* Stores the toolchain into build context.
*/
- void storeToolchainToBuildContext( ToolchainPrivate toolchain,
- MavenSession context );
-
+ void storeToolchainToBuildContext( ToolchainPrivate toolchain,
MavenSession context );
+
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java?rev=802024&r1=802023&r2=802024&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/toolchain/ToolchainsBuilder.java
Fri Aug 7 14:41:10 2009
@@ -35,18 +35,12 @@
/**
* Builds the toolchains model from the configured toolchain files.
*
- * @return The toolchains model or <code>null</code> if no toolchain file
was configured or the configured files do
+ * @param userToolchainsFile The path to the toolchains file, may be
<code>null</code> to disable parsing.
+ * @return The toolchains model or <code>null</code> if no toolchain file
was configured or the configured file does
* not exist.
- * @throws MisconfiguredToolchainException If the toolchain files exist
but cannot be parsed.
+ * @throws MisconfiguredToolchainException If the toolchain file exists
but cannot be parsed.
*/
- PersistedToolchains build()
+ PersistedToolchains build( File userToolchainsFile )
throws MisconfiguredToolchainException;
- /**
- * Sets the path to the file from which to read the available toolchains.
- *
- * @param userToolchainsFile The path to the toolchains file, may be
<code>null</code> to disable parsing.
- */
- void setUserToolchainsFile( File userToolchainsFile );
-
}
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=802024&r1=802023&r2=802024&view=diff
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Fri Aug 7 14:41:10 2009
@@ -318,12 +318,6 @@
}
}
- private void toolchains( MavenExecutionRequest request )
- {
- // FIXME individual requests must not change global state
- toolchainsBuilder.setUserToolchainsFile(
request.getUserToolchainsFile() );
- }
-
public MavenExecutionRequest populateDefaults( MavenExecutionRequest
request )
throws MavenEmbedderException
{
@@ -333,8 +327,6 @@
localRepository( request );
- toolchains( request );
-
processSettings( request );
return request;
