Author: brett
Date: Tue Dec 6 01:49:36 2011
New Revision: 1210745
URL: http://svn.apache.org/viewvc?rev=1210745&view=rev
Log:
[NPANDAY-410] do not install artifacts to the GAC, and change plugin loader not
to use an appdomainmanager which requires the GAC and doesn't work on Mono
either way
Removed:
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin/src/main/csharp/PluginDomainManager.cs
Modified:
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Model.Pom/pom.xml
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Loader/src/main/csharp/PluginLoader.cs
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.MojoGenerator/src/main/csharp/Generator.cs
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Runner/src/main/csharp/PluginLauncher.cs
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin/pom.xml
Modified:
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Model.Pom/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Model.Pom/pom.xml?rev=1210745&r1=1210744&r2=1210745&view=diff
==============================================================================
---
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Model.Pom/pom.xml
(original)
+++
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Model.Pom/pom.xml
Tue Dec 6 01:49:36 2011
@@ -69,7 +69,6 @@ under the License.
</executions>
</plugin>
</plugins>
- <!-- TODO: ideally, avoid GAC installation of this artifact -->
<pluginManagement>
<plugins>
<plugin>
@@ -84,9 +83,6 @@ under the License.
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${bootstrap.npanday.version}</version>
- <configuration>
- <isGacInstall>true</isGacInstall>
- </configuration>
</plugin>
</plugins>
</pluginManagement>
Modified:
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Loader/src/main/csharp/PluginLoader.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Loader/src/main/csharp/PluginLoader.cs?rev=1210745&r1=1210744&r2=1210745&view=diff
==============================================================================
---
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Loader/src/main/csharp/PluginLoader.cs
(original)
+++
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Loader/src/main/csharp/PluginLoader.cs
Tue Dec 6 01:49:36 2011
@@ -48,8 +48,8 @@ namespace NPanday.Plugin.Loader
setup.ApplicationBase =
pluginAssemblyFile.DirectoryName;
AppDomain applicationDomain =
AppDomain.CreateDomain("Loader", null, setup);
- PluginDomainManager pluginDomainManager =
(PluginDomainManager) applicationDomain.DomainManager;
- pluginDomainManager.LoadPlugin(pluginAssemblyFile);
+ string assemblyName =
pluginAssemblyFile.Name.Replace(pluginAssemblyFile.Extension,"");
+ applicationDomain.Load(assemblyName);
return applicationDomain;
}
Modified:
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.MojoGenerator/src/main/csharp/Generator.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.MojoGenerator/src/main/csharp/Generator.cs?rev=1210745&r1=1210744&r2=1210745&view=diff
==============================================================================
---
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.MojoGenerator/src/main/csharp/Generator.cs
(original)
+++
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.MojoGenerator/src/main/csharp/Generator.cs
Tue Dec 6 01:49:36 2011
@@ -71,8 +71,8 @@ namespace NPanday.Plugin.MojoGenerator
AppDomain applicationDomain = AppDomain.CreateDomain("Loader",
null, setup);
- PluginDomainManager pluginDomainManager =
(PluginDomainManager)applicationDomain.DomainManager;
- pluginDomainManager.LoadPlugin(pluginAssemblyFile);
+ string assemblyName =
pluginAssemblyFile.Name.Replace(pluginAssemblyFile.Extension,"");
+ applicationDomain.Load(assemblyName);
return applicationDomain;
}
Modified:
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Runner/src/main/csharp/PluginLauncher.cs
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Runner/src/main/csharp/PluginLauncher.cs?rev=1210745&r1=1210744&r2=1210745&view=diff
==============================================================================
---
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Runner/src/main/csharp/PluginLauncher.cs
(original)
+++
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin.Runner/src/main/csharp/PluginLauncher.cs
Tue Dec 6 01:49:36 2011
@@ -54,13 +54,6 @@ namespace NPanday.Plugin.Launcher
new ProcessStartInfo(startProcessAssembly,
@flattenArgs(args));
}
- String version =
Assembly.GetExecutingAssembly().GetName().Version.ToString();
-
- processStartInfo.EnvironmentVariables["APPDOMAIN_MANAGER_ASM"]
- = "NPanday.Plugin, Version=" + version + ",
PublicKeyToken=4b435f4d76e2f0e6, culture=neutral";
- processStartInfo.EnvironmentVariables["APPDOMAIN_MANAGER_TYPE"]
- = "NPanday.Plugin.PluginDomainManager";
-
processStartInfo.UseShellExecute = false;
Process p = Process.Start(processStartInfo);
p.WaitForExit();
Modified:
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin/pom.xml?rev=1210745&r1=1210744&r2=1210745&view=diff
==============================================================================
---
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin/pom.xml
(original)
+++
incubator/npanday/branches/NPANDAY-410/dotnet/assemblies/NPanday.Plugin/pom.xml
Tue Dec 6 01:49:36 2011
@@ -78,9 +78,6 @@ under the License.
<groupId>org.apache.npanday.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>${bootstrap.npanday.version}</version>
- <configuration>
- <isGacInstall>true</isGacInstall>
- </configuration>
</plugin>
</plugins>
</pluginManagement>
