Author: sisbell
Date: Fri May 18 12:15:20 2007
New Revision: 539566
URL: http://svn.apache.org/viewvc?view=rev&rev=539566
Log:
Fixed bug causing runtime error for mono using the .NET plugins: NMaven was
unable to find the mono.exe file.
Modified:
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/NMaven.Logging.sln
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj
incubator/nmaven/branches/SI_XPT/components/README.txt
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
Modified:
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/NMaven.Logging.sln
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/NMaven.Logging.sln?view=diff&rev=539566&r1=539565&r2=539566
==============================================================================
---
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/NMaven.Logging.sln
(original)
+++
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/NMaven.Logging.sln
Fri May 18 12:15:20 2007
@@ -2,5 +2,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
# SharpDevelop 2.1.0.2376
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Logging",
"C:\Documents and
Settings\shane\nmaven-apache\SI_XPT\assemblies\NMaven.Logging\src\main\csharp\NMaven.Logging.csproj",
"{f6921049-7c11-472d-85f2-71ca8e0e8243}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Logging",
"C:\Documents and
Settings\shane\nmaven-apache\SI_XPT\assemblies\NMaven.Logging\src\main\csharp\NMaven.Logging.csproj",
"{23518384-4dea-4794-bfab-dfa89f4c42c0}"
EndProject
Modified:
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj?view=diff&rev=539566&r1=539565&r2=539566
==============================================================================
---
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj
(original)
+++
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj
Fri May 18 12:15:20 2007
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup>
- <ProjectGuid>{36FCE4F7-53D7-48AC-9AF4-74CB0F6020F6}</ProjectGuid>
+ <ProjectGuid>{23518384-4dea-4794-bfab-dfa89f4c42c0}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<RootNameSpace>NMaven.Logging</RootNameSpace>
<AssemblyName>NMaven.Logging</AssemblyName>
@@ -13,6 +13,10 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="NMaven" />
+ <Folder Include="NMaven\Logging" />
</ItemGroup>
<ItemGroup>
<Compile Include="NMaven\Logging\ConsoleHandler.cs" />
Modified: incubator/nmaven/branches/SI_XPT/components/README.txt
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/README.txt?view=diff&rev=539566&r1=539565&r2=539566
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/README.txt (original)
+++ incubator/nmaven/branches/SI_XPT/components/README.txt Fri May 18 12:15:20
2007
@@ -4,7 +4,11 @@
000-019: dotnet-artifact
020-039: dotnet-assembler
040-059: dotnet-core
+120-139: dotnet-embedder
060-079: dotnet-executable
+140-149: dotnet-jetty
+150-179: dotnet-plugin
080-099: dotnet-registry
-100-019: dotnet-vendor
+180-189: dotnet-service
+100-119: dotnet-vendor
Modified:
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java?view=diff&rev=539566&r1=539565&r2=539566
==============================================================================
---
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java
(original)
+++
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultNetExecutable.java
Fri May 18 12:15:20 2007
@@ -66,10 +66,10 @@
{
for ( String executablePath : executablePaths )
{
- File exe = new File( executablePath + File.separator +
executable);
+ File exe = new File( executablePath + File.separator +
executable );
if ( exe.exists() )
{
- return new File(executablePath);
+ return new File( executablePath );
}
}
}
@@ -89,11 +89,13 @@
}
catch ( ExecutionException e )
{
- throw new ExecutionException( "NMAVEN-063-000: Command = " +
commands, e );
+ throw new ExecutionException( "NMAVEN-070-000: Execution Path = " +
+ ( ( getExecutionPath() != null ) ?
getExecutionPath().getAbsolutePath() : "unknown" ) + ", Command = " +
+ commands, e );
}
if ( commandExecutor.getStandardOut().contains( "error" ) )
{
- throw new ExecutionException( "NMAVEN-063-001: Command = " +
commands );
+ throw new ExecutionException( "NMAVEN-070-001: Command = " +
commands );
}
}
@@ -102,7 +104,7 @@
{
if ( executableContext == null )
{
- throw new ExecutionException( "NMAVEN-063-002: Executable has not
been initialized with a context" );
+ throw new ExecutionException( "NMAVEN-070-002: Executable has not
been initialized with a context" );
}
return executableContext.getExecutableCapability().getExecutable();
}
Modified:
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java?view=diff&rev=539566&r1=539565&r2=539566
==============================================================================
---
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java
(original)
+++
incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/DefaultRepositoryNetExecutable.java
Fri May 18 12:15:20 2007
@@ -83,8 +83,9 @@
}
catch ( ExecutionException e )
{
- throw new ExecutionException( "NMAVEN-063-000: Executable = " +
getExecutable() + ", Command = " + commands,
- e );
+ throw new ExecutionException( "NMAVEN-063-000: Execution Path = " +
+ ( ( getExecutionPath() != null ) ?
getExecutionPath().getAbsolutePath() : "unknown" ) + ", Command = " +
+ commands, e );
}
if ( commandExecutor.getStandardOut().contains( "error" ) )
{
@@ -108,13 +109,14 @@
for ( String executablePath : executablePaths )
{
File exe = new File( executablePath );
+ logger.debug("NMAVEN-063-004: Checking executable path = " +
exe.getAbsolutePath());
if ( exe.exists() )
{
return new File( executablePath ).getName();
}
- else if(executablePath.equals( "mono"))
+ else if ( executablePath.equals( "mono" ) )
{
- return executablePath;
+ return executablePath;
}
}
}
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=539566&r1=539565&r2=539566
==============================================================================
---
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:15:20 2007
@@ -278,15 +278,15 @@
List<String> modifiedCommands = new ArrayList<String>();
String exe = null;
if ( vendorInfo.getVendor().equals( Vendor.MONO ) )
- {
+ {
List<File> executablePaths = vendorInfo.getExecutablePaths();
if ( executablePaths != null )
{
for ( File executablePath : executablePaths )
{
- if ( new File( executablePath.getAbsolutePath() +
File.separator + "mono.exe" ).exists() )
+ if ( new File( executablePath.getAbsolutePath(),
"mono.exe" ).exists() )
{
- exe = new File( executablePath.getAbsolutePath() +
File.separator + "mono" ).getAbsolutePath();
+ exe = new File( executablePath.getAbsolutePath(),
"mono.exe" ).getAbsolutePath();
break;
}
}
Modified:
incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java?view=diff&rev=539566&r1=539565&r2=539566
==============================================================================
---
incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
(original)
+++
incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/SettingsRepository.java
Fri May 18 12:15:20 2007
@@ -211,5 +211,4 @@
{
return defaultSetup;
}
-
}
Modified:
incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java?view=diff&rev=539566&r1=539565&r2=539566
==============================================================================
---
incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
(original)
+++
incubator/nmaven/branches/SI_XPT/components/dotnet-vendor/src/main/java/org/apache/maven/dotnet/vendor/impl/VendorInfoTransitionRuleFactory.java
Fri May 18 12:15:20 2007
@@ -125,6 +125,7 @@
vendorInfoRepository.exists() )
{
File sdkInstallRoot = null;
+ List<File> executablePaths = new ArrayList<File>();
try
{
sdkInstallRoot =
vendorInfoRepository.getSdkInstallRootFor( vendorInfo );
@@ -134,19 +135,21 @@
logger.debug( "NMAVEN-103-36: Failed to resolve
install sdk root." );
}
try
- {
- List<File> executablePaths = new ArrayList<File>();
+ {
executablePaths.add(
vendorInfoRepository.getInstallRootFor( vendorInfo ) );
- if ( sdkInstallRoot != null )
- {
- executablePaths.add( sdkInstallRoot );
- }
vendorInfo.setExecutablePaths( executablePaths );
}
catch ( PlatformUnsupportedException e )
{
logger.debug( "NMAVEN-103-35: Failed to resolve
install root." );
}
+ finally
+ {
+ if ( sdkInstallRoot != null )
+ {
+ executablePaths.add( sdkInstallRoot );
+ }
+ }
}
return VendorInfoState.EXIT;
}
@@ -264,7 +267,7 @@
Set<String> vendorVersions = new HashSet<String>();
for ( VendorInfo vi : v )
{
- if ( vi.getFrameworkVersion().equals(
vendorInfo.getFrameworkVersion() ) )
+ if ( vi.getFrameworkVersion().equals(
vendorInfo.getFrameworkVersion() ) )
{
vendorVersions.add( vi.getVendorVersion() );
}
@@ -274,8 +277,7 @@
{
try
{
- vendorInfo.setVendorVersion(
- vendorInfoRepository.getMaxVersion(
vendorVersions ) );
+ vendorInfo.setVendorVersion(
vendorInfoRepository.getMaxVersion( vendorVersions ) );
}
catch ( InvalidVersionFormatException e )
{
@@ -286,7 +288,7 @@
}
else
{
- return
createVendorInfoSetterForNFT_NoSettings().process( vendorInfo );
+ return
createVendorInfoSetterForNFT_NoSettings().process( vendorInfo );
}
}
else
@@ -295,7 +297,7 @@
Set<String> vendorVersions = new HashSet<String>();
for ( VendorInfo vi : v )
{
- if ( vi.getFrameworkVersion().equals(
vendorInfo.getFrameworkVersion() ) )
+ if ( vi.getFrameworkVersion().equals(
vendorInfo.getFrameworkVersion() ) )
{
vendorVersions.add( vi.getVendorVersion() );
}
@@ -305,8 +307,7 @@
{
try
{
- vendorInfo.setVendorVersion(
- vendorInfoRepository.getMaxVersion(
vendorVersions ) );
+ vendorInfo.setVendorVersion(
vendorInfoRepository.getMaxVersion( vendorVersions ) );
}
catch ( InvalidVersionFormatException e )
{
@@ -598,7 +599,6 @@
}
}
return createVendorInfoSetterForFFT_NoSettings().process(
vendorInfo );
-
}
}
};
