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 2008/07/25 21:30:08 UTC

svn commit: r679883 - /maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/Verifier.java

Author: jvanzyl
Date: Fri Jul 25 12:30:07 2008
New Revision: 679883

URL: http://svn.apache.org/viewvc?rev=679883&view=rev
Log: (empty)

Modified:
    maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/Verifier.java

Modified: maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/Verifier.java
URL: http://svn.apache.org/viewvc/maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/Verifier.java?rev=679883&r1=679882&r2=679883&view=diff
==============================================================================
--- maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/Verifier.java (original)
+++ maven/shared/branches/embedder-verifier/src/main/java/org/apache/maven/it/Verifier.java Fri Jul 25 12:30:07 2008
@@ -66,10 +66,7 @@
     private final ByteArrayOutputStream errStream = new ByteArrayOutputStream();
     private PrintStream originalOut;
     private PrintStream originalErr;
-    private Properties systemProperties = new Properties();
-    private Properties verifierProperties = new Properties();
     private boolean autoclean = true;
-    // TODO: needs to be configurable
     private static String localRepoLayout = "default";
 
     private boolean debug;
@@ -81,21 +78,30 @@
     public void executeGoal( String goal )
         throws VerificationException
     {
-        invoker.executeGoal( goal, basedir );
+        InvocationRequest r = new DefaultInvocationRequest().setGoals( goal ).setBasedir( basedir );
+        invoker.invoke( r );
     }
 
     public void executeGoal( String goal, List cliOptions )
         throws VerificationException
     {
-        invoker.executeGoal( goal, basedir, cliOptions );
+        InvocationRequest r = new DefaultInvocationRequest().setGoals( goal ).setBasedir( basedir ).setCliOptions( cliOptions );
+        invoker.invoke( r );
     }
 
     public void executeGoal( String goal, Map envars )
         throws VerificationException
     {
-        invoker.executeGoal( goal, basedir, envars );
+        InvocationRequest r = new DefaultInvocationRequest().setGoals( goal ).setBasedir( basedir ).setEnvars( envars );
+        invoker.invoke( r );
     }
 
+    public void invoke( InvocationRequest request )
+        throws VerificationException
+    {
+        invoker.invoke( request );
+    }
+    
     public String getMavenVersion()
         throws VerificationException
     {
@@ -790,26 +796,6 @@
         }
     }
 
-    public Properties getSystemProperties()
-    {
-        return systemProperties;
-    }
-
-    public void setSystemProperties( Properties systemProperties )
-    {
-        this.systemProperties = systemProperties;
-    }
-
-    public Properties getVerifierProperties()
-    {
-        return verifierProperties;
-    }
-
-    public void setVerifierProperties( Properties verifierProperties )
-    {
-        this.verifierProperties = verifierProperties;
-    }
-
     public boolean isAutoclean()
     {
         return autoclean;