From nmaven-commits-return-313-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Fri May 18 19:50:14 2007 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 74553 invoked from network); 18 May 2007 19:50:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 May 2007 19:50:13 -0000 Received: (qmail 98547 invoked by uid 500); 18 May 2007 19:50:19 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 98522 invoked by uid 500); 18 May 2007 19:50:19 -0000 Mailing-List: contact nmaven-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: nmaven-dev@incubator.apache.org Delivered-To: mailing list nmaven-commits@incubator.apache.org Received: (qmail 98513 invoked by uid 99); 18 May 2007 19:50:19 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 May 2007 12:50:19 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Fri, 18 May 2007 12:50:12 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B31FE1A981A; Fri, 18 May 2007 12:49:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r539580 - /incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java Date: Fri, 18 May 2007 19:49:52 -0000 To: nmaven-commits@incubator.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070518194952.B31FE1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Fri May 18 12:49:51 2007 New Revision: 539580 URL: http://svn.apache.org/viewvc?view=rev&rev=539580 Log: Fixed problem with Mono creating the nmaven-settings.xml file. This bug had to do with NMaven having no way of knowing Mono's vendor version prior to generating the settings file. Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java?view=diff&rev=539580&r1=539579&r2=539580 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java Fri May 18 12:49:51 2007 @@ -104,8 +104,7 @@ throw new PlatformUnsupportedException( "NMAVEN-066-011: Illegal State: Vendor Info = " + vendorInfo, e ); } - if ( vendorInfo.getVendor() == null || vendorInfo.getFrameworkVersion() == null || - vendorInfo.getVendorVersion() == null ) + if ( vendorInfo.getVendor() == null || vendorInfo.getFrameworkVersion() == null ) { throw new PlatformUnsupportedException( "NMAVEN-066-012: Missing Vendor Information: " + vendorInfo ); } @@ -257,10 +256,9 @@ throw new PlatformUnsupportedException( "NMAVEN-066-010: Illegal State: Vendor Info = " + vendorInfo, e ); } - if ( vendorInfo.getVendor() == null || vendorInfo.getFrameworkVersion() == null || - vendorInfo.getVendorVersion() == null ) + if ( vendorInfo.getVendor() == null || vendorInfo.getFrameworkVersion() == null ) { - throw new PlatformUnsupportedException( "NMAVEN-066-018: Missing Vendor Information: " + vendorInfo ); + throw new PlatformUnsupportedException( "NMAVEN-066-020: Missing Vendor Information: " + vendorInfo ); } List artifacts = artifactContext.getArtifactsFor( groupId, artifactId, null, null ); if ( artifacts.size() == 0 ) @@ -278,7 +276,7 @@ List modifiedCommands = new ArrayList(); String exe = null; if ( vendorInfo.getVendor().equals( Vendor.MONO ) ) - { + { List executablePaths = vendorInfo.getExecutablePaths(); if ( executablePaths != null ) {