incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r533295 - in /incubator/nmaven/branches/SI_XPT: ./ assemblies/ assemblies/NMaven.Core/src/main/csharp/Core/Impl/ assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/View/ assemblies/NMaven.Plugin.Loader/NMaven.Plugin.Loader/ assemblies/NMaven....
Date Sat, 28 Apr 2007 05:20:34 GMT
Author: sisbell
Date: Fri Apr 27 22:20:32 2007
New Revision: 533295

URL: http://svn.apache.org/viewvc?view=rev&rev=533295
Log:
Added partial support for generating Java Mojo classes based on .NET classes.

Added:
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/NMaven.Plugin.MojoGenerator.sln
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/pom.xml   (with props)
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven.Plugin.MojoGenerator.csproj
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven/Plugin/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven/Plugin/MojoGenerator/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven/Plugin/MojoGenerator/Generator.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaClass.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaClassUnmarshaller.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaField.cs
Removed:
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/NMaven.Plugin.Loader/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/resources/
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/test/
Modified:
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.IDE/src/main/csharp/NMaven/IDE/View/MainForm.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs
    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.Plugin/src/main/csharp/NMaven/Plugin/AbstractMojo.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/ClassAttribute.cs
    incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/FieldInjectorRepository.cs
    incubator/nmaven/branches/SI_XPT/assemblies/pom.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
    incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/AbstractMojo.java
    incubator/nmaven/branches/SI_XPT/maven-dotnet.iml
    incubator/nmaven/branches/SI_XPT/net-plugins/NMaven.Plugin.Solution/src/main/csharp/NMaven.Plugin.Solution.csproj
    incubator/nmaven/branches/SI_XPT/net-plugins/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionMojo.cs
    incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
    incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java
    incubator/nmaven/branches/SI_XPT/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/solution/SolutionMojo.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/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=533295&r1=533294&r2=533295
==============================================================================
--- 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 Fri Apr 27 22:20:32 2007
@@ -132,7 +132,7 @@
 		                                       string baseIntermediateOutputPath,
 		                                       List<IProjectReference> projectReferences)
 		{
-			if(model == null || sourceFileDirectory == null || projectGuid == null)
+			if(model == null || sourceFileDirectory == null)
 			{
 				throw new ExecutionException("NMAVEN-000-000: Missing required parameter.");
 			}

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=533295&r1=533294&r2=533295
==============================================================================
--- 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 Fri Apr 27 22:20:32 2007
@@ -40,8 +40,8 @@
 			mavenBuildControl.Size = size;
 			mavenBuildControl.Init(logger, 9099, size);
 			this.Controls.Add(mavenBuildControl);	
-			MavenDependencyUserControl mpuc = new MavenDependencyUserControl();
-			this.Controls.Add(mpuc);
+			//MavenDependencyUserControl mpuc = new MavenDependencyUserControl();
+			//this.Controls.Add(mpuc);
 		}
 	}
 }

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/PluginLoader.cs Fri Apr 27 22:20:32 2007
@@ -69,7 +69,7 @@
             ObjectHandle objectHandle = 
             	applicationDomain.CreateInstanceFrom(pluginAssemblyFile.FullName, mojoName);
 			AbstractMojo abstractMojo = (AbstractMojo) objectHandle.Unwrap();
-			abstractMojo.injectFields(paramFile.FullName);
+			abstractMojo.InjectFields(paramFile.FullName);
 			return abstractMojo;		
 		}
 		

Added: 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=auto&rev=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/NMaven.Plugin.MojoGenerator.sln (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/NMaven.Plugin.MojoGenerator.sln Fri Apr 27 22:20:32 2007
@@ -0,0 +1,16 @@
+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}"
+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

Added: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/pom.xml?view=auto&rev=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/pom.xml (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/pom.xml Fri Apr 27 22:20:32 2007
@@ -0,0 +1,39 @@
+<?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>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>NMaven.Plugin</groupId>
+  <artifactId>NMaven.Plugin.MojoGenerator</artifactId>
+  <packaging>exe</packaging>
+  <version>0.14</version>
+  <name>NMaven.Plugin.MojoGenerator</name>
+  <dependencies>
+    <dependency>
+      <groupId>NMaven.Plugin</groupId>
+      <artifactId>NMaven.Plugin</artifactId>
+      <type>library</type>
+      <version>0.14</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

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

Added: 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=auto&rev=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven.Plugin.MojoGenerator.csproj (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven.Plugin.MojoGenerator.csproj Fri Apr 27 22:20:32 2007
@@ -0,0 +1,31 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{e5da8638-1152-4730-a6f8-d3c2932d2a89}</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="NMaven.Plugin" />
+    <Reference Include="NMaven.Plugin" />
+    <Reference Include="NUnit.Framework" />
+    <Reference Include="System" />
+    <Reference Include="System.Runtime.Remoting" />
+    <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" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
+</Project>
\ No newline at end of file

Added: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven/Plugin/MojoGenerator/Generator.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven/Plugin/MojoGenerator/Generator.cs?view=auto&rev=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven/Plugin/MojoGenerator/Generator.cs (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.MojoGenerator/src/main/csharp/NMaven/Plugin/MojoGenerator/Generator.cs Fri Apr 27 22:20:32 2007
@@ -0,0 +1,112 @@
+#region Apache License, Version 2.0 
+//
+// 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.
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+using System.Runtime.Remoting;
+using NMaven.Plugin;
+using NMaven.Plugin.Generator;
+
+namespace NMaven.Plugin.MojoGenerator
+{
+	/// <summary>
+	/// Provides methods for loading plugins and for creating Mojos.
+	/// </summary>
+	internal sealed class Generator
+	{
+		internal Generator()
+		{
+		}
+
+		/// <summary>
+		/// Loads the specified plugin assembly file into the returned plugin application domain.
+		/// </summary>
+		/// <param name="pluginAssemblyFile">the.NET maven plugin</param>
+		/// <returns>application domain for .NET maven plugin</returns>
+		/// 
+		internal AppDomain LoadPlugin(FileInfo pluginAssemblyFile)
+		{
+			Console.WriteLine("Loading Generator: " + pluginAssemblyFile.DirectoryName);
+			AppDomainSetup setup = new AppDomainSetup();
+			setup.ApplicationBase = pluginAssemblyFile.DirectoryName;
+
+			AppDomain applicationDomain = AppDomain.CreateDomain("Loader", null, setup);
+			PluginDomainManager pluginDomainManager = (PluginDomainManager) applicationDomain.DomainManager;
+            pluginDomainManager.LoadPlugin(pluginAssemblyFile);
+			return applicationDomain;
+		}
+		
+		/// <summary>
+		/// Creates an instance of the specified mojo name within the specified application domain.
+		/// </summary>
+		/// <param name="mojoName">the name of the mojo to create</param>
+		/// <param name="pluginAssemblyFile">the.NET maven plugin</param>
+		/// <param name="paramFile">the file containing the parameters to inject into an instance 
+		/// of the specified mojo</param>
+		/// <param name="applicationDomain">
+		/// the application domain used to create the specified mojo name instance</param>
+		/// <returns>an instance of the specified mojo name within the specified application domain</returns>
+		internal void CreateA(AppDomain applicationDomain)
+		{
+            ObjectHandle objectHandle = 
+            	applicationDomain.CreateInstanceFrom(@"C:\Documents and Settings\shane\.m2\repository\NMaven\Plugin\NMaven.Plugin\0.14\NMaven.Plugin.dll", "NMaven.Plugin.Generator.JavaClassUnmarshaller");
+			JavaClassUnmarshaller jcu = (JavaClassUnmarshaller) objectHandle.Unwrap();
+			List<JavaClass> javaClasses = jcu.Print();
+			foreach(JavaClass javaClass in javaClasses)
+			{
+				Console.WriteLine("BACK: " + javaClass.ClassName + ":" + javaClass.PackageName);
+			}
+		//	abstractMojo.InjectFields(paramFile.FullName);	
+		}
+		
+		public static void Main(string[] args)
+		{
+			//string paramFile = GetArgFor("parameterFile", args);
+			//string assemblyFile = GetArgFor("assemblyFile", args);
+			//string mojoName = GetArgFor("mojoName", args);
+			//Console.WriteLine("ParamFile = {0}, AssemblyFile = {1}, MojoName = {2}", 
+			//                  paramFile, assemblyFile, mojoName);
+			String assemblyFile = 
+				@"C:\Documents and Settings\shane\.m2\repository\NMaven\Plugin\NMaven.Plugin.Solution\0.14\NMaven.Plugin.Solution.dll";
+			Generator generator = new Generator();
+			AppDomain applicationDomain = generator.LoadPlugin(new FileInfo(assemblyFile));
+			generator.CreateA(applicationDomain);
+			//AbstractMojo abstractMojo = pluginLoader.CreateAbstractMojoFor(mojoName, 
+			 //                                                              new FileInfo(assemblyFile), 
+			 //                                                              new FileInfo(paramFile),
+			 //                                                              applicationDomain);
+			//abstractMojo.Execute();
+			
+		}
+		
+		private static string GetArgFor(string name, string[] args)
+		{
+			char[] delim = {'='};
+			foreach(string arg in args)
+			{
+                string[] tokens = arg.Split(delim);
+                if (tokens[0].Equals(name)) return tokens[1];
+			}
+            return null;
+		}		
+	}
+}

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin.Runner/src/main/csharp/NMaven/Plugin/Launcher/PluginLauncher.cs Fri Apr 27 22:20:32 2007
@@ -16,13 +16,14 @@
 		[STAThread]
 		static void Main(string[] args)
 		{
-			//Console.WriteLine(args.ToString());
+
 			Console.WriteLine("Start Process = " + DateTime.Now);
 			Console.WriteLine(@flattenArgs(args));
-
+			String startProcessAssembly = @GetArgFor("startProcessAssembly", args);
+			//String startProcessAssembly = @"C:\Documents and Settings\shane\.m2\repository\NMaven\Plugin\NMaven.Plugin.Loader\0.14\NMaven.Plugin.Loader.exe";
+			//String startProcessAssembly = @"C:\Documents and Settings\shane\.m2\repository\NMaven\Plugin\NMaven.Plugin.MojoGenerator\0.14\NMaven.Plugin.MojoGenerator.exe";
 			ProcessStartInfo processStartInfo =
-				new ProcessStartInfo(@"C:\Documents and Settings\shane\.m2\repository\NMaven\Plugin\NMaven.Plugin.Loader\0.14\NMaven.Plugin.Loader.exe",
-				                    @flattenArgs(args));
+				new ProcessStartInfo(startProcessAssembly, @flattenArgs(args));
 
 			processStartInfo.EnvironmentVariables["APPDOMAIN_MANAGER_ASM"]
 				= "NMaven.Plugin, Version=0.14.0.0, PublicKeyToken=4b435f4d76e2f0e6, culture=neutral";
@@ -34,6 +35,17 @@
             Console.WriteLine("End Process = " + DateTime.Now);
 		}
 
+		private static string GetArgFor(string name, string[] args)
+		{
+			char[] delim = {'='};
+			foreach(string arg in args)
+			{
+                string[] tokens = arg.Split(delim);
+                if (tokens[0].Equals(name)) return tokens[1];
+			}
+            return null;
+		}
+		
 		private static string flattenArgs(string[] args)
 		{
 			StringBuilder stringBuilder = new StringBuilder();

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=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/NMaven.Plugin.sln (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/NMaven.Plugin.sln Fri Apr 27 22:20:32 2007
@@ -4,8 +4,6 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Plugin-Test", "src\test\csharp\NMaven.Plugin-Test.csproj", "{fe42fa80-6048-494c-a70c-1ed9fe3c642e}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Plugin.Solution", "..\NMaven.Plugin.Solution\src\main\csharp\NMaven.Plugin.Solution.csproj", "{8e00e1d0-efb1-4e03-bc48-00ebf5f6579d}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

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=533295&r1=533294&r2=533295
==============================================================================
--- 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 Fri Apr 27 22:20:32 2007
@@ -28,9 +28,6 @@
   <ItemGroup>
     <Compile Include="NMaven\Plugin\AbstractMojo.cs" />
     <Compile Include="NMaven\Plugin\FieldAttribute.cs" />
-    <Compile Include="NMaven\Plugin\Generator\JavaClass.cs" />
-    <Compile Include="NMaven\Plugin\Generator\JavaClassUnmarshaller.cs" />
-    <Compile Include="NMaven\Plugin\Generator\JavaField.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">
@@ -41,13 +38,15 @@
     <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\JavaClass.cs" />
+    <Compile Include="NMaven\Plugin\Generator\JavaField.cs" />
   </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" />
+    <Folder Include="NMaven\Plugin\Generator" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/AbstractMojo.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/AbstractMojo.cs?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/AbstractMojo.cs (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/AbstractMojo.cs Fri Apr 27 22:20:32 2007
@@ -36,14 +36,14 @@
     {
         public abstract void Execute();
         
-        public abstract Type getT();
+        public abstract Type GetMojoImplementationType();
                
         /// <summary>
         /// Injects values into fields of the child class using information from the specified 
         /// configuration file. 
         /// </summary>
         /// <param name="configurationFile">The file that contains the values used to populate the fields</param>
-        public void injectFields(String configurationFile)
+        public void InjectFields(String configurationFile)
         {
 			XmlTextReader reader = 
 				new XmlTextReader(@configurationFile);
@@ -51,7 +51,7 @@
 			
 			while(reader.Read() == true)
 			{	
-				FieldInfo fieldInfo = GetFieldInfoFor(this.getT(), reader.Name);				
+				FieldInfo fieldInfo = GetFieldInfoFor(this.GetMojoImplementationType(), reader.Name);				
 				if(fieldInfo != null) 
 				{
 					IFieldInjector fieldInjector = fieldInjectorRepository.getFieldInjectorFor(fieldInfo);
@@ -59,6 +59,8 @@
 				}					
 			}        	
         }
+        
+       // public List<JavaClass> CreateJavaClassesForPlugin()
         
         private FieldInfo GetFieldInfoFor(Type type, String name)
         {

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/ClassAttribute.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/ClassAttribute.cs?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/ClassAttribute.cs (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/ClassAttribute.cs Fri Apr 27 22:20:32 2007
@@ -25,6 +25,7 @@
 	/// <summary>
 	/// Description of ClassAttribute.
 	/// </summary>
+	[Serializable]
 	public sealed class ClassAttribute : Attribute
 	{
 		private string phase;

Added: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaClass.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaClass.cs?view=auto&rev=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaClass.cs (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaClass.cs Fri Apr 27 22:20:32 2007
@@ -0,0 +1,102 @@
+#region Apache License, Version 2.0 
+//
+// 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.
+//
+#endregion
+using System;
+using System.Collections.Generic;
+
+namespace NMaven.Plugin.Generator
+{
+	/// <summary>
+	/// Description of JavaClass.
+	/// </summary>
+	[Serializable]
+	public class JavaClass
+	{
+		private string className;
+		
+		private string packageName;
+		
+		private string extendsClassName;
+		
+		private List<String> comments;
+		
+		private List<JavaField> javaFields;
+		
+		public string ClassName
+		{
+			get {
+				return className;
+			}
+			
+			set
+			{
+				this.className = value;
+			}
+		}
+		
+		public List<String> Comments
+		{
+			get {
+				return comments;
+			}
+			
+			set
+			{
+				this.comments = value;
+			}
+		}			
+		
+		public List<JavaField> JavaFields
+		{
+			get {
+				return javaFields;
+			}
+			
+			set
+			{
+				this.javaFields = value;
+			}
+		}		
+		
+		public string ExtendsClassName
+		{
+			get {
+				return extendsClassName;
+			}
+			
+			set
+			{
+				this.extendsClassName = value;
+			}
+		}		
+		
+		public string PackageName
+		{
+			get {
+				return packageName;
+			}
+			
+			set
+			{
+				this.packageName = value;
+			}
+		}		
+	}
+}

Added: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaClassUnmarshaller.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaClassUnmarshaller.cs?view=auto&rev=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaClassUnmarshaller.cs (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaClassUnmarshaller.cs Fri Apr 27 22:20:32 2007
@@ -0,0 +1,183 @@
+#region Apache License, Version 2.0 
+//
+// 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.
+//
+#endregion
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Collections;
+using System.Reflection;
+
+using NMaven.Plugin;
+
+namespace NMaven.Plugin.Generator
+{
+	/// <summary>
+	/// Description of JavaClassUnmarshaller.
+	/// </summary>
+	public class JavaClassUnmarshaller : MarshalByRefObject 
+	{
+		public JavaClassUnmarshaller()
+		{
+		}
+			
+		public List<JavaClass> Print()
+		{
+			Console.WriteLine("Print ...");
+			List<JavaClass> javaClasses = new List<JavaClass>();
+			Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies();
+			foreach(Assembly assembly in assemblies)
+			{
+				Console.WriteLine("Assembly :" + assembly.GetName().Name);
+				if(assembly.GetName().Name.Equals(@"NMaven.Plugin.Solution"))
+				{
+					Type[] types = assembly.GetTypes();
+					foreach(Type type in types)
+					{
+						String baseName = type.BaseType.Name;//.Equals("NMaven.Plugin.AbstractMojo");
+						Console.WriteLine("BASE  = " + baseName);
+						if(baseName.Equals("AbstractMojo"))
+						{
+							JavaClass javaClass = convert(type);
+							javaClasses.Add(javaClass);
+							Console.WriteLine("CN: " + javaClass.ClassName + ": PN = " + type.Name);
+						}
+					}			
+				}
+			}
+			return javaClasses;
+			//Assembly a; a.GetTypes(); Type t; t.FindInterfaces();
+			//Assembly assembly = Assembly..GetAssembly("NMaven.Plugin.Solution.SolutionMojo");
+			//Console.WriteLine("Number of classes = " + assembly.GetTypes().GetLength());
+		}
+		
+		public JavaClass convert(Type abstractMojoType)
+		{		
+	        JavaClass javaClass = new JavaClass();
+		 	javaClass.PackageName = abstractMojoType.Namespace;
+		 	javaClass.ClassName = abstractMojoType.Name;
+		 	javaClass.ExtendsClassName = "org.apache.maven.dotnet.plugin.AbstractMojo";
+	 	
+		 	List<String> classComments = new List<String>();
+			System.Attribute[] attributes =
+				System.Attribute.GetCustomAttributes(abstractMojoType);
+			
+			foreach(Attribute attribute in attributes) 
+			{
+				if(attribute is ClassAttribute)
+				{
+					ClassAttribute mojo = (ClassAttribute) attribute;			
+					classComments.Add(@"@phase = """ + mojo.Phase + @"""");	
+					classComments.Add(@"@goal = """ + mojo.Goal + @"""");	
+					break;
+				}
+			}
+			
+			javaClass.Comments = classComments;
+		 	
+		 	List<JavaField> javaFields = new List<JavaField>();
+        	foreach(FieldInfo field in abstractMojoType.GetFields())
+	        {
+	            foreach (Attribute attribute in field.GetCustomAttributes(true))
+	            {	            	
+					FieldAttribute mojo = (FieldAttribute) attribute;
+					
+					List<String> comments = new List<String>();
+					comments.Add(@"@parameter expression = """ + mojo.Expression + @"""");
+					
+				 	JavaField javaField = new JavaField();
+				 	javaField.Access = "private";
+				 	javaField.FieldName = mojo.Name;
+				 	javaField.ReturnType = mojo.Type;
+				 	javaField.Comments = comments;
+				 	javaFields.Add(javaField);
+	            }
+	        }
+        		 	
+		 	javaClass.JavaFields = javaFields;
+		 	
+		 	return javaClass;
+		}
+			
+		public void unmarshall(JavaClass javaClass, FileInfo fileInfo)
+		{
+			StreamWriter streamWriter = fileInfo.CreateText();
+			streamWriter.WriteLine("package " + javaClass.PackageName + ";");
+			streamWriter.WriteLine("");
+			
+			if(javaClass.Comments != null)
+			{
+				streamWriter.WriteLine("/**");
+				foreach(String comment in javaClass.Comments)
+				{
+					streamWriter.WriteLine(" * " + comment);		
+				}
+				streamWriter.WriteLine(" */");				
+			}
+						   
+			streamWriter.WriteLine("public class " + javaClass.ClassName);
+			if(javaClass.ExtendsClassName != null)
+			{
+				streamWriter.WriteLine("    extends " + javaClass.ExtendsClassName);
+			}
+			streamWriter.WriteLine("{");
+			
+			if(javaClass.JavaFields != null)
+			{
+				foreach(JavaField javaField in javaClass.JavaFields)
+				{
+					List<String> comments = javaField.Comments;
+					if(comments != null && comments.Count > 0)
+					{
+						streamWriter.WriteLine("    /**");
+						foreach(String comment in comments)
+						{
+							streamWriter.WriteLine("     * " + comment);
+						}	
+						streamWriter.WriteLine("     */");						
+					}
+
+					streamWriter.WriteLine("        " + javaField.Access + " " + 
+					                      javaField.ReturnType + " " + javaField.FieldName+ ";");
+					streamWriter.WriteLine("");
+				}
+			}
+			
+			streamWriter.WriteLine("}");			
+			streamWriter.AutoFlush = true;
+			streamWriter.Close();
+			Console.WriteLine("File Exists = " + fileInfo.Exists);
+		}
+
+	
+        private FieldInfo GetFieldInfoFor(Type type, String name)
+        {
+        	foreach(FieldInfo field in type.GetFields())
+	        {
+	            foreach (Attribute attribute in field.GetCustomAttributes(true))
+	            {	            	
+					FieldAttribute mojo = (FieldAttribute) attribute;
+					if(mojo.Name.Equals(name))
+						return field;
+	            }
+	        }
+	        return null;
+        }	
+	}
+}

Added: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaField.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaField.cs?view=auto&rev=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaField.cs (added)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Generator/JavaField.cs Fri Apr 27 22:20:32 2007
@@ -0,0 +1,102 @@
+#region Apache License, Version 2.0 
+//
+// 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.
+//
+#endregion
+using System;
+using System.Collections.Generic;
+
+namespace NMaven.Plugin.Generator
+{
+	/// <summary>
+	/// Description of JavaField.
+	/// </summary>
+	[Serializable]
+	public class JavaField
+	{
+		private string fieldName;
+		
+		private string fieldValue;
+		
+		private string access;
+		
+		private string returnType;
+		
+		private List<String> comments;
+
+		public List<String> Comments
+		{
+			get {
+				return comments;
+			}
+			
+			set
+			{
+				this.comments = value;
+			}
+		}
+		
+		public string FieldName
+		{
+			get {
+				return fieldName;
+			}
+			
+			set
+			{
+				this.fieldName = value;
+			}
+		}
+		
+		public string FieldValue
+		{
+			get {
+				return fieldValue;
+			}
+			
+			set
+			{
+				this.fieldValue = value;
+			}
+		}	
+		
+		public string Access
+		{
+			get {
+				return access;
+			}
+			
+			set
+			{
+				this.access = value;
+			}
+		}	
+		
+		public string ReturnType
+		{
+			get {
+				return returnType;
+			}
+			
+			set
+			{
+				this.returnType = value;
+			}
+		}			
+	}
+}

Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/FieldInjectorRepository.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/FieldInjectorRepository.cs?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/FieldInjectorRepository.cs (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/FieldInjectorRepository.cs Fri Apr 27 22:20:32 2007
@@ -41,7 +41,6 @@
 			{
 				if(type.GetInterface("NMaven.Plugin.Injector.IFieldInjector") == null) 
 				{
-					Console.WriteLine("Not correct interface: Name = " + type.Name);
 					continue;
 				}
 				

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=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/pom.xml Fri Apr 27 22:20:32 2007
@@ -133,20 +133,16 @@
     </developer>
   </developers>
   <modules>
-    <module>NMaven.Plugin.Resx</module>
-    <module>NMaven.Plugin.Settings</module>
-    <module>NMaven.Plugin.Runner</module>
+    <module>NMaven.Core</module>
+    <module>NMaven.IDE</module>
+    <module>NMaven.Logging</module>
+    <module>NMaven.Model/Pom</module>
+    <module>NMaven.Plugin</module>
     <module>NMaven.Plugin.Loader</module>
-    <module>NMaven.Plugin.</module>       
+    <module>NMaven.Plugin.MojoGenerator</module>
+    <module>NMaven.Plugin.Runner</module>
+    <module>NMaven.Service/Embedder</module>
   </modules>
-  <dependencies>
-    <dependency>
-      <groupId>NUnit</groupId>
-      <artifactId>NUnit.Framework</artifactId>
-      <version>2.2.8.0</version>
-      <type>library</type>
-    </dependency>
-  </dependencies>
   <build>
     <sourceDirectory>src/main/csharp</sourceDirectory>
     <testSourceDirectory>src/test/csharp</testSourceDirectory>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-core/src/main/resources/META-INF/nmaven/executable-plugins.xml Fri Apr 27 22:20:32 2007
@@ -187,6 +187,22 @@
     </platforms>
   </executablePlugin>
   <executablePlugin>
+    <identifier>MONO:GACUTIL</identifier>
+    <pluginClass>org.apache.maven.dotnet.executable.impl.DefaultNetExecutable</pluginClass>
+    <vendor>MONO</vendor>
+    <executable>gacutil</executable>
+    <profile>GACUTIL</profile>
+    <frameworkVersions>
+      <frameworkVersion>2.0.50727</frameworkVersion>
+      <frameworkVersion>1.1.4322</frameworkVersion>
+    </frameworkVersions>
+    <platforms>
+      <platform>
+        <operatingSystem>Windows</operatingSystem>
+      </platform>
+    </platforms>
+  </executablePlugin>
+  <executablePlugin>
     <identifier>MONO:RESGEN</identifier>
     <pluginClass>org.apache.maven.dotnet.executable.impl.DefaultNetExecutable</pluginClass>
     <vendor>MONO</vendor>

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=533295&r1=533294&r2=533295
==============================================================================
--- 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 Fri Apr 27 22:20:32 2007
@@ -32,14 +32,12 @@
     <artifactId>NMaven.Plugin</artifactId>
     <version>0.14</version>
     <type>library</type>
-    <isGacInstall>true</isGacInstall>
   </netDependency>
   <netDependency>
     <groupId>NMaven.Model</groupId>
     <artifactId>NMaven.Model.Pom</artifactId>
     <version>0.14</version>
     <type>library</type>
-    <isGacInstall>true</isGacInstall>
   </netDependency>
   <netDependency>
     <groupId>NMaven.Plugin</groupId>
@@ -50,6 +48,12 @@
   <netDependency>
     <groupId>NMaven.Plugin</groupId>
     <artifactId>NMaven.Plugin.Loader</artifactId>
+    <version>0.14</version>
+    <type>exe</type>
+  </netDependency>
+  <netDependency>
+    <groupId>NMaven.Plugin</groupId>
+    <artifactId>NMaven.Plugin.MojoGenerator</artifactId>
     <version>0.14</version>
     <type>exe</type>
   </netDependency>

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/NetExecutableFactory.java Fri Apr 27 22:20:32 2007
@@ -65,15 +65,20 @@
     /**
      * Returns an executable that resides within a maven repository. These are typically user-implemented executables.
      *
-     * @param groupId         the group ID of the executable artifact (as specified within the maven repo)
-     * @param artifactId      the artifact ID of the executable artifact (as specified within the maven repo)
-     * @param vendorInfo      the additional vendor information used to decide how to execute the net executable
-     * @param localRepository the local maven repository where the executable resides.
+     * @param groupId             the group ID of the executable artifact (as specified within the maven repo)
+     * @param artifactId          the artifact ID of the executable artifact (as specified within the maven repo)
+     * @param vendorInfo          the additional vendor information used to decide how to execute the net executable
+     * @param localRepository     the local maven repository where the executable resides.
+     * @param isIsolatedAppDomain the executable can load up assemblies into an isolated application domain. This should
+     *                            be set to true if the application needs to load up assemblies into another app domain
+     *                            and to remotly invoke methods on classes in the other app domain, otherwise it should be
+     *                            set to false.
      * @return the executable that resides within a maven repository.
      * @throws PlatformUnsupportedException if no executable is found
      */
     NetExecutable getNetExecutableFromRepository( String groupId, String artifactId, VendorInfo vendorInfo,
-                                                  MavenProject project, String localRepository, List<String> commands )
+                                                  MavenProject project, String localRepository, List<String> commands,
+                                                  boolean isIsolatedAppDomain )
         throws PlatformUnsupportedException;
 
     /**
@@ -92,6 +97,19 @@
         throws PlatformUnsupportedException;
 
 
+    /**
+     * Returns a plugin loader for loading and executing a .NET plugin.
+     *
+     * @param groupId         the group ID of the executable artifact (as specified within the maven repo)
+     * @param artifactId      the artifact ID of the executable artifact (as specified within the maven repo)
+     * @param vendorInfo      the additional vendor information used to decide how to execute the net executable
+     * @param project         the maven project
+     * @param localRepository the local maven repository where the executable resides.
+     * @param parameterFile   the file containing parameter information to inject into the .NET plugin
+     * @param mojoName        the name of the .NET Mojo implementation
+     * @return the plugin loader for executing a .NET plugin
+     * @throws PlatformUnsupportedException if no executable is found
+     */
     NetExecutable getPluginLoaderFor( String groupId, String artifactId, VendorInfo vendorInfo, MavenProject project,
                                       String localRepository, File parameterFile, String mojoName )
         throws PlatformUnsupportedException;

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java Fri Apr 27 22:20:32 2007
@@ -144,6 +144,7 @@
         {
             commands.add( "/reference:System.Drawing" );
             commands.add( "/reference:System.Windows.Forms" );
+            commands.add( "/reference:System.Web.Services" );
         }
         CommandFilter filter = compilerContext.getCommandFilter();
         return filter.filter( commands );

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java Fri Apr 27 22:20:32 2007
@@ -70,7 +70,7 @@
 
     /**
      * A logger for writing log messages
-     */    
+     */
     private Logger logger;
 
     /**
@@ -181,7 +181,8 @@
         if ( artifacts.size() == 0 )
         {
             throw new PlatformUnsupportedException(
-                "NMAVEN-066-023: Could not locate the plugin: GroupId = " + groupId + ", ArtifactId = " + artifactId );
+                "NMAVEN-066-023: Could not locate the plugin - missing entry in the net-dependencies.xml file: GroupId = " +
+                    groupId + ", ArtifactId = " + artifactId );
         }
 
         Artifact artifact = artifacts.get( 0 );
@@ -194,23 +195,53 @@
         AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
         File artifactPath = new File( localRepository + File.separator + layout.pathOf( artifact ) );
         List<String> commands = new ArrayList<String>();
-        //commands.add( "mojoName=NMaven.Plugin.Solution" );
         commands.add( "parameterFile=" + parameterFile.getAbsolutePath() );
         commands.add( "assemblyFile=" + artifactPath.getAbsolutePath() );
-        commands.add( "mojoName=" + artifactId + "." + mojoName );//ArtifactId = namespace
+        commands.add( "mojoName=" + mojoName );//ArtifactId = namespace
+
+        Artifact pluginLoaderArtifact =
+            artifactContext.getArtifactsFor( "NMaven.Plugin", "NMaven.Plugin.Loader", null, null ).get( 0 );
+        artifactPath = new File( localRepository + File.separator + layout.pathOf( pluginLoaderArtifact ) );
+        commands.add( "startProcessAssembly=" + artifactPath.getAbsolutePath() );
+
         return getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Runner", vendorInfo, project,
-                                               localRepository, commands );
+                                               localRepository, commands, false );
     }
 
     /**
      * @see NetExecutableFactory#getNetExecutableFromRepository(String, String, org.apache.maven.dotnet.vendor.VendorInfo,
-     *      org.apache.maven.project.MavenProject, String, java.util.List<String>)
+     *      org.apache.maven.project.MavenProject, String, java.util.List<String>, boolean)
      */
     public NetExecutable getNetExecutableFromRepository( String groupId, String artifactId, VendorInfo vendorInfo,
                                                          MavenProject project, String localRepository,
-                                                         List<String> commands )
+                                                         List<String> commands, boolean isIsolatedAppDomain )
         throws PlatformUnsupportedException
     {
+        if ( isIsolatedAppDomain )
+        {
+            List<Artifact> artifacts = artifactContext.getArtifactsFor( groupId, artifactId, null, null );
+            if ( artifacts.size() == 0 )
+            {
+                throw new PlatformUnsupportedException(
+                    "NMAVEN-066-024: Could not locate the executable - missing entry in the net-dependencies.xml file: GroupId = " +
+                        groupId + ", ArtifactId = " + artifactId );
+            }
+
+            Artifact artifact = artifacts.get( 0 );
+            if ( artifact == null )
+            {
+                throw new PlatformUnsupportedException( "NMAVEN-066-025: Could not locate the executable: GroupId = " +
+                    groupId + ", ArtifactId = " + artifactId );
+            }
+
+            AssemblyRepositoryLayout layout = new AssemblyRepositoryLayout();
+            File artifactPath = new File( localRepository + File.separator + layout.pathOf( artifact ) );
+            commands.add( "startProcessAssembly=" + artifactPath.getAbsolutePath() );
+
+            return getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Runner", vendorInfo, project,
+                                                   localRepository, commands, false );
+        }
+
         if ( commands == null )
         {
             commands = new ArrayList<String>();

Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/AbstractMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/AbstractMojo.java?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/AbstractMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/components/dotnet-plugin/src/main/java/org/apache/maven/dotnet/plugin/AbstractMojo.java Fri Apr 27 22:20:32 2007
@@ -120,9 +120,10 @@
         {
             VendorInfo vendorInfo = VendorInfo.Factory.createDefaultVendorInfo();
             vendorInfo.setVendor( VendorFactory.createVendorFromName( "MICROSOFT" ) );
-            getNetExecutableFactory().getPluginLoaderFor( "NMaven.Plugin", "NMaven.Plugin.Solution", vendorInfo,
+            //String className = this.getClass().getName(); Will work with generated classes
+            getNetExecutableFactory().getPluginLoaderFor( getMojoGroupId(), getMojoArtifactId(), vendorInfo,
                                                           getMavenProject(), getLocalRepository(), paramFile,
-                                                          "SolutionMojo" ).execute();
+                                                          getClassName() ).execute();
         }
         catch ( PlatformUnsupportedException e )
         {
@@ -153,7 +154,7 @@
         document.appendChild( root );
 
         Set<Field> fields = getAnnotatedFieldsFrom( this.getClass().getDeclaredFields() );
-       // Set<Class> appenderClasses = getConfigurationAppenderClasses();
+        // Set<Class> appenderClasses = getConfigurationAppenderClasses();
         for ( Field field : fields )
         {
             ConfigurationAppender configurationAppender = getNetPluginContext().getConfigurationAppenderFor( field );
@@ -194,5 +195,11 @@
     public abstract NetExecutableFactory getNetExecutableFactory();
 
     public abstract PluginContext getNetPluginContext();
+
+    public abstract String getMojoGroupId();
+
+    public abstract String getMojoArtifactId();
+
+    public abstract String getClassName();
 
 }

Modified: incubator/nmaven/branches/SI_XPT/maven-dotnet.iml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/maven-dotnet.iml?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/maven-dotnet.iml (original)
+++ incubator/nmaven/branches/SI_XPT/maven-dotnet.iml Fri Apr 27 22:20:32 2007
@@ -5,6 +5,7 @@
     <output url="file://$MODULE_DIR$/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/archetypes/maven-archetype-netexecutable/src/main/resources/archetype-resources/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/assemblies/NMaven.Core/src/main/csharp" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/assemblies/NMaven.Core/src/test/csharp" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/assemblies/NMaven.Plugin.Resx/src/main/csharp" isTestSource="false" />
@@ -27,8 +28,12 @@
       <sourceFolder url="file://$MODULE_DIR$/components/dotnet-model/assembly-plugins/src/site" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/components/dotnet-model/assembly-plugins/target/generated-sources/modello" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/components/dotnet-model/compiler-plugins/target/generated-sources/modello" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/components/dotnet-model/configuration-appenders/target/generated-sources/modello" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/components/dotnet-model/netdependency/target/generated-sources/modello" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/components/dotnet-model/settings/target/generated-sources/modello" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/components/dotnet-model/vscontent/target/generated-sources/modello" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/components/dotnet-packagers/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/components/dotnet-plugin/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/components/dotnet-registry/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/components/dotnet-registry/src/main/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/components/dotnet-vendor/src/main/java" isTestSource="false" />
@@ -55,16 +60,21 @@
       <sourceFolder url="file://$MODULE_DIR$/integration-tests/tests/it0021/src/main/vb" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/integration-tests/tests/it0022/src/main/csharp" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/integration-tests/tests/it0025/it/test1/src/main/csharp" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/net-plugins/NMaven.Plugin.Generator/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/maven-archetype-plugin/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-compile-plugin/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-compile-plugin/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/maven-mojo-generator-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-resgen-plugin/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-resolver-plugin/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/maven-sdaddin-plugin/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-settings-plugin/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-solution-plugin/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-test-plugin/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-test-plugin/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/maven-vsi-plugin/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-vstudio-plugin/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-webapp-plugin/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/plugins/maven-wsdl-plugin/src/main/java" isTestSource="false" />
@@ -563,33 +573,6 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="Maven Dependency: org.apache.maven:maven-core:jar:2.0.4:compile">
-        <CLASSES>
-          <root url="jar://$localRepository$/org/apache/maven/maven-core/2.0.4/maven-core-2.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Maven Dependency: org.apache.maven:maven-core:jar:2.0:test">
-        <CLASSES>
-          <root url="jar://$localRepository$/org/apache/maven/maven-core/2.0/maven-core-2.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library name="Maven Dependency: org.apache.maven:maven-embedder:jar:2.0.4:compile">
-        <CLASSES>
-          <root url="jar://$localRepository$/org/apache/maven/maven-embedder/2.0.4/maven-embedder-2.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
       <library name="Maven Dependency: org.apache.maven:maven-error-diagnostics:jar:2.0.4:compile">
         <CLASSES>
           <root url="jar://$localRepository$/org/apache/maven/maven-error-diagnostics/2.0.4/maven-error-diagnostics-2.0.4.jar!/" />
@@ -1231,24 +1214,6 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$localRepository$/org/apache/maven/maven-core/2.0/maven-core-2.0.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$localRepository$/org/apache/maven/maven-embedder/2.0.4/maven-embedder-2.0.4.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
           <root url="jar://$localRepository$/org/apache/maven/maven-error-diagnostics/2.0/maven-error-diagnostics-2.0.jar!/" />
         </CLASSES>
         <JAVADOC />
@@ -1391,6 +1356,33 @@
       </library>
     </orderEntry>
     <orderEntry type="library" name="maven-plugin-api-2.0" level="application" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$localRepository$/org/apache/maven/maven-core/2.1-SNAPSHOT/maven-core-2.1-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$localRepository$/org/apache/maven/maven-embedder/2.1-SNAPSHOT/maven-embedder-2.1-SNAPSHOT.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$localRepository$/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
     <orderEntryProperties />
   </component>
 </module>

Modified: incubator/nmaven/branches/SI_XPT/net-plugins/NMaven.Plugin.Solution/src/main/csharp/NMaven.Plugin.Solution.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/net-plugins/NMaven.Plugin.Solution/src/main/csharp/NMaven.Plugin.Solution.csproj?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/net-plugins/NMaven.Plugin.Solution/src/main/csharp/NMaven.Plugin.Solution.csproj (original)
+++ incubator/nmaven/branches/SI_XPT/net-plugins/NMaven.Plugin.Solution/src/main/csharp/NMaven.Plugin.Solution.csproj Fri Apr 27 22:20:32 2007
@@ -25,6 +25,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Plugin\Solution\SolutionMojo.cs" />
+    <Compile Include="Plugin\Solution\MojoClassGenerator.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Plugin" />

Modified: incubator/nmaven/branches/SI_XPT/net-plugins/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionMojo.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/net-plugins/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionMojo.cs?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/net-plugins/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionMojo.cs (original)
+++ incubator/nmaven/branches/SI_XPT/net-plugins/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionMojo.cs Fri Apr 27 22:20:32 2007
@@ -47,7 +47,7 @@
 		
 		private String profile = null;
 		
-		public override Type getT()
+		public override Type GetMojoImplementationType()
 		{
 			return this.GetType();
 		}

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml Fri Apr 27 22:20:32 2007
@@ -185,6 +185,7 @@
             org.apache.maven.dotnet.plugins:maven-compile-plugin:compile,
             org.apache.maven.dotnet.plugins:maven-compile-plugin:testCompile
           </compile>
+          <deploy>org.apache.maven.dotnet.plugins:maven-mojo-generator-plugin:generate-bindings</deploy>
           <process-classes>
             org.apache.maven.dotnet.plugins:maven-install-plugin:target-install
           </process-classes>

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java Fri Apr 27 22:20:32 2007
@@ -153,7 +153,7 @@
             vendorInfo.setFrameworkVersion( frameworkVersion );
             vendorInfo.setVendorVersion( vendorVersion );
             netExecutableFactory.getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Resx", vendorInfo,
-                                                                 project, localRepository, commands ).execute();
+                                                                 project, localRepository, commands, false ).execute();
         }
         catch ( PlatformUnsupportedException e )
         {

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java Fri Apr 27 22:20:32 2007
@@ -131,7 +131,7 @@
             vendorInfo.setFrameworkVersion( frameworkVersion );
             vendorInfo.setVendorVersion( vendorVersion );
             netExecutableFactory.getNetExecutableFromRepository( "NMaven.Plugin", "NMaven.Plugin.Settings", vendorInfo,
-                                                                 project, localRepository, commands ).execute();
+                                                                 project, localRepository, commands, false ).execute();
         }
         catch ( PlatformUnsupportedException e )
         {

Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/solution/SolutionMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/solution/SolutionMojo.java?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/solution/SolutionMojo.java (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/maven-solution-plugin/src/main/java/org/apache/maven/dotnet/plugin/solution/SolutionMojo.java Fri Apr 27 22:20:32 2007
@@ -86,63 +86,21 @@
         return pluginContext;
     }
 
-/*
-    private Set<Field> getAnnotatedFieldsFrom( Field[] fields )
+    public String getMojoGroupId()
     {
-        Set<Field> fieldSet = new HashSet<Field>();
-        for ( Field field : fields )
-        {
-            if ( field.getAnnotation( FieldAnnotation.class ) != null )
-            {
-                fieldSet.add( field );
-            }
-        }
-        return fieldSet;
+        return "NMaven.Plugin";
     }
-
-    private Set<Class> getConfigurationAppenderClasses()
+    
+    public String getMojoArtifactId()
     {
-        Set<Class> appenderClasses = new HashSet<Class>();
-        for ( Class c : ConfigurationAppender.class.getClasses() )
-        {
-            if ( c.getAnnotation( ConfigurationAppenderAnnotation.class ) != null )
-            {
-                appenderClasses.add( c );
-            }
-        }
-        return appenderClasses;
+        return "NMaven.Plugin.Solution";
     }
 
-    public DOMSource getDOMSourceFor( Document document )
+    /**
+     * Remove this later
+     */
+    public String getClassName()
     {
-        Element root = document.createElement( "configuration" );
-        document.appendChild( root );
-
-        Set<Field> fields = getAnnotatedFieldsFrom( this.getClass().getDeclaredFields() );
-        Set<Class> appenderClasses = getConfigurationAppenderClasses();
-        for ( Field field : fields )
-        {
-            ConfigurationAppender configurationAppender = pluginContext.getConfigurationAppenderFor( field );
-            try
-            {
-                try
-                {
-                    configurationAppender.append( document, root, FieldInfo.Factory.createFieldInfo( field.getName(),
-                                                                                                     field.get(
-                                                                                                         this ) ) );
-                }
-                catch ( IllegalAccessException e )
-                {
-                    e.printStackTrace();
-                }
-            }
-            catch ( MojoExecutionException e )
-            {
-                e.printStackTrace();
-            }
-        }
-        return new DOMSource( document );
+        return "NMaven.Plugin.Solution.SolutionMojo";
     }
-*/
-
 }

Modified: incubator/nmaven/branches/SI_XPT/plugins/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/pom.xml?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/pom.xml Fri Apr 27 22:20:32 2007
@@ -27,6 +27,7 @@
     <module>maven-compile-plugin</module>
     <module>maven-install-plugin</module>
     <module>maven-link-plugin</module>
+    <module>maven-mojo-generator-plugin</module>
     <module>maven-resgen-plugin</module>
     <module>maven-resolver-plugin</module>
     <module>maven-settings-plugin</module>

Modified: incubator/nmaven/branches/SI_XPT/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/pom.xml?view=diff&rev=533295&r1=533294&r2=533295
==============================================================================
--- incubator/nmaven/branches/SI_XPT/pom.xml (original)
+++ incubator/nmaven/branches/SI_XPT/pom.xml Fri Apr 27 22:20:32 2007
@@ -1,3 +1,21 @@
+<?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" 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>org.apache.maven.dotnet</groupId>



Mime
View raw message