incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r540305 - in /incubator/nmaven/trunk: ./ archetypes/maven-archetype-dotnet-simple/ archetypes/maven-archetype-netexecutable/ archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/ assemblies/ assemblies/NMaven.Arti...
Date Mon, 21 May 2007 21:23:31 GMT
Author: sisbell
Date: Mon May 21 14:23:30 2007
New Revision: 540305

URL: http://svn.apache.org/viewvc?view=rev&rev=540305
Log:
Clean solution files. Updated docs, support for FXCop plugin.

Modified:
    incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml
    incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml
    incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/pom.xml
    incubator/nmaven/trunk/assemblies/NMaven.Artifact/NMaven.Artifact.sln
    incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj
    incubator/nmaven/trunk/assemblies/NMaven.IDE/NMaven.IDE.sln
    incubator/nmaven/trunk/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj
    incubator/nmaven/trunk/assemblies/NMaven.Logging/NMaven.Logging.sln
    incubator/nmaven/trunk/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj
    incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/NMaven.Plugin.MojoGenerator.sln
    incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven.Plugin.MojoGenerator.csproj
    incubator/nmaven/trunk/assemblies/NMaven.Plugin/NMaven.Plugin.sln
    incubator/nmaven/trunk/assemblies/NMaven.Plugin/src/main/csharp/NMaven.Plugin.csproj
    incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven.Service.Embedder.csproj
    incubator/nmaven/trunk/assemblies/README.txt
    incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml
    incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CommandExecutor.java
    incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/CompilerContext.java
    incubator/nmaven/trunk/maven-dotnet.iml
    incubator/nmaven/trunk/plugins/pom.xml
    incubator/nmaven/trunk/site/src/site/apt/adding-executables.apt

Modified: incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml (original)
+++ incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml Mon May 21 14:23:30
2007
@@ -9,6 +9,7 @@
   <groupId>org.apache.maven.dotnet</groupId>
   <artifactId>maven-archetype-dotnet-simple</artifactId>
   <version>0.14-SNAPSHOT</version>
+  <packaging>maven-plugin</packaging>  
   <name>Archetype - maven-archetype-dotnet-simple</name>
   <url>http://maven.apache.org</url>
 </project>

Modified: incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml (original)
+++ incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml Mon May 21 14:23:30
2007
@@ -9,6 +9,7 @@
   <groupId>org.apache.maven.dotnet</groupId>
   <artifactId>maven-archetype-netexecutable</artifactId>
   <version>0.14-SNAPSHOT</version>
+  <packaging>maven-plugin</packaging>  
   <name>Archetype - maven-archetype-netexecutable</name>
   <url>http://maven.apache.org</url>
 </project>

Modified: incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/pom.xml?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/pom.xml
(original)
+++ incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/pom.xml
Mon May 21 14:23:30 2007
@@ -4,6 +4,7 @@
   <groupId>${groupId}</groupId>
   <artifactId>${artifactId}</artifactId>
   <version>${version}</version>
+  <packaging>maven-plugin</packaging>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>

Modified: incubator/nmaven/trunk/assemblies/NMaven.Artifact/NMaven.Artifact.sln
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Artifact/NMaven.Artifact.sln?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Artifact/NMaven.Artifact.sln (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Artifact/NMaven.Artifact.sln Mon May 21 14:23:30
2007
@@ -1,17 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Artifact", "C:\Documents and
Settings\shane\nmaven-apache\SI_XPT\assemblies\NMaven.Artifact\src\main\csharp\NMaven.Artifact.csproj",
"{4A98C259-4EDA-46B1-B2A5-C6AD0B47D7B3}"
+# SharpDevelop 2.1.0.2376
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Artifact", "C:\Documents and
Settings\shane\nmaven-apache\trunk-new\assemblies\NMaven.Artifact\src\main\csharp\NMaven.Artifact.csproj",
"{b9da05df-af58-4063-8d51-b1bf17966e59}"
 EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4A98C259-4EDA-46B1-B2A5-C6AD0B47D7B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A98C259-4EDA-46B1-B2A5-C6AD0B47D7B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Modified: incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj
(original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj
Mon May 21 14:23:30 2007
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{4A98C259-4EDA-46B1-B2A5-C6AD0B47D7B3}</ProjectGuid>
+    <ProjectGuid>{b9da05df-af58-4063-8d51-b1bf17966e59}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RootNameSpace>NMaven.Artifact</RootNameSpace>
     <AssemblyName>NMaven.Artifact</AssemblyName>
@@ -11,13 +11,13 @@
     <OutputPath>..\..\..\target\bin\Debug\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="NMaven.Model.Pom, Version=0.14.0.0, Culture=neutral, PublicKeyToken=4b435f4d76e2f0e6,
processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\.m2\repository\NMaven\Model\NMaven.Model.Pom\0.14\NMaven.Model.Pom.dll</HintPath>
-    </Reference>
+    <Reference Include="NMaven.Model.Pom" />
     <Reference Include="System" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="NMaven" />
+    <Folder Include="NMaven\Artifact" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="NMaven\Artifact\Artifact.cs" />

Modified: incubator/nmaven/trunk/assemblies/NMaven.IDE/NMaven.IDE.sln
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.IDE/NMaven.IDE.sln?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.IDE/NMaven.IDE.sln (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.IDE/NMaven.IDE.sln Mon May 21 14:23:30 2007
@@ -1,17 +1,6 @@
 
 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}"
+# SharpDevelop 2.1.0.2376
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.IDE", "C:\Documents and Settings\shane\nmaven-apache\trunk-new\assemblies\NMaven.IDE\src\main\csharp\NMaven.IDE.csproj",
"{adbd588e-e9bc-41fd-bc30-e9ee7ba1dd5b}"
 EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{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/trunk/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj Mon May
21 14:23:30 2007
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{B18F99C3-157F-431F-B10B-76162AB08C83}</ProjectGuid>
+    <ProjectGuid>{adbd588e-e9bc-41fd-bc30-e9ee7ba1dd5b}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RootNameSpace>NMaven.IDE</RootNameSpace>
     <AssemblyName>NMaven.IDE</AssemblyName>
@@ -11,12 +11,11 @@
     <OutputPath>..\..\..\target\bin\Debug\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
/>
     <Reference Include="NMaven.Logging">
-      <HintPath>C:\Documents and Settings\shane\.m2\repository\NMaven\Logging\NMaven.Logging\0.14\NMaven.Logging.dll</HintPath>
+      <HintPath>C:\Documents and Settings\shane\.m2\repository\NMaven\Logging\NMaven.Logging\0.14-SNAPSHOT\NMaven.Logging.dll</HintPath>
     </Reference>
     <Reference Include="NMaven.Service.Embedder">
-      <HintPath>C:\Documents and Settings\shane\.m2\repository\NMaven\Service\NMaven.Service.Embedder\0.14\NMaven.Service.Embedder.dll</HintPath>
+      <HintPath>C:\Documents and Settings\shane\.m2\repository\NMaven\Service\NMaven.Service.Embedder\0.14-SNAPSHOT\NMaven.Service.Embedder.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -24,17 +23,21 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="NMaven" />
+    <Folder Include="NMaven\IDE" />
+    <Folder Include="NMaven\IDE\Commands" />
+    <Folder Include="NMaven\IDE\Controls" />
+    <Folder Include="NMaven\IDE\Impl" />
+    <Folder Include="NMaven\IDE\View" />
+  </ItemGroup>
+  <ItemGroup>
     <Compile Include="NMaven\IDE\Commands\BuildCommand.cs" />
-    <Compile Include="NMaven\IDE\Controls\MavenBuildControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
+    <Compile Include="NMaven\IDE\Controls\MavenBuildControl.cs" />
     <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\View\MainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="NMaven\IDE\View\MainForm.cs" />
     <Compile Include="NMaven\IDE\View\MainForm.Designer.cs" />
   </ItemGroup>
   <ItemGroup />

Modified: incubator/nmaven/trunk/assemblies/NMaven.Logging/NMaven.Logging.sln
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Logging/NMaven.Logging.sln?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Logging/NMaven.Logging.sln (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Logging/NMaven.Logging.sln Mon May 21 14:23:30
2007
@@ -2,5 +2,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 # SharpDevelop 2.1.0.2376
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Logging", "C:\Documents and Settings\shane\nmaven-apache\SI_XPT\assemblies\NMaven.Logging\src\main\csharp\NMaven.Logging.csproj",
"{23518384-4dea-4794-bfab-dfa89f4c42c0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Logging", "C:\Documents and Settings\shane\nmaven-apache\trunk-new\assemblies\NMaven.Logging\src\main\csharp\NMaven.Logging.csproj",
"{dacc064f-ab41-42e3-b011-b346dc53bf47}"
 EndProject

Modified: incubator/nmaven/trunk/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj
(original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj
Mon May 21 14:23:30 2007
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{36FCE4F7-53D7-48AC-9AF4-74CB0F6020F6}</ProjectGuid>
+    <ProjectGuid>{dacc064f-ab41-42e3-b011-b346dc53bf47}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RootNameSpace>NMaven.Logging</RootNameSpace>
     <AssemblyName>NMaven.Logging</AssemblyName>
@@ -13,6 +13,10 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="NMaven" />
+    <Folder Include="NMaven\Logging" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="NMaven\Logging\ConsoleHandler.cs" />

Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/NMaven.Plugin.MojoGenerator.sln
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/NMaven.Plugin.MojoGenerator.sln?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/NMaven.Plugin.MojoGenerator.sln
(original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/NMaven.Plugin.MojoGenerator.sln
Mon May 21 14:23:30 2007
@@ -2,5 +2,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 # SharpDevelop 2.1.0.2376
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.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}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Plugin.MojoGenerator", "C:\Documents
and Settings\shane\nmaven-apache\trunk-new\assemblies\NMaven.Plugin.MojoGenerator\src\main\csharp\NMaven.Plugin.MojoGenerator.csproj",
"{93484dfe-e867-42b2-b7ac-4aff7a12f65c}"
 EndProject

Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven.Plugin.MojoGenerator.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven.Plugin.MojoGenerator.csproj?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven.Plugin.MojoGenerator.csproj
(original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven.Plugin.MojoGenerator.csproj
Mon May 21 14:23:30 2007
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{D0402300-C624-4E82-9861-3C19A04C0568}</ProjectGuid>
+    <ProjectGuid>{93484dfe-e867-42b2-b7ac-4aff7a12f65c}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RootNameSpace>NMaven.Plugin</RootNameSpace>
     <AssemblyName>NMaven.Plugin.MojoGenerator</AssemblyName>
@@ -17,6 +17,11 @@
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="NMaven" />
+    <Folder Include="NMaven\Plugin" />
+    <Folder Include="NMaven\Plugin\MojoGenerator" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="NMaven\Plugin\MojoGenerator\Generator.cs" />

Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin/NMaven.Plugin.sln
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin/NMaven.Plugin.sln?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin/NMaven.Plugin.sln (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin/NMaven.Plugin.sln Mon May 21 14:23:30
2007
@@ -2,5 +2,5 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 # SharpDevelop 2.1.0.2376
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Plugin", "C:\Documents and Settings\shane\nmaven-apache\SI_XPT\assemblies\NMaven.Plugin\src\main\csharp\NMaven.Plugin.csproj",
"{98f968ea-3204-487f-8ae7-7d2dbfbcb165}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Plugin", "C:\Documents and Settings\shane\nmaven-apache\trunk-new\assemblies\NMaven.Plugin\src\main\csharp\NMaven.Plugin.csproj",
"{d7fc7c76-a5fc-4e0d-9a34-9525ed53654c}"
 EndProject

Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin/src/main/csharp/NMaven.Plugin.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin/src/main/csharp/NMaven.Plugin.csproj?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin/src/main/csharp/NMaven.Plugin.csproj (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin/src/main/csharp/NMaven.Plugin.csproj Mon
May 21 14:23:30 2007
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{DB7FF79A-7761-4797-8477-14480ADC0C3D}</ProjectGuid>
+    <ProjectGuid>{d7fc7c76-a5fc-4e0d-9a34-9525ed53654c}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RootNameSpace>NMaven.Plugin</RootNameSpace>
     <AssemblyName>NMaven.Plugin</AssemblyName>
@@ -16,6 +16,13 @@
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml" />
+  </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" />

Modified: incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven.Service.Embedder.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven.Service.Embedder.csproj?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven.Service.Embedder.csproj
(original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/src/main/csharp/NMaven.Service.Embedder.csproj
Mon May 21 14:23:30 2007
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{FD65FE0D-A9F2-4AD7-91C6-E94BE90A7E0F}</ProjectGuid>
+    <ProjectGuid>{65de94ba-7bd5-47bb-8b0a-4bb5b699c464}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RootNameSpace>NMaven.Service</RootNameSpace>
     <AssemblyName>NMaven.Service.Embedder</AssemblyName>
@@ -12,6 +12,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="NMaven" />
+    <Folder Include="NMaven\Service" />
+    <Folder Include="NMaven\Service\Embedder" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="NMaven\Service\Embedder\MavenEmbedder.cs" />

Modified: incubator/nmaven/trunk/assemblies/README.txt
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/README.txt?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/assemblies/README.txt (original)
+++ incubator/nmaven/trunk/assemblies/README.txt Mon May 21 14:23:30 2007
@@ -1,7 +1,4 @@
 Not using the profiles within the pom, since pom profile support for more than one profile
is buggy.
 
 TODO: Submit JIRA and test cases:  1) two profiles using only names causes NPE, 2) two profiles
using name-value pairs will not
-allow execution of first profile.
-
-pom-M_2_2 builds the IDE assemblies for a Microsoft 2.0 build
-pom-G_x_x builds the settings assembly for a DotGNU build
\ No newline at end of file
+allow execution of first profile.
\ No newline at end of file

Modified: incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml
(original)
+++ incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml
Mon May 21 14:23:30 2007
@@ -1,5 +1,20 @@
 <executablePlugins>
   <executablePlugin>
+    <identifier>fxcop</identifier>
+    <pluginClass>org.apache.maven.dotnet.executable.impl.DefaultNetExecutable</pluginClass>
+    <vendor>MICROSOFT</vendor>
+    <executable>FxCopCmd</executable>
+    <profile>DEFAULT</profile>
+    <frameworkVersions>
+      <frameworkVersion>2.0.50727</frameworkVersion>
+    </frameworkVersions>
+    <platforms>
+      <platform>
+        <operatingSystem>Windows</operatingSystem>
+      </platform>
+    </platforms>
+  </executablePlugin>
+  <executablePlugin>
     <identifier>dotnet-jetty</identifier>
     <pluginClass>org.apache.maven.dotnet.executable.impl.ThreadedNetExecutable</pluginClass>
     <vendor>MICROSOFT</vendor>

Modified: incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CommandExecutor.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CommandExecutor.java?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CommandExecutor.java
(original)
+++ incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/CommandExecutor.java
Mon May 21 14:23:30 2007
@@ -23,6 +23,8 @@
 
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.io.File;
 
 /**
@@ -171,16 +173,10 @@
                     }
                     stdOut = new StreamConsumerImpl();
                     stdErr = new ErrorStreamConsumer();
-                    String[] c = new String[commands.size()];
-                    int j = 0;
-                    for ( String command : commands )
-                    {
-                        c[j++] = command;
-                    }
 
                     Commandline commandline = new Commandline();
                     commandline.setExecutable( executable );
-                    commandline.addArguments( c );
+                    commandline.addArguments( commands.toArray( new String[commands.size()]));
                     if ( workingDirectory != null && workingDirectory.exists() )
                     {
                         commandline.setWorkingDirectory( workingDirectory.getAbsolutePath()
);

Modified: incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/CompilerContext.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/CompilerContext.java?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/CompilerContext.java
(original)
+++ incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/CompilerContext.java
Mon May 21 14:23:30 2007
@@ -24,8 +24,6 @@
 import java.util.List;
 import java.io.File;
 
-import org.apache.maven.dotnet.executable.compiler.CompilerCapability;
-import org.apache.maven.dotnet.executable.compiler.CompilerConfig;
 import org.apache.maven.dotnet.executable.*;
 import org.apache.maven.dotnet.NMavenContext;
 import org.apache.maven.dotnet.PlatformUnsupportedException;

Modified: incubator/nmaven/trunk/maven-dotnet.iml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/maven-dotnet.iml?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/maven-dotnet.iml (original)
+++ incubator/nmaven/trunk/maven-dotnet.iml Mon May 21 14:23:30 2007
@@ -65,6 +65,7 @@
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-compile-plugin/src/main/resources"
isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-deploy-plugin/src/main/java"
isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-embedder-plugin/src/main/java"
isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/maven-fxcop-plugin/src/main/java"
isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-install-plugin/src/main/java"
isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-link-plugin/src/main/java"
isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-mojo-generator-plugin/src/main/java"
isTestSource="false" />

Modified: incubator/nmaven/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/pom.xml?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/plugins/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/pom.xml Mon May 21 14:23:30 2007
@@ -42,6 +42,7 @@
     <module>maven-xsp-plugin</module>
     <module>maven-wsdl-plugin</module> 
     <module>maven-deploy-plugin</module>
+    <module>maven-fxcop-plugin</module>
   </modules>
   <dependencies>
     <dependency>
@@ -115,4 +116,4 @@
       -->
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file

Modified: incubator/nmaven/trunk/site/src/site/apt/adding-executables.apt
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/site/src/site/apt/adding-executables.apt?view=diff&rev=540305&r1=540304&r2=540305
==============================================================================
--- incubator/nmaven/trunk/site/src/site/apt/adding-executables.apt (original)
+++ incubator/nmaven/trunk/site/src/site/apt/adding-executables.apt Mon May 21 14:23:30 2007
@@ -88,18 +88,17 @@
 
  To create an executable plugin that exists in a predetermined place, do the following:
 
- [[1]] Create your module directory
-
- [[2]] From the root of your module directory, type:
+ [[1]] From the root of your project directory, type:
 
 +----+
-mvn archetype:create
-  -DgroupId=[your project's group id]
-  -DartifactId=[your project's artifact id]
-  -DarchetypeArtifactId=maven-archetype-netexecutable
+ mvn archetype:create -DgroupId=<<myGroupid>>                               \
+                      -DartifactId=<<myArtifactId>>                         \
+                      -DarchetypeArtifactId=maven-archetype-netexecutable   \
+                      -DarchetypeGroupId=org.apache.maven.dotnet            \
+                      -DarchetypeVersion=0.14-SNAPSHOT
 +----+
 
- [[3]] Make sure to add an entry in the net-executables.xml file, located within the dotnet-core
module. Replace each
+ [[2]] Make sure to add an entry in the net-executables.xml file, located within the dotnet-core
module. Replace each
   param: ${vendor}, ${exe}, .. with the appropriate values.
 
 +----+
@@ -121,14 +120,14 @@
   </executablePlugin>
 +----+
 
- [[4]]  Add profile <<ADD_PROFILE>> to the meta-data of the profile field of
this class. This profile name should match
+ [[3]]  Add profile <<ADD_PROFILE>> to the meta-data of the profile field of
this class. This profile name should match
   the ${profile} within the net-executables.xml.
 
- [[5]] Add any special commands to the getCommands method.
+ [[4]] Add any special commands to the getCommands method.
 
- [[6]]  Recompile the dotnet-core component.
+ [[5]]  Recompile the dotnet-core component.
 
- [[7]]  Rename this class and install this Mojo component.
+ [[6]]  Rename this class and install this Mojo component.
 
 +----+
 public class NetExecutableMojo



Mime
View raw message