You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nmaven-commits@incubator.apache.org by si...@apache.org on 2007/05/19 04:03:12 UTC
svn commit: r539685 - in /incubator/nmaven/branches/SI_XPT:
assemblies/NMaven.Logging/src/main/csharp/
assemblies/NMaven.Plugin.Loader/src/main/csharp/NMaven/Plugin/Loader/
assemblies/NMaven.Plugin/src/main/csharp/NMaven/Plugin/Injector/Impl/
plugins/N...
Author: sisbell
Date: Fri May 18 21:03:11 2007
New Revision: 539685
URL: http://svn.apache.org/viewvc?view=rev&rev=539685
Log:
Improved exception handling.
Modified:
incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj
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/src/main/csharp/NMaven/Plugin/Injector/Impl/FieldInjectorRepository.cs
incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionMojo.cs
Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj?view=diff&rev=539685&r1=539684&r2=539685
==============================================================================
--- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj (original)
+++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Logging/src/main/csharp/NMaven.Logging.csproj Fri May 18 21:03:11 2007
@@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <ProjectGuid>{23518384-4dea-4794-bfab-dfa89f4c42c0}</ProjectGuid>
+ <ProjectGuid>{36FCE4F7-53D7-48AC-9AF4-74CB0F6020F6}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<RootNameSpace>NMaven.Logging</RootNameSpace>
<AssemblyName>NMaven.Logging</AssemblyName>
@@ -13,10 +13,6 @@
<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/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=539685&r1=539684&r2=539685
==============================================================================
--- 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 May 18 21:03:11 2007
@@ -73,26 +73,41 @@
return abstractMojo;
}
- public static void Main(string[] args)
+ public static int Main(string[] args)
{
- string paramFile = GetArgFor("parameterFile", args);
- string assemblyFile = GetArgFor("assemblyFile", args);
+ string paramFilePath = GetArgFor("parameterFile", args);
+ string assemblyFilePath = GetArgFor("assemblyFile", args);
string mojoName = GetArgFor("mojoName", args);
Console.WriteLine("ParamFile = {0}, AssemblyFile = {1}, MojoName = {2}",
- paramFile, assemblyFile, mojoName);
+ paramFilePath, assemblyFilePath, mojoName);
- if(paramFile == null || assemblyFile == null || mojoName == null)
+ if(paramFilePath == null || assemblyFilePath == null || mojoName == null)
{
+ Console.WriteLine("Missing arguement");
+ return 1;
+ }
+ FileInfo assemblyFile = new FileInfo(assemblyFilePath);
+ if (!assemblyFile.Exists)
+ {
+ Console.WriteLine("Assembly File does not exist: File = " + assemblyFile.FullName);
+ return 1;
+ }
+ FileInfo paramFile = new FileInfo(paramFilePath);
+ if (!paramFile.Exists)
+ {
+ Console.WriteLine("Param File does not exist: File = " + paramFile.FullName);
+ return 1;
}
PluginLoader pluginLoader = new PluginLoader();
- AppDomain applicationDomain = pluginLoader.LoadPlugin(new FileInfo(assemblyFile));
+ AppDomain applicationDomain = pluginLoader.LoadPlugin(assemblyFile);
AbstractMojo abstractMojo = pluginLoader.CreateAbstractMojoFor(mojoName,
- new FileInfo(assemblyFile),
- new FileInfo(paramFile),
+ assemblyFile,
+ paramFile,
applicationDomain);
abstractMojo.Execute();
+ return 0;
}
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=539685&r1=539684&r2=539685
==============================================================================
--- 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 May 18 21:03:11 2007
@@ -46,15 +46,12 @@
foreach (Attribute attribute in type.GetCustomAttributes(false))
{
- Console.WriteLine("Looking at attribute: Name = " + attribute.GetType().Name);
if(attribute is FieldInjectorAttribute)
{
- Console.WriteLine("Found Field Injector");
FieldInjectorAttribute fieldInjectorAttribute = (FieldInjectorAttribute) attribute;
Console.WriteLine(fieldInfo.FieldType.FullName + ":" + fieldInjectorAttribute.TargetClassName);
if(fieldInfo.FieldType.FullName.Equals(fieldInjectorAttribute.TargetClassName))
{
- Console.WriteLine("Returning field injector");
return (IFieldInjector) type.GetConstructor(System.Type.EmptyTypes).Invoke(null);
}
}
Modified: incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionMojo.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionMojo.cs?view=diff&rev=539685&r1=539684&r2=539685
==============================================================================
--- incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionMojo.cs (original)
+++ incubator/nmaven/branches/SI_XPT/plugins/NMaven.Plugin.Solution/src/main/csharp/Plugin/Solution/SolutionMojo.cs Fri May 18 21:03:11 2007
@@ -55,7 +55,7 @@
public override void Execute()
{
- IProjectGenerator projectGenerator = new ProjectGeneratorImpl();
+ IProjectGenerator projectGenerator = new ProjectGeneratorImpl();
FileInfo pomFileInfo = new FileInfo(basedir + @"\pom.xml");
List<IProjectReference> projectReferences = Execute(new DirectoryInfo(pomFileInfo.DirectoryName),
mavenProject, profile);