You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/03/20 08:53:00 UTC
svn commit: r520334 - in
/incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl:
SettingsRepository.java VendorInfoTransitionRuleFactory.java
Author: sisbell
Date: Tue Mar 20 01:52:59 2007
New Revision: 520334
URL: http://svn.apache.org/viewvc?view=rev&rev=520334
Log:
Bug fix for NMaven-4
Modified:
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java?view=diff&rev=520334&r1=520333&r2=520334
==============================================================================
--- incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java (original)
+++ incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java Tue Mar 20 01:52:59 2007
@@ -86,7 +86,7 @@
catch ( XmlPullParserException e )
{
e.printStackTrace();
- throw new IOException( "NMAVEN-104-000: Could not read executable-plugins.xml" );
+ throw new IOException( "NMAVEN-104-000: Could not read nmaven-settings.xml" );
}
vendors = settings.getVendors();
defaultSetup = settings.getDefaultSetup();
Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java?view=diff&rev=520334&r1=520333&r2=520334
==============================================================================
--- incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java (original)
+++ incubator/nmaven/branches/SI_IDE/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java Tue Mar 20 01:52:59 2007
@@ -108,6 +108,7 @@
try
{
defaultVendor = VendorFactory.createVendorFromName( settingsRepository.getDefaultSetup().getVendorName() );
+ logger.debug( "NMAVEN-103-036: Default Vendor Initialized: Name = " + defaultVendor );
}
catch ( VendorUnsupportedException e )
{
@@ -469,6 +470,14 @@
}
else
{
+ try
+ {
+ vendorInfo.setVendor( VendorFactory.getDefaultVendorForOS() );
+ }
+ catch ( PlatformUnsupportedException e )
+ {
+ return VendorInfoState.POST_PROCESS;
+ }
List<VendorInfo> v = vendorInfoRepository.getVendorInfosFor( vendorInfo, true );
if ( !v.isEmpty() )
{
@@ -477,7 +486,6 @@
if ( vi.getFrameworkVersion().equals( vendorInfo.getFrameworkVersion() ) )
{
vendorInfo.setVendorVersion( vi.getVendorVersion() );
- vendorInfo.setVendor( vi.getVendor() );
if ( vi.getVendor().equals( Vendor.MICROSOFT ) )
{
return VendorInfoState.MTT;
@@ -499,7 +507,6 @@
if ( vi.getFrameworkVersion().equals( vendorInfo.getFrameworkVersion() ) )
{
vendorInfo.setVendorVersion( vi.getVendorVersion() );
- vendorInfo.setVendor( vi.getVendor() );
if ( vi.getVendor().equals( Vendor.MICROSOFT ) )
{
return VendorInfoState.MTT;
@@ -772,7 +779,7 @@
{
public VendorInfoState process( VendorInfo vendorInfo )
{
- logger.debug( "NMAVEN-103-023: Entering State = GFF" );
+ logger.debug( "NMAVEN-103-035: Entering State = GFF" );
if ( vendorInfo.getVendor().equals( defaultVendor ) )
{
vendorInfo.setVendorVersion( defaultVendorVersion );