Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 84059 invoked from network); 2 Sep 2007 17:25:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Sep 2007 17:25:23 -0000 Received: (qmail 43709 invoked by uid 500); 2 Sep 2007 17:25:17 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 43659 invoked by uid 500); 2 Sep 2007 17:25:17 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 43646 invoked by uid 99); 2 Sep 2007 17:25:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Sep 2007 10:25:17 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Sep 2007 17:25:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B0F2F1A983A; Sun, 2 Sep 2007 10:25:01 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r572041 - /maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Date: Sun, 02 Sep 2007 17:25:01 -0000 To: commits@maven.apache.org From: jvanzyl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070902172501.B0F2F1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jvanzyl Date: Sun Sep 2 10:25:01 2007 New Revision: 572041 URL: http://svn.apache.org/viewvc?rev=572041&view=rev Log: o remove redundancy Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=572041&r1=572040&r2=572041&view=diff ============================================================================== --- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original) +++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Sun Sep 2 10:25:01 2007 @@ -41,6 +41,7 @@ import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResult; import org.apache.maven.execution.MavenSession; +import org.apache.maven.execution.ReactorManager; import org.apache.maven.lifecycle.LifecycleUtils; import org.apache.maven.model.Model; import org.apache.maven.model.Plugin; @@ -421,7 +422,7 @@ { MavenExecutionResult result = new DefaultMavenExecutionResult(); - MavenProject project = null; + MavenProject project; try { @@ -446,6 +447,18 @@ } MavenProjectBuildingResult r = null; + + ReactorManager reactorManager = maven.createReactorManager( request, result ); + + if ( result.hasExceptions() ) + { + return result; + } + + result.setTopologicallySortedProjects( reactorManager.getSortedProjects() ); + + // Now I should be able to pass this projects to the next request so that I don't have to process + // any local projects again. And this logic is still too complicated. try {