Author: sisbell
Date: Thu May 17 09:01:01 2007
New Revision: 538987
URL: http://svn.apache.org/viewvc?view=rev&rev=538987
Log:
Updated addin.
Modified:
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs
Modified:
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj?view=diff&rev=538987&r1=538986&r2=538987
==============================================================================
---
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj
(original)
+++
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj
Thu May 17 09:01:01 2007
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup>
- <ProjectGuid>{B18F99C3-157F-431F-B10B-76162AB08C83}</ProjectGuid>
+ <ProjectGuid>{97D20992-8D5D-49E6-B3E2-D39710FA436A}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<RootNameSpace>NMaven.IDE</RootNameSpace>
<AssemblyName>NMaven.IDE</AssemblyName>
Modified:
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs
URL:
http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs?view=diff&rev=538987&r1=538986&r2=538987
==============================================================================
---
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs
(original)
+++
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs
Thu May 17 09:01:01 2007
@@ -31,11 +31,12 @@
private OutputWindowPane outputWindowPane;
- private Logger logger;
+ private NMaven.Logging.Logger logger;
/// <summary>Implements the constructor for the Add-in object. Place
your initialization code within this method.</summary>
public Connect()
{
+
}
/// <summary>Implements the OnConnection method of the
IDTExtensibility2 interface. Receives notification that the Add-in is being
loaded.</summary>
@@ -99,13 +100,18 @@
// safely ignore the exception.
}
- ArtifactContext artifactContext = new ArtifactContext();
- //artifactContext.GetArtifactFor("org.apache.maven.dotnet",
"dotnet-jetty", "0.14-SNAPSHOT", );
- ProcessStartInfo processStartInfo =
- new ProcessStartInfo("mvn",
"org.apache.maven.dotnet.plugins:maven-embedder-plugin:start -Dport=8080
-DwarFile=");
- processStartInfo.UseShellExecute = true;
- System.Diagnostics.Process.Start(processStartInfo);
+ String localRepository =
Environment.GetEnvironmentVariable("HOMEDRIVE")
+ + Environment.GetEnvironmentVariable("HOMEPATH") +
@"\.m2\repository\";
+ //logger.Log(Level.INFO, "Local Repository = " +
localRepository);
+ ArtifactContext artifactContext = new ArtifactContext();
+ NMaven.Artifact.Artifact artifactWar =
artifactContext.CreateArtifact("org.apache.maven.dotnet",
"dotnet-service-embedder", "0.14-SNAPSHOT", "war");
+ FileInfo warFileInfo = new FileInfo(localRepository + "/" +
new JavaRepositoryLayout().pathOf(artifactWar) + "war");
+
+ ProcessStartInfo processStartInfo =
+ new ProcessStartInfo("mvn",
@"org.apache.maven.dotnet.plugins:maven-embedder-plugin:start -Dport=8080
-DwarFile=""" + warFileInfo.FullName + @"""");
+ processStartInfo.UseShellExecute = true;
+ System.Diagnostics.Process.Start(processStartInfo);
}
else if (connectMode == ext_ConnectMode.ext_cm_AfterStartup)
{
@@ -116,9 +122,16 @@
OutputWindowPaneHandler handler = new
OutputWindowPaneHandler();
handler.SetOutputWindowPaneHandler(outputWindowPane);
- logger = Logger.GetLogger("UC");
+ logger = NMaven.Logging.Logger.GetLogger("UC");
logger.AddHandler(handler);
logger.Log(Level.INFO, "NMaven Addin Test");
+ //logger.Log(Level.INFO, );
+ String localRepository =
Environment.GetEnvironmentVariable("HOMEDRIVE")
+ + Environment.GetEnvironmentVariable("HOMEPATH") +
@"\.m2\repository\";
+ ArtifactContext artifactContext = new ArtifactContext();
+ NMaven.Artifact.Artifact artifactWar =
artifactContext.CreateArtifact("org.apache.maven.dotnet",
"dotnet-service-embedder", "0.14-SNAPSHOT", "war");
+ FileInfo warFileInfo = new FileInfo(localRepository + "/" +
new JavaRepositoryLayout().pathOf(artifactWar) + "war");
+ logger.Log(Level.INFO,
@"org.apache.maven.dotnet.plugins:maven-embedder-plugin:start -Dport=8080
-DwarFile=""" + warFileInfo.FullName + @"""");
MavenBuildControl mavenBuildControl = new MavenBuildControl();
object programmableObject = null;
