You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/02/28 20:02:07 UTC
svn commit: r512903 - in /maven/components/trunk/maven-embedder/src:
site/apt/index.apt
test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java
test/java/org/apache/maven/embedder/EmbedderUsingScmPluginTest.java
Author: jvanzyl
Date: Wed Feb 28 11:02:06 2007
New Revision: 512903
URL: http://svn.apache.org/viewvc?view=rev&rev=512903
Log:
MNG-2051 The SCM plugin which uses the scm manager works fine.
Added:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingScmPluginTest.java (with props)
Modified:
maven/components/trunk/maven-embedder/src/site/apt/index.apt
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java
Modified: maven/components/trunk/maven-embedder/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/site/apt/index.apt?view=diff&rev=512903&r1=512902&r2=512903
==============================================================================
--- maven/components/trunk/maven-embedder/src/site/apt/index.apt (original)
+++ maven/components/trunk/maven-embedder/src/site/apt/index.apt Wed Feb 28 11:02:06 2007
@@ -32,12 +32,14 @@
* Plugin Groups
+ []
+
If you are using the embedder it is entirely your responsibility to take user and global settings information and specify
it in the embedder configuration. The embedder carries with it <<<no>>> defaults about where these are located and how
they are used. If you want your embedded use of Maven to mimic the behavior of the Maven CLI insofar as settings use
then use the following code:
- %{snippet|id=mimic-cli|url=http://svn.apache.org/repos/asf/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java}
+%{snippet|id=mimic-cli|url=http://svn.apache.org/repos/asf/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderExampleTest.java}
Also note that the user and global settings are merged, and the user settings are dominant.
Modified: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java?view=diff&rev=512903&r1=512902&r2=512903
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java (original)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/AbstractEmbedderExecutionTestCase.java Wed Feb 28 11:02:06 2007
@@ -9,33 +9,47 @@
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
public abstract class AbstractEmbedderExecutionTestCase
extends AbstractEmbedderTestCase
{
- protected MavenExecutionRequest request( File basedir,
- List goals )
+ protected File runWithProject( String goal )
+ throws Exception
{
- return new DefaultMavenExecutionRequest()
- .setBaseDirectory( basedir )
- .setGoals( goals );
+ return runWithProject( goal, null );
}
- protected File runWithProject( String goal )
+ protected File runWithProject( String goal,
+ Properties properties )
throws Exception
{
- return runWithProject( new String[]{goal} );
+ return runWithProject( new String[]{goal}, properties );
}
protected File runWithProject( String[] goals )
throws Exception
{
- return runWithProject( Arrays.asList( goals ) );
+ return runWithProject( goals, null );
+ }
+
+ protected File runWithProject( String[] goals,
+ Properties properties )
+ throws Exception
+ {
+ return runWithProject( Arrays.asList( goals ), properties );
}
protected File runWithProject( List goals )
throws Exception
{
+ return runWithProject( goals, null );
+ }
+
+ protected File runWithProject( List goals,
+ Properties properties )
+ throws Exception
+ {
/*
if ( request.getBaseDirectory() == null || !new File( request.getBaseDirectory() ).exists() )
{
@@ -49,7 +63,16 @@
FileUtils.copyDirectoryStructure( testDirectory, targetDirectory );
- MavenExecutionRequest request = request( targetDirectory, goals );
+ MavenExecutionRequest request = new DefaultMavenExecutionRequest()
+ .setBaseDirectory( targetDirectory )
+ .setGoals( goals );
+
+ System.out.println( "properties = " + properties );
+
+ if ( properties != null )
+ {
+ request.setProperties( properties );
+ }
MavenExecutionResult result = maven.execute( request );
Added: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingScmPluginTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingScmPluginTest.java?view=auto&rev=512903
==============================================================================
--- maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingScmPluginTest.java (added)
+++ maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingScmPluginTest.java Wed Feb 28 11:02:06 2007
@@ -0,0 +1,28 @@
+package org.apache.maven.embedder;
+
+import java.io.File;
+import java.util.Properties;
+
+/** @author Jason van Zyl */
+public class EmbedderUsingScmPluginTest
+ extends AbstractEmbedderExecutionTestCase
+{
+ protected String getId()
+ {
+ return "scm-plugin-from-embedder";
+ }
+
+ public void testRunningScmPlugin()
+ throws Exception
+ {
+ Properties p = new Properties();
+
+ File outputDirectory = new File( getBasedir(), "target/scm.diff" );
+
+ p.setProperty( "outputDirectory", outputDirectory.getCanonicalPath() );
+
+ p.setProperty( "connectionUrl", "scm:svn:http://svn.apache.org/repos/asf/maven/components/trunk/maven-embedder" );
+
+ File basedir = runWithProject( "scm:diff", p );
+ }
+}
Propchange: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingScmPluginTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/EmbedderUsingScmPluginTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision