incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
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 GMT
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<Artifact> artifacts = artifactContext.getArtifactsFor( groupId, artifactId,
null, null );
         if ( artifacts.size() == 0 )
@@ -278,7 +276,7 @@
         List<String> modifiedCommands = new ArrayList<String>();
         String exe = null;
         if ( vendorInfo.getVendor().equals( Vendor.MONO ) )
-        {   
+        {
             List<File> executablePaths = vendorInfo.getExecutablePaths();
             if ( executablePaths != null )
             {



Mime
View raw message