incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r536025 [1/3] - in /incubator/nmaven/branches/SI_XPT: ./ assemblies/ assemblies/NMaven.Core/ assemblies/NMaven.Core/src/main/csharp/Core/Impl/ assemblies/NMaven.IDE/ assemblies/NMaven.IDE/src/main/csharp/ assemblies/NMaven.IDE/src/main/csha...
Date Mon, 07 May 2007 23:55:06 GMT
Author: sisbell
Date: Mon May  7 16:55:03 2007
New Revision: 536025

URL: http://svn.apache.org/viewvc?view=rev&rev=536025
Log:
Working build for MS/Visual Studio; Support for installing Visual Studio Addin

Added:
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/pom.xml   (with props)
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/src/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/src/main/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/src/main/csharp/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/src/main/csharp/NMaven/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/src/main/csharp/NMaven/Model/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/src/main/csharp/NMaven/Model/AutomationExtensibility.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/resources/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/resources/resgen/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/resources/resgen/pom-java.xml   (with props)
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/EmbedderException.java   (with props)
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/NMaven.Plugin.Devenv.sln
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/pom-java.xml   (with props)
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/pom.xml   (with props)
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/csharp/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/csharp/NMaven/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/csharp/NMaven.Plugin.Devenv.csproj
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/csharp/NMaven/Plugin/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/csharp/NMaven/Plugin/Devenv/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/csharp/NMaven/Plugin/Devenv/DevenvMojo.cs
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/java/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/java/NMaven/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/java/NMaven/Plugin/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/java/NMaven/Plugin/Devenv/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Devenv/src/main/java/NMaven/Plugin/Devenv/DevenvMojo.java   (with props)
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom-java.xml   (with props)
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/Solution/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java   (with props)
    incubator/nmaven/branches/SI_XPT/plugins/pom-netplugins.xml   (with props)
Removed:
    incubator/nmaven/branches/SI_XPT/assemblies/pom-G_x_x.xml
    incubator/nmaven/branches/SI_XPT/assemblies/pom-M_2_2.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/test/
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/src/main/csharp/Plugin/Settings/SettingsGenerator.cs
    incubator/nmaven/branches/SI_XPT/plugins/pom-release.xml
    incubator/nmaven/branches/SI_XPT/plugins/scripts/
Modified:
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/NMaven.IDE.sln
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/MavenBuildControl.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/IIdeContext.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Impl/IdeContextImpl.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/View/MainForm.cs
    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/assemblies/NMaven.Model/Pom/pom.xml
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/NMaven.Plugin.MojoGenerator.sln
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven.Plugin.MojoGenerator.csproj
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/NMaven.Plugin.sln
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven.Plugin.csproj
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven.Service.Embedder.csproj
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs
    incubator/nmaven/branches/SI_XPT/assemblies/pom.xml
    incubator/nmaven/branches/SI_XPT/bootstrap-build.bat
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/impl/MavenEmbedderServiceImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/impl/PluginContextImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-registry/pom.xml
    incubator/nmaven/branches/SI_XPT/components/pom.xml
    incubator/nmaven/branches/SI_XPT/maven-dotnet.iml
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/NMaven.Plugin.Addin.suo
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/pom.xml
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven.Plugin.Addin.csproj
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Resx/pom.xml
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Settings/pom.xml
    incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/pom.xml
    incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
    incubator/nmaven/branches/SI_XPT/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-mojo-generator-plugin/src/main/java/org/apache/maven/dotnet/plugin/generator/MojoGeneratorMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/pom.xml
    incubator/nmaven/branches/SI_XPT/pom.xml

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/pom.xml Mon May  7 16:55:03 2007
@@ -48,20 +48,6 @@
       <type>library</type>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.dotnet.plugins</groupId>
-        <artifactId>maven-link-plugin</artifactId>
-        <configuration>
-          <netModules>
-            <netModule>${basedir}/target/NMaven.Core.netmodule</netModule>
-          </netModules>
-          <outputFile>${basedir}/target/NMaven.Core.dll</outputFile>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
   <profiles>
     <profile>
       <activation>

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs Mon May  7 16:55:03 2007
@@ -138,8 +138,11 @@
 			}
             Engine engine = new Engine(@"C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727");
             Project project = new Project(engine);
-            
-            
+
+            Console.WriteLine("ProjectGuid = " + projectGuid.ToString() + ", RootNameSpace = " +
+                model.groupId + ", AssemblyName = " + assemblyName + ", BaseIntPath = " +
+                baseIntermediateOutputPath + ", OutputType = " + GetOutputType(model.packaging) + 
+                ", Packaging = " + model.packaging);
             //Main Properties
             BuildPropertyGroup groupProject = project.AddNewPropertyGroup(false);
             groupProject.AddNewProperty("ProjectGuid", "{" + projectGuid.ToString() + "}");
@@ -296,7 +299,8 @@
 		
 		private string GetOutputType(String type)
 		{
-			if (type.Equals("library") || type.Equals("netplugin") ) return "Library";
+			if (type.Equals("library") || type.Equals("netplugin") || type.Equals("visual-studio-addin")
+                || type.Equals("sharp-develop-addin")) return "Library";
 			else if (type.Equals("exe")) return "Exe";
 			else if (type.Equals("winexe")) return "WinExe";
 			else if (type.Equals("module")) return "Module";
@@ -342,9 +346,7 @@
 			        {
 			            Console.WriteLine(e.Message);
 			        }
-
 				}
-				
 				return dependencies;
 			}
 		

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/NMaven.IDE.sln
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/NMaven.IDE.sln?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/NMaven.IDE.sln (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/NMaven.IDE.sln Mon May  7 16:55:03 2007
@@ -1,16 +1,17 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.0.0.1710
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.IDE", "src\main\csharp\NMaven.IDE.csproj", "{f6d6becb-cfa4-411d-a67c-789cdcdd728f}"
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.IDE", "C:\Documents and Settings\shane\nmaven-apache\SI_XPT\assemblies\NMaven.IDE\src\main\csharp\NMaven.IDE.csproj", "{97D20992-8D5D-49E6-B3E2-D39710FA436A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F6D6BECB-CFA4-411D-A67C-789CDCDD728F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F6D6BECB-CFA4-411D-A67C-789CDCDD728F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F6D6BECB-CFA4-411D-A67C-789CDCDD728F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F6D6BECB-CFA4-411D-A67C-789CDCDD728F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{97D20992-8D5D-49E6-B3E2-D39710FA436A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{97D20992-8D5D-49E6-B3E2-D39710FA436A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal

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=536025&r1=536024&r2=536025
==============================================================================
--- 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 Mon May  7 16:55:03 2007
@@ -1,82 +1,42 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{f6d6becb-cfa4-411d-a67c-789cdcdd728f}</ProjectGuid>
+    <ProjectGuid>{97D20992-8D5D-49E6-B3E2-D39710FA436A}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RootNameSpace>NMaven.IDE</RootNameSpace>
     <AssemblyName>NMaven.IDE</AssemblyName>
     <BaseIntermediateOutputPath>..\..\..\target\obj\</BaseIntermediateOutputPath>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  <PropertyGroup>
     <OutputPath>..\..\..\target\bin\Debug\</OutputPath>
-    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <Optimize>False</Optimize>
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <NoStdLib>False</NoStdLib>
-    <DebugType>Full</DebugType>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <BaseAddress>4194304</BaseAddress>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <FileAlignment>4096</FileAlignment>
-    <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
+    <Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <Reference Include="NMaven.Logging">
-      <HintPath>..\..\..\..\..\..\..\.m2\repository\NMaven\Logging\NMaven.Logging\0.14\NMaven.Logging.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Windows.Forms">
-      <Private>False</Private>
+      <HintPath>C:\Documents and Settings\shane\.m2\repository\NMaven\Logging\NMaven.Logging\0.14\NMaven.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="System.Drawing" />
     <Reference Include="NMaven.Service.Embedder">
-      <HintPath>..\..\..\..\..\..\..\.m2\repository\NMaven\Service\NMaven.Service.Embedder\0.14\NMaven.Service.Embedder.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpDevelop">
-      <HintPath>..\..\..\..\..\..\..\..\..\Program Files\SharpDevelop\2.0\bin\ICSharpCode.SharpDevelop.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="ICSharpCode.Core">
-      <HintPath>..\..\..\..\..\..\..\..\..\Program Files\SharpDevelop\2.0\bin\ICSharpCode.Core.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="AddinTest2">
-      <HintPath>..\..\..\..\..\..\..\My Documents\SharpDevelop Projects\AddinTest2\obj\Debug\AddinTest2.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="ICSharpCode.SharpDevelop">
-      <HintPath>..\..\..\..\..\..\..\..\..\Program Files\SharpDevelop\2.0\bin\ICSharpCode.SharpDevelop.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="ICSharpCode.Core">
-      <HintPath>..\..\..\..\..\..\..\..\..\Program Files\SharpDevelop\2.0\bin\ICSharpCode.Core.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>C:\Documents and Settings\shane\.m2\repository\NMaven\Service\NMaven.Service.Embedder\0.14\NMaven.Service.Embedder.dll</HintPath>
     </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="NMaven\IDE\Commands\BuildCommand.cs" />
+    <Compile Include="NMaven\IDE\Controls\MavenBuildControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="NMaven\IDE\Factory.cs" />
+    <Compile Include="NMaven\IDE\IIdeConfiguration.cs" />
     <Compile Include="NMaven\IDE\IIdeContext.cs" />
     <Compile Include="NMaven\IDE\Impl\IdeContextImpl.cs" />
-    <Compile Include="NMaven\IDE\IIdeConfiguration.cs" />
-    <Compile Include="NMaven\IDE\Factory.cs" />
-    <Compile Include="NMaven\IDE\View\MainForm.cs" />
+    <Compile Include="NMaven\IDE\View\MainForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="NMaven\IDE\View\MainForm.Designer.cs" />
-    <Compile Include="NMaven\IDE\Commands\BuildCommand.cs" />
-    <Compile Include="NMaven\IDE\Controls\MavenBuildControl.cs" />
-    <Compile Include="NMaven\IDE\Controls\MavenDependencyUserControl.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="NMaven" />
-    <Folder Include="NMaven\IDE" />
-    <Folder Include="NMaven\IDE\Impl" />
-    <Folder Include="NMaven\IDE\View" />
-    <Folder Include="NMaven\IDE\Commands" />
-    <Folder Include="NMaven\IDE\Controls" />
   </ItemGroup>
-  <Import Project="$(SharpDevelopBinPath)\SharpDevelop.Build.CSharp.targets" />
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/MavenBuildControl.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/MavenBuildControl.cs?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/MavenBuildControl.cs (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Controls/MavenBuildControl.cs Mon May  7 16:55:03 2007
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.IO;
 using System.Windows.Forms;
 using NMaven.IDE;
 using NMaven.IDE.Impl;
@@ -31,7 +32,7 @@
 		{		
 		}
 
-		public void Init(Logger logger, int loggerPort, Size treeSize)
+		public void Init(DirectoryInfo buildDirectory, Logger logger, int loggerPort, Size treeSize)
 		{
 			this.loggerPort = loggerPort;
 			
@@ -41,7 +42,7 @@
 			configuration.Logger = logger;
 			configuration.SocketLoggerPort = loggerPort;
 			ideContext.Init(configuration);
-			List<MavenProject> mavenProjects = ideContext.GetMavenProjects();
+			List<MavenProject> mavenProjects = ideContext.GetMavenProjectsFrom(buildDirectory);
 			foreach(MavenProject mavenProject in mavenProjects)
 			{
 				treeView.Nodes.Add(CreateTreeNodeFor(mavenProject));

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/IIdeContext.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/IIdeContext.cs?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/IIdeContext.cs (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/IIdeContext.cs Mon May  7 16:55:03 2007
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
+
 using NMaven.Service;
 using NMaven.Logging;
 
@@ -15,8 +17,8 @@
 		void Dispose();
 		
 		Logger GetLogger();
-		
-		List<MavenProject> GetMavenProjects();
+
+        List<MavenProject> GetMavenProjectsFrom(DirectoryInfo buildDirectory);
 		
 		void Build(MavenExecutionRequest request);
 		

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Impl/IdeContextImpl.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Impl/IdeContextImpl.cs?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Impl/IdeContextImpl.cs (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/Impl/IdeContextImpl.cs Mon May  7 16:55:03 2007
@@ -4,12 +4,13 @@
 using System.Net;
 using System.Net.Sockets;
 using System.Text;
+using System.Threading;
 using System.Web.Services.Protocols;
 
 using NMaven.Logging;
 using NMaven.IDE;
 using NMaven.Service;
-using System.Threading;
+
 
 namespace NMaven.IDE.Impl
 {
@@ -52,11 +53,12 @@
 			}				
 		}
 		
-		public List<MavenProject> GetMavenProjects()
+		public List<MavenProject> GetMavenProjectsFrom(DirectoryInfo buildDirectory)
 		{
 			MavenEmbedderService service = new MavenEmbedderService();
 			List<MavenProject> mavenProjects = new List<MavenProject>();
-			mavenProjects.AddRange(service.getMavenProjectsFor(@"C:\Documents and Settings\shane\nmaven-apache\SI_XPT\assemblies"));
+           
+			mavenProjects.AddRange(service.getMavenProjectsFor(buildDirectory.FullName));
 			return mavenProjects;
 		}
 		

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/View/MainForm.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/View/MainForm.cs?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/View/MainForm.cs (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/View/MainForm.cs Mon May  7 16:55:03 2007
@@ -38,7 +38,7 @@
 			InitializeComponent();
 			MavenBuildControl mavenBuildControl = new MavenBuildControl();
 			mavenBuildControl.Size = size;
-			mavenBuildControl.Init(logger, 9099, size);
+			mavenBuildControl.Init(null, logger, 9099, size);
 			this.Controls.Add(mavenBuildControl);	
 			//MavenDependencyUserControl mpuc = new MavenDependencyUserControl();
 			//this.Controls.Add(mpuc);

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=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/NMaven.Logging.sln (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/NMaven.Logging.sln Mon May  7 16:55:03 2007
@@ -1,16 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.0.0.1710
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Logging", "src\main\csharp\NMaven.Logging.csproj", "{7030f644-b1ab-4844-8f09-a6032f1f597c}"
+
+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}"
 EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7030F644-B1AB-4844-8F09-A6032F1F597C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7030F644-B1AB-4844-8F09-A6032F1F597C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7030F644-B1AB-4844-8F09-A6032F1F597C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7030F644-B1AB-4844-8F09-A6032F1F597C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-EndGlobal

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=536025&r1=536024&r2=536025
==============================================================================
--- 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 Mon May  7 16:55:03 2007
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{7030f644-b1ab-4844-8f09-a6032f1f597c}</ProjectGuid>
+    <ProjectGuid>{f6921049-7c11-472d-85f2-71ca8e0e8243}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RootNameSpace>NMaven.Logging</RootNameSpace>
     <AssemblyName>NMaven.Logging</AssemblyName>

Added: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/pom.xml?view=auto&rev=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/pom.xml (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/pom.xml Mon May  7 16:55:03 2007
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?><!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0">
+  <parent>
+    <groupId>NMaven</groupId>
+    <version>0.14</version>
+    <artifactId>NMaven.Assemblies</artifactId>
+    <relativePath>..\..\pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>NMaven.Model</groupId>
+  <artifactId>NMaven.Model.AutomationExtensibility</artifactId>
+  <packaging>library</packaging>
+  <version>0.14</version>
+  <name>NMaven.Model.AutomationExtensibility</name>
+  <!--
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.dotnet.plugins</groupId>
+        <artifactId>maven-xsd-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>xsd</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <xsdFile>${basedir}/AutomationExtensibility.xsd</xsdFile>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  -->
+</project>
\ No newline at end of file

Propchange: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/src/main/csharp/NMaven/Model/AutomationExtensibility.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/src/main/csharp/NMaven/Model/AutomationExtensibility.cs?view=auto&rev=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/src/main/csharp/NMaven/Model/AutomationExtensibility.cs (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/AutomationExtensibility/src/main/csharp/NMaven/Model/AutomationExtensibility.cs Mon May  7 16:55:03 2007
@@ -0,0 +1,271 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:2.0.50727.42
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+// 
+// This source code was auto-generated by xsd, Version=2.0.50727.42.
+// 
+namespace NMaven.Model {
+    using System.Xml.Serialization;
+    
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    [System.Xml.Serialization.XmlRootAttribute(Namespace="http://schemas.microsoft.com/AutomationExtensibility", IsNullable=false)]
+    public partial class Extensibility {
+        
+        private object[] itemsField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("Addin", typeof(ExtensibilityAddin))]
+        [System.Xml.Serialization.XmlElementAttribute("HostApplication", typeof(ExtensibilityHostApplication))]
+        [System.Xml.Serialization.XmlElementAttribute("ToolsOptionsPage", typeof(ExtensibilityToolsOptionsPageCategory[]))]
+        public object[] Items {
+            get {
+                return this.itemsField;
+            }
+            set {
+                this.itemsField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public partial class ExtensibilityAddin {
+        
+        private string[] itemsField;
+        
+        private ItemsChoiceType1[] itemsElementNameField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("AboutBoxDetails", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("AboutIconData", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("Assembly", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("CommandLineSafe", typeof(string), DataType="integer")]
+        [System.Xml.Serialization.XmlElementAttribute("CommandPreload", typeof(string), DataType="integer")]
+        [System.Xml.Serialization.XmlElementAttribute("Description", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("FriendlyName", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("FullClassName", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("LoadBehavior", typeof(string), DataType="integer")]
+        [System.Xml.Serialization.XmlChoiceIdentifierAttribute("ItemsElementName")]
+        public string[] Items {
+            get {
+                return this.itemsField;
+            }
+            set {
+                this.itemsField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("ItemsElementName")]
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public ItemsChoiceType1[] ItemsElementName {
+            get {
+                return this.itemsElementNameField;
+            }
+            set {
+                this.itemsElementNameField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+    [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/AutomationExtensibility", IncludeInSchema=false)]
+    public enum ItemsChoiceType1 {
+        
+        /// <remarks/>
+        AboutBoxDetails,
+        
+        /// <remarks/>
+        AboutIconData,
+        
+        /// <remarks/>
+        Assembly,
+        
+        /// <remarks/>
+        CommandLineSafe,
+        
+        /// <remarks/>
+        CommandPreload,
+        
+        /// <remarks/>
+        Description,
+        
+        /// <remarks/>
+        FriendlyName,
+        
+        /// <remarks/>
+        FullClassName,
+        
+        /// <remarks/>
+        LoadBehavior,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public partial class ExtensibilityHostApplication {
+        
+        private string[] itemsField;
+        
+        private ItemsChoiceType[] itemsElementNameField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("Name", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("Version", typeof(string))]
+        [System.Xml.Serialization.XmlChoiceIdentifierAttribute("ItemsElementName")]
+        public string[] Items {
+            get {
+                return this.itemsField;
+            }
+            set {
+                this.itemsField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("ItemsElementName")]
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public ItemsChoiceType[] ItemsElementName {
+            get {
+                return this.itemsElementNameField;
+            }
+            set {
+                this.itemsElementNameField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+    [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/AutomationExtensibility", IncludeInSchema=false)]
+    public enum ItemsChoiceType {
+        
+        /// <remarks/>
+        Name,
+        
+        /// <remarks/>
+        Version,
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public partial class ExtensibilityToolsOptionsPageCategory {
+        
+        private ExtensibilityToolsOptionsPageCategorySubCategory[] subCategoryField;
+        
+        private string nameField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("SubCategory")]
+        public ExtensibilityToolsOptionsPageCategorySubCategory[] SubCategory {
+            get {
+                return this.subCategoryField;
+            }
+            set {
+                this.subCategoryField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public string Name {
+            get {
+                return this.nameField;
+            }
+            set {
+                this.nameField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+    [System.SerializableAttribute()]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    [System.Xml.Serialization.XmlTypeAttribute(AnonymousType=true)]
+    public partial class ExtensibilityToolsOptionsPageCategorySubCategory {
+        
+        private string[] itemsField;
+        
+        private ItemsChoiceType2[] itemsElementNameField;
+        
+        private string nameField;
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("Assembly", typeof(string))]
+        [System.Xml.Serialization.XmlElementAttribute("FullClassName", typeof(string))]
+        [System.Xml.Serialization.XmlChoiceIdentifierAttribute("ItemsElementName")]
+        public string[] Items {
+            get {
+                return this.itemsField;
+            }
+            set {
+                this.itemsField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlElementAttribute("ItemsElementName")]
+        [System.Xml.Serialization.XmlIgnoreAttribute()]
+        public ItemsChoiceType2[] ItemsElementName {
+            get {
+                return this.itemsElementNameField;
+            }
+            set {
+                this.itemsElementNameField = value;
+            }
+        }
+        
+        /// <remarks/>
+        [System.Xml.Serialization.XmlAttributeAttribute()]
+        public string Name {
+            get {
+                return this.nameField;
+            }
+            set {
+                this.nameField = value;
+            }
+        }
+    }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("xsd", "2.0.50727.42")]
+    [System.SerializableAttribute()]
+    [System.Xml.Serialization.XmlTypeAttribute(Namespace="http://schemas.microsoft.com/AutomationExtensibility", IncludeInSchema=false)]
+    public enum ItemsChoiceType2 {
+        
+        /// <remarks/>
+        Assembly,
+        
+        /// <remarks/>
+        FullClassName,
+    }
+}

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Model/Pom/pom.xml Mon May  7 16:55:03 2007
@@ -61,16 +61,6 @@
           <isGacInstall>true</isGacInstall>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.dotnet.plugins</groupId>
-        <artifactId>maven-link-plugin</artifactId>
-        <configuration>
-          <netModules>
-            <netModule>${basedir}/target/NMaven.Model.Pom.netmodule</netModule>
-          </netModules>
-          <outputFile>${basedir}/target/NMaven.Model.Pom.dll</outputFile>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/NMaven.Plugin.MojoGenerator.sln
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/NMaven.Plugin.MojoGenerator.sln?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/NMaven.Plugin.MojoGenerator.sln (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/NMaven.Plugin.MojoGenerator.sln Mon May  7 16:55:03 2007
@@ -1,16 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.0.0.1710
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Plugin.MojoGenerator", "src\main\csharp\NMaven.Plugin.MojoGenerator.csproj", "{e5da8638-1152-4730-a6f8-d3c2932d2a89}"
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+# SharpDevelop 2.1.0.2376
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Plugin.MojoGenerator", "C:\Documents and Settings\shane\nmaven-apache\SI_XPT\assemblies\NMaven.Plugin.MojoGenerator\src\main\csharp\NMaven.Plugin.MojoGenerator.csproj", "{57e048c1-3dab-48d6-92a5-88ddcb57e71e}"
 EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E5DA8638-1152-4730-A6F8-D3C2932D2A89}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5DA8638-1152-4730-A6F8-D3C2932D2A89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5DA8638-1152-4730-A6F8-D3C2932D2A89}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E5DA8638-1152-4730-A6F8-D3C2932D2A89}.Release|Any CPU.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-EndGlobal

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven.Plugin.MojoGenerator.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven.Plugin.MojoGenerator.csproj?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven.Plugin.MojoGenerator.csproj (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven.Plugin.MojoGenerator.csproj Mon May  7 16:55:03 2007
@@ -1,34 +1,31 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{e5da8638-1152-4730-a6f8-d3c2932d2a89}</ProjectGuid>
+    <ProjectGuid>{57e048c1-3dab-48d6-92a5-88ddcb57e71e}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RootNameSpace>NMaven.Plugin</RootNameSpace>
     <AssemblyName>NMaven.Plugin.MojoGenerator</AssemblyName>
     <BaseIntermediateOutputPath>..\..\..\target\obj\</BaseIntermediateOutputPath>
     <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <PropertyGroup>
     <OutputPath>..\..\..\target\bin\Debug\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NUnit.Framework" />
+    <Reference Include="NMaven.Plugin" />
+    <Reference Include="NMaven.Plugin" />
     <Reference Include="System" />
     <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="NMaven.Plugin">
-      <HintPath>..\..\..\..\..\..\..\.m2\repository\NMaven\Plugin\NMaven.Plugin\0.14\NMaven.Plugin.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="NMaven.Model.Pom">
-      <HintPath>..\..\..\..\..\..\..\.m2\repository\NMaven\Model\NMaven.Model.Pom\0.14\NMaven.Model.Pom.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="NMaven\Plugin\MojoGenerator\Generator.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="NMaven" />
     <Folder Include="NMaven\Plugin" />
     <Folder Include="NMaven\Plugin\MojoGenerator" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="NMaven\Plugin\MojoGenerator\Generator.cs" />
+  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

Added: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/resources/resgen/pom-java.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/resources/resgen/pom-java.xml?view=auto&rev=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/resources/resgen/pom-java.xml (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/resources/resgen/pom-java.xml Mon May  7 16:55:03 2007
@@ -0,0 +1,43 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId></groupId>
+  <artifactId></artifactId>
+  <packaging>maven-plugin</packaging>
+  <version></version>
+  <name></name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-assembler</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-executable</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-artifact</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.dotnet</groupId>
+      <artifactId>dotnet-plugin</artifactId>
+      <version>0.14-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file

Propchange: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/resources/resgen/pom-java.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/NMaven.Plugin.sln
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/NMaven.Plugin.sln?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/NMaven.Plugin.sln (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/NMaven.Plugin.sln Mon May  7 16:55:03 2007
@@ -1,26 +1,6 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# SharpDevelop 2.0.0.1710
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Plugin", "src\main\csharp\NMaven.Plugin.csproj", "{d2fb13bd-37b4-4335-9883-1b34d39bc121}"
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+# SharpDevelop 2.1.0.2376
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Plugin", "C:\Documents and Settings\shane\nmaven-apache\SI_XPT\assemblies\NMaven.Plugin\src\main\csharp\NMaven.Plugin.csproj", "{98f968ea-3204-487f-8ae7-7d2dbfbcb165}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Plugin-Test", "src\test\csharp\NMaven.Plugin-Test.csproj", "{fe42fa80-6048-494c-a70c-1ed9fe3c642e}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FE42FA80-6048-494C-A70C-1ED9FE3C642E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE42FA80-6048-494C-A70C-1ED9FE3C642E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE42FA80-6048-494C-A70C-1ED9FE3C642E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE42FA80-6048-494C-A70C-1ED9FE3C642E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D2FB13BD-37B4-4335-9883-1B34D39BC121}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D2FB13BD-37B4-4335-9883-1B34D39BC121}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D2FB13BD-37B4-4335-9883-1B34D39BC121}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D2FB13BD-37B4-4335-9883-1B34D39BC121}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8E00E1D0-EFB1-4E03-BC48-00EBF5F6579D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8E00E1D0-EFB1-4E03-BC48-00EBF5F6579D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8E00E1D0-EFB1-4E03-BC48-00EBF5F6579D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8E00E1D0-EFB1-4E03-BC48-00EBF5F6579D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-	EndGlobalSection
-EndGlobal

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven.Plugin.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven.Plugin.csproj?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven.Plugin.csproj (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven.Plugin.csproj Mon May  7 16:55:03 2007
@@ -1,56 +1,46 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{d2fb13bd-37b4-4335-9883-1b34d39bc121}</ProjectGuid>
+    <ProjectGuid>{98f968ea-3204-487f-8ae7-7d2dbfbcb165}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RootNameSpace>NMaven.Plugin</RootNameSpace>
     <AssemblyName>NMaven.Plugin</AssemblyName>
     <BaseIntermediateOutputPath>..\..\..\target\obj\</BaseIntermediateOutputPath>
     <OutputType>Library</OutputType>
+  </PropertyGroup>
+  <PropertyGroup>
     <OutputPath>..\..\..\target\bin\Debug\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="NMaven.Model.Pom" />
+    <Reference Include="NMaven.Plugin" />
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml" />
-    <Reference Include="NUnit.Framework">
-      <HintPath>..\..\..\..\..\..\..\.m2\repository\NUnit\NUnit.Framework\2.2.8.0\NUnit.Framework.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="NMaven.Plugin.Resx">
-      <HintPath>..\..\..\..\..\..\..\.m2\repository\NMaven\Plugin\NMaven.Plugin.Resx\0.14\NMaven.Plugin.Resx.exe</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
-    <Reference Include="NMaven.Model.Pom">
-      <HintPath>..\..\..\..\..\..\..\.m2\repository\NMaven\Model\NMaven.Model.Pom\0.14\NMaven.Model.Pom.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="NMaven" />
+    <Folder Include="NMaven\Plugin" />
+    <Folder Include="NMaven\Plugin\Generator" />
+    <Folder Include="NMaven\Plugin\Injector" />
+    <Folder Include="NMaven\Plugin\Injector\Impl" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="NMaven\Plugin\AbstractMojo.cs" />
-    <Compile Include="NMaven\Plugin\FieldAttribute.cs" />
     <Compile Include="NMaven\Plugin\ClassAttribute.cs" />
-    <Compile Include="NMaven\Plugin\PluginDomainManager.cs" />
-    <Compile Include="..\..\..\..\NMaven.Plugin.Loader\src\main\csharp\NMaven\Plugin\Loader\PluginLoader.cs">
-      <Link>PluginLoader.cs</Link>
-    </Compile>
-    <Compile Include="NMaven\Plugin\Injector\IFieldInjector.cs" />
-    <Compile Include="NMaven\Plugin\Injector\Impl\FieldInjectorRepository.cs" />
+    <Compile Include="NMaven\Plugin\FieldAttribute.cs" />
     <Compile Include="NMaven\Plugin\FieldInjectorAttribute.cs" />
-    <Compile Include="NMaven\Plugin\Injector\Impl\MavenProjectInjector.cs" />
-    <Compile Include="NMaven\Plugin\Injector\Impl\StringInjector.cs" />
+    <Compile Include="NMaven\Plugin\Generator\Code.cs" />
+    <Compile Include="NMaven\Plugin\Generator\ImportPackage.cs" />
     <Compile Include="NMaven\Plugin\Generator\JavaClass.cs" />
-    <Compile Include="NMaven\Plugin\Generator\JavaField.cs" />
     <Compile Include="NMaven\Plugin\Generator\JavaClassUnmarshaller.cs" />
+    <Compile Include="NMaven\Plugin\Generator\JavaField.cs" />
     <Compile Include="NMaven\Plugin\Generator\JavaMethod.cs" />
-    <Compile Include="NMaven\Plugin\Generator\Code.cs" />
-    <Compile Include="NMaven\Plugin\Generator\ImportPackage.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="NMaven" />
-    <Folder Include="NMaven\Plugin" />
-    <Folder Include="NMaven\Plugin\Injector" />
-    <Folder Include="NMaven\Plugin\Injector\Impl" />
-    <Folder Include="NMaven\Plugin\Generator" />
+    <Compile Include="NMaven\Plugin\Injector\IFieldInjector.cs" />
+    <Compile Include="NMaven\Plugin\Injector\Impl\FieldInjectorRepository.cs" />
+    <Compile Include="NMaven\Plugin\Injector\Impl\MavenProjectInjector.cs" />
+    <Compile Include="NMaven\Plugin\Injector\Impl\StringInjector.cs" />
+    <Compile Include="NMaven\Plugin\PluginDomainManager.cs" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven.Service.Embedder.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven.Service.Embedder.csproj?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven.Service.Embedder.csproj (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven.Service.Embedder.csproj Mon May  7 16:55:03 2007
@@ -1,28 +1,26 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{17383853-8014-4d24-a54a-38f28ff4aaf6}</ProjectGuid>
+    <ProjectGuid>{3f652270-1b32-4f0b-8158-92623bd06578}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RootNameSpace>NMaven.Service</RootNameSpace>
     <AssemblyName>NMaven.Service.Embedder</AssemblyName>
     <BaseIntermediateOutputPath>..\..\..\target\obj\</BaseIntermediateOutputPath>
-    <OutputType>Exe</OutputType>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  <PropertyGroup>
     <OutputPath>..\..\..\target\bin\Debug\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework" />
     <Reference Include="System.Xml" />
-    <Reference Include="System.Web.Services" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.Workflow.ComponentModel" />
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="NMaven\Service\MavenEmbedder.cs" />
-    <Compile Include="NMaven\Service\MavenEmbedderClient.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="NMaven" />
     <Folder Include="NMaven\Service" />
+    <Folder Include="NMaven\Service\Embedder" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="NMaven\Service\Embedder\MavenEmbedder.cs" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.VisualStudio.Addin/pom.xml Mon May  7 16:55:03 2007
@@ -25,10 +25,9 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>NMaven.VisualStudio</groupId>
   <artifactId>NMaven.VisualStudio.Addin</artifactId>
-  <packaging>addin</packaging>
+  <packaging>visual-studio-addin</packaging>
   <version>0.14</version>
   <name>NMaven.VisualStudio.Addin</name>
-
   <dependencies>
     <dependency>
       <groupId>NMaven.IDE</groupId>
@@ -55,6 +54,13 @@
       <type>library</type>
     </dependency>
     <dependency>
+      <groupId>NMaven.Service</groupId>
+      <artifactId>NMaven.Service.Embedder</artifactId>
+      <version>0.14</version>
+      <type>library</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
       <groupId>Microsoft.VisualStudio.CommandBars</groupId>
       <artifactId>Microsoft.VisualStudio.CommandBars</artifactId>
       <version>8.0.0.0__b03f5f7f11d50a3a</version>
@@ -79,4 +85,28 @@
       <version>7.0.3300.0__b03f5f7f11d50a3a</version>
     </dependency>
   </dependencies>
+  <profiles>
+    <profile>
+      <activation>
+        <property>
+          <name>startVS</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>NMaven.Plugin</groupId>
+            <artifactId>NMaven.Plugin.Devenv.JavaBinding</artifactId>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>start</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>

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=536025&r1=536024&r2=536025
==============================================================================
--- 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 Mon May  7 16:55:03 2007
@@ -3,6 +3,7 @@
 using EnvDTE80;
 
 using System;
+using System.IO;
 using System.Resources;
 using System.Reflection;
 using System.Globalization;
@@ -81,7 +82,7 @@
                 try
                 {
                     //Add a command to the Commands collection:
-                    Command command = commands.AddNamedCommand2(_addInInstance, "IDEAddin", "IDEAddin", "Executes the command for IDEAddin", true, 59, ref contextGUIDS, (int)vsCommandStatus.vsCommandStatusSupported + (int)vsCommandStatus.vsCommandStatusEnabled, (int)vsCommandStyle.vsCommandStylePictAndText, vsCommandControlType.vsCommandControlTypeButton);
+                    Command command = commands.AddNamedCommand2(_addInInstance, "NMavenAddin", "NMavenAddin", "Executes the command for NMavenAddin", true, 59, ref contextGUIDS, (int)vsCommandStatus.vsCommandStatusSupported + (int)vsCommandStatus.vsCommandStatusEnabled, (int)vsCommandStyle.vsCommandStylePictAndText, vsCommandControlType.vsCommandControlTypeButton);
 
                     //Add a control for the command to the tools menu:
                     if ((command != null) && (toolsPopup != null))
@@ -101,14 +102,14 @@
             {
                 Window win = _applicationObject.Windows.Item(EnvDTE.Constants.vsWindowKindOutput);
                 OutputWindow outputWindow = (OutputWindow)win.Object;
-                outputWindowPane = outputWindow.OutputWindowPanes.Add("NMaven Addin");
+                outputWindowPane = outputWindow.OutputWindowPanes.Add("NMaven Addin Test");
 
                 OutputWindowPaneHandler handler = new OutputWindowPaneHandler();
                 handler.SetOutputWindowPaneHandler(outputWindowPane);
 
                 logger = Logger.GetLogger("UC");
                 logger.AddHandler(handler);
-                logger.Log(Level.INFO, "NMaven Addin");
+                logger.Log(Level.INFO, "NMaven Addin Test");
                 MavenBuildControl mavenBuildControl = new MavenBuildControl();
                 object programmableObject = null;
 
@@ -118,9 +119,10 @@
                 _windowToolWindow = windows2.CreateToolWindow2(_addInInstance, asm.Location, "NMaven.IDE.Controls.MavenBuildControl", "Maven Build Tool", guidstr, ref programmableObject);
 
                 _windowToolWindow.Visible = true;
-
+                _applicationObject = (DTE2)application;
+                FileInfo fileInfo = new FileInfo(_applicationObject.Solution.FullName);               
                 mavenBuildControl = (MavenBuildControl)_windowToolWindow.Object;
-                mavenBuildControl.Init(logger, 9099, new Size(400, 400));
+                mavenBuildControl.Init(fileInfo.Directory, logger, 9099, new Size(400, 400));
                 mavenBuildControl.ClearOutputWindow += new EventHandler(ClearOutputWindowPane);
                 mavenBuildControl.FocusOutputWindow += new EventHandler(ActivateOutputWindowPane);
             }

Modified: incubator/nmaven/branches/SI_XPT/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/pom.xml?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/pom.xml Mon May  7 16:55:03 2007
@@ -133,10 +133,12 @@
     </developer>
   </developers>
   <modules>
+    <module>NMaven.Artifact</module>
     <module>NMaven.Core</module>
     <module>NMaven.IDE</module>
     <module>NMaven.Logging</module>
     <module>NMaven.Model/Pom</module>
+    <module>NMaven.Model/AutomationExtensibility</module>
     <module>NMaven.Plugin</module>
     <module>NMaven.Plugin.Loader</module>
     <module>NMaven.Plugin.MojoGenerator</module>
@@ -154,4 +156,17 @@
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <activation>
+        <property>
+          <name>VisualStudio2005</name>
+        </property>
+      </activation>
+      <modules>
+        <module>NMaven.VisualStudio</module>
+        <module>NMaven.VisualStudio.Addin</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>

Modified: incubator/nmaven/branches/SI_XPT/bootstrap-build.bat
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/bootstrap-build.bat?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/bootstrap-build.bat (original)
+++ incubator/nmaven/branches/SI_XPT/bootstrap-build.bat Mon May  7 16:55:03 2007
@@ -1,16 +1,18 @@
 @echo off
-call mvn -f ./components/pom.xml install
-call mvn -f ./plugins/pom.xml install
+call mvn install
+call mvn -f ./plugins/NMaven.Plugin.Addin/pom-java.xml install
+call mvn -f ./plugins/NMaven.Plugin.Devenv/pom-java.xml install
+call mvn -f ./plugins/NMaven.Plugin.Settings/pom-java.xml install
+call mvn -f ./plugins/NMaven.Plugin.Solution/pom-java.xml install
 call mvn org.apache.maven.dotnet.plugins:maven-install-plugin:install-file -Dfile=./thirdparty/NUnit/NUnit.Framework.dll -DgroupId=NUnit -DartifactId=NUnit.Framework -Dpackaging=dll -Dversion=2.2.8.0
-if "%1" == "-DM_2_2" (
-    call mvn -f ./assemblies/pom-M_2_2.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MICROSOFT -DframeworkVersion=2.0.50727 install %*
- ) else if "%1" == "-DG_x_x" (
-    call mvn -f ./assemblies/pom-G_x_x.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=DotGNU install %*
- ) else  if "%1" == "-DN_x_2" (
+if "%1" == "-DMicrosoft" (
+    call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MICROSOFT -DframeworkVersion=2.0.50727 install %*
+    call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MICROSOFT -DframeworkVersion=2.0.50727 install %*
+ ) else  if "%1" == "-DMono" (
     call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MONO -DframeworkVersion=2.0.50727 install %*
- ) else  if "%1" == "-DALL" (
-    call bootstrap-cross-platform
+    call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap -Dvendor=MONO -DframeworkVersion=2.0.50727 install %*
  ) else (
     call mvn -f ./assemblies/pom.xml -Dmaven.test.skip=true -Dbootstrap install %*
+    call mvn -f ./plugins/pom-netplugins.xml -Dmaven.test.skip=true -Dbootstrap -DframeworkVersion=2.0.50727 install %*
  )
 rem call mvn org.apache.maven.dotnet.plugins:maven-solution-plugin:solution

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/pom.xml?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/pom.xml Mon May  7 16:55:03 2007
@@ -29,7 +29,7 @@
   <version>0.14-SNAPSHOT</version>
   <name>dotnet-artifact</name>
   <description>
-    Maven Plugin for .NET
+   
   </description>
   <dependencies>
     <dependency>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java Mon May  7 16:55:03 2007
@@ -67,7 +67,8 @@
      * @param artifactFile the artifact to install
      * @throws ArtifactInstallationException if there is a problem installing the artifact
      */
-    void installFile( String groupId, String artifactId, String version, String packaging, File artifactFile )
+    void installFileWithGeneratedPom( String groupId, String artifactId, String version, String packaging,
+                                      File artifactFile )
         throws ArtifactInstallationException;
 
     /**

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java Mon May  7 16:55:03 2007
@@ -193,6 +193,7 @@
 
         Set depSet = new HashSet();
         List<Dependency> dep = project.getDependencies();
+
         for ( Dependency dependency : dep )
         {
             String scope = ( dependency.getScope() == null ) ? Artifact.SCOPE_COMPILE : dependency.getScope();

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java Mon May  7 16:55:03 2007
@@ -196,9 +196,10 @@
     }
 
     /**
-     * @see org.apache.maven.dotnet.artifact.ArtifactInstaller#installFile(String, String, String, String, java.io.File)
+     * @see org.apache.maven.dotnet.artifact.ArtifactInstaller#installFileWithGeneratedPom(String, String, String, String, java.io.File)
      */
-    public void installFile( String groupId, String artifactId, String version, String packaging, File artifactFile )
+    public void installFileWithGeneratedPom( String groupId, String artifactId, String version, String packaging,
+                                             File artifactFile )
         throws ArtifactInstallationException
     {
         Artifact artifact =

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java Mon May  7 16:55:03 2007
@@ -28,6 +28,7 @@
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
@@ -104,6 +105,7 @@
 
         Set<Artifact> artifactDependencies = new HashSet<Artifact>();
         Set<Artifact> gacDependencies = new HashSet<Artifact>();
+        ArtifactFilter gacFilter = new GacFilter();
         for ( Dependency dependency : dependencies )
         {
             String scope = ( dependency.getScope() == null ) ? Artifact.SCOPE_COMPILE : dependency.getScope();
@@ -115,10 +117,12 @@
                                                                           dependency.getClassifier(), scope, null );
             if ( artifact.getType().startsWith( "gac" ) )
             {
+                logger.debug( "NMAVEN-000-000: GAC Dependency = " + artifact.getType() + ", ID = " + artifact.getArtifactId() );
                 gacDependencies.add( artifact );
             }
             else
             {
+                logger.debug( "NMAVEN-000-000: Dependency = " + artifact.getType() + ", ID = " + artifact.getArtifactId() );
                 artifactDependencies.add( artifact );
             }
         }
@@ -138,13 +142,22 @@
             newArtifactRepositories.add( repo );
         }
         ArtifactResolutionResult result = resolver.resolveTransitively( artifactDependencies, sourceArtifact,
-                                                                        newArtifactRepositories,
-                                                                        localArtifactRepository, metadata );
+                                                                        localArtifactRepository,
+                                                                        newArtifactRepositories, metadata, gacFilter );
         if ( addResolvedDependenciesToProject )
         {
             Set<Artifact> resolvedDependencies = result.getArtifacts();
             resolvedDependencies.addAll( gacDependencies );
             project.setDependencyArtifacts( resolvedDependencies );
+        }
+    }
+
+    private static class GacFilter
+        implements ArtifactFilter
+    {
+        public boolean include( org.apache.maven.artifact.Artifact artifact )
+        {
+            return !artifact.getType().startsWith( "gac" );
         }
     }
 }

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/test/java/org/apache/maven/dotnet/assembler/impl/DefaultAssemblyInfoUnmarshallerTest.java Mon May  7 16:55:03 2007
@@ -19,7 +19,7 @@
         try
         {
             fis = new FileInputStream(
-                basedir + "/src/test/resources/AssemblyInfo.cs" );
+                "src/test/resources/AssemblyInfo.cs" );
         }
         catch ( FileNotFoundException e )
         {

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml Mon May  7 16:55:03 2007
@@ -18,12 +18,20 @@
     <version>0.14</version>
     <type>netplugin</type>
   </netDependency>
+  <netDependency>
+    <groupId>NMaven.Plugin</groupId>
+    <artifactId>NMaven.Plugin.Devenv</artifactId>
+    <version>0.14</version>
+    <type>netplugin</type>
+  </netDependency>
+  <!--
    <netDependency>
     <groupId>NMaven.VisualStudio</groupId>
     <artifactId>NMaven.VisualStudio.Addin</artifactId>
     <version>0.14</version>
     <type>addin</type>
   </netDependency>
+  -->
    <netDependency>
     <groupId>NMaven.Plugin</groupId>
     <artifactId>NMaven.Plugin.Addin</artifactId>
@@ -62,13 +70,4 @@
     <version>0.14</version>
     <type>exe</type>
   </netDependency>
-<!--
-  <netDependency>
-    <id>RubyCompiler</id>
-    <groupId>QUT.RubyCompiler</groupId>
-    <artifactId>RubyCompiler</artifactId>
-    <version>1.0.0</version>
-    <type>exe</type>
-  </netDependency>
-  -->
 </netDependencies>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/pom.xml?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/pom.xml Mon May  7 16:55:03 2007
@@ -47,5 +47,10 @@
       <artifactId>xfire-java5</artifactId>
       <version>1.2.5</version>
     </dependency>
+    <dependency>
+      <groupId>org.mortbay.jetty</groupId>
+      <artifactId>jetty</artifactId>
+      <version>6.1.3</version>
+    </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

Added: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/EmbedderException.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/EmbedderException.java?view=auto&rev=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/EmbedderException.java (added)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/EmbedderException.java Mon May  7 16:55:03 2007
@@ -0,0 +1,26 @@
+package org.apache.maven.dotnet.embedder;
+
+public class EmbedderException extends Exception
+{
+    static final long serialVersionUID = -67348843971270983L;
+
+    public EmbedderException()
+    {
+        super();
+    }
+
+    public EmbedderException( String message )
+    {
+        super( message );
+    }
+
+    public EmbedderException( String message, Throwable cause )
+    {
+        super( message, cause );
+    }
+
+    public EmbedderException( Throwable cause )
+    {
+        super( cause );
+    }
+}

Propchange: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/EmbedderException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java?view=diff&rev=536025&r1=536024&r2=536025
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-embedder/src/main/java/org/apache/maven/dotnet/embedder/MavenEmbedderService.java Mon May  7 16:55:03 2007
@@ -47,7 +47,7 @@
      * @param basedir the base directory from which to look for pom files
      * @return a set of maven projects that exist under (recursive) the base directory
      */
-    Set<MavenProject> getMavenProjectsFor( String basedir );
+    Set<MavenProject> getMavenProjectsFor( String basedir ) throws EmbedderException;
 
     /**
      * Returns a set of .NET artifacts that exist within the local maven repository. To be part of the returned set, the following



Mime
View raw message