svn commit: r592592 - /incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java

2007-11-06 Thread sisbell 
Author: sisbell
Date: Tue Nov  6 16:24:46 2007
New Revision: 592592

URL: http://svn.apache.org/viewvc?rev=592592&view=rev
Log:
Fixed bug that caused the informational version to be incorrect in assemblies 
that did not have dash in the version.

Modified:

incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java

Modified: 
incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java?rev=592592&r1=592591&r2=592592&view=diff
==
--- 
incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
 (original)
+++ 
incubator/nmaven/trunk/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java
 Tue Nov  6 16:24:46 2007
@@ -120,9 +120,9 @@
 }
 }
 }
+informationalVersion = version;
 if ( version.contains( "-" ) )
 {
-informationalVersion = version;
 version = version.split( "-" )[0];
 }
 assemblyInfo.setCompany( company );

svn commit: r592598 - /incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs

2007-11-06 Thread sisbell 
Author: sisbell
Date: Tue Nov  6 19:18:03 2007
New Revision: 592598

URL: http://svn.apache.org/viewvc?rev=592598&view=rev
Log:
Removed hard-coded version within class file.

Modified:

incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs

Modified: 
incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs?rev=592598&r1=592597&r2=592598&view=diff
==
--- 
incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs
 (original)
+++ 
incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs
 Tue Nov  6 19:18:03 2007
@@ -19,6 +19,7 @@
 //
 #endregion
 using System;
+using System.Reflection;
 using System.Text;
 using System.Diagnostics;
 
@@ -54,8 +55,10 @@
 new ProcessStartInfo(startProcessAssembly, 
@flattenArgs(args));
 }
 
+String version = 
Assembly.GetExecutingAssembly().GetName().Version.ToString();
+

processStartInfo.EnvironmentVariables["APPDOMAIN_MANAGER_ASM"]
-   = "NMaven.Plugin, Version=0.14.0.0, 
PublicKeyToken=4b435f4d76e2f0e6, culture=neutral";
+   = "NMaven.Plugin, Version="+ version + ", 
PublicKeyToken=4b435f4d76e2f0e6, culture=neutral";

processStartInfo.EnvironmentVariables["APPDOMAIN_MANAGER_TYPE"]
= "NMaven.Plugin.PluginDomainManager";

svn commit: r592601 - /incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java

2007-11-06 Thread sisbell 
Author: sisbell
Date: Tue Nov  6 19:42:30 2007
New Revision: 592601

URL: http://svn.apache.org/viewvc?rev=592601&view=rev
Log:
Need to create embedder-logs directory on startup.

Modified:

incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java

Modified: 
incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java?rev=592601&r1=592600&r2=592601&view=diff
==
--- 
incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
 (original)
+++ 
incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
 Tue Nov  6 19:42:30 2007
@@ -155,6 +155,12 @@
 public void execute()
 throws MojoExecutionException, MojoFailureException
 {
+File logs = new File(System.getProperty( "user.home" ) + 
"\\.m2\\embedder-logs");
+if(!logs.exists())
+{
+logs.mkdir();
+}
+
 try
 {
 logger.addHandler( new FileHandler(

svn commit: r592613 - /incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java

2007-11-06 Thread sisbell 
Author: sisbell
Date: Tue Nov  6 21:18:03 2007
New Revision: 592613

URL: http://svn.apache.org/viewvc?rev=592613&view=rev
Log:
Better logging message.

Modified:

incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java

Modified: 
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?rev=592613&r1=592612&r2=592613&view=diff
==
--- 
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
 (original)
+++ 
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
 Tue Nov  6 21:18:03 2007
@@ -353,13 +353,15 @@
 {
 if ( artifact.getFile() != null && artifact.getFile().exists() 
)//maybe just a test compile and no install
 {
-logger.info(
-"NMAVEN-001-007: Installing file into repository: File = " 
+ artifact.getFile().getAbsolutePath() );
+
 File artifactFile = artifact.getFile();
+File destFile = PathUtil.getUserAssemblyCacheFileFor( 
artifact, localRepository );
+logger.info(
+"NMAVEN-001-007: Installing file into repository: File = " 
+ artifact.getFile().getAbsolutePath()
++ ", Dest File = " + destFile.getAbsolutePath());
 try
 {
-FileUtils.copyFile( artifactFile,
-PathUtil.getUserAssemblyCacheFileFor( 
artifact, localRepository ) );
+FileUtils.copyFile( artifactFile, destFile );
 }
 catch ( IOException e )
 {