You are viewing a plain text version of this content. The canonical link for it is here.
Posted to npanday-commits@incubator.apache.org by br...@apache.org on 2012/02/01 15:43:32 UTC
svn commit: r1239177 - in /incubator/npanday/trunk:
dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/ASPNetPomConverter.cs
plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/aspnet-webapp-binaries.xml
Author: brett
Date: Wed Feb 1 15:43:32 2012
New Revision: 1239177
URL: http://svn.apache.org/viewvc?rev=1239177&view=rev
Log:
[NPANDAY-452] Add Silverlight support to the ASP.NET plugin, remove workaround in POM generator
Modified:
incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/ASPNetPomConverter.cs
incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/aspnet-webapp-binaries.xml
Modified: incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/ASPNetPomConverter.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/ASPNetPomConverter.cs?rev=1239177&r1=1239176&r2=1239177&view=diff
==============================================================================
--- incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/ASPNetPomConverter.cs (original)
+++ incubator/npanday/trunk/dotnet/assemblies/NPanday.ProjectImporter/Engine/src/main/csharp/Converter/Algorithms/ASPNetPomConverter.cs Wed Feb 1 15:43:32 2012
@@ -67,27 +67,6 @@ namespace NPanday.ProjectImporter.Conver
dep.type = "silverlight-application";
dep.scope = "runtime";
AddDependency(dep);
-
- if (!outputs.ContainsKey(app.TargetDirectory))
- {
- outputs.Add(app.TargetDirectory, new List<string>());
- }
- outputs[app.TargetDirectory].Add(dep.artifactId);
- }
-
- // TODO: would be good for ASP.NET plugin to handle this natively from the above dependencies, direct to target/packages
- Plugin dependencyPlugin = AddPlugin("org.apache.maven.plugins", "maven-dependency-plugin", null, false);
- foreach (string targetDirectory in outputs.Keys)
- {
- Dictionary<string, string> configuration = new Dictionary<string, string>();
- configuration.Add("includeTypes", "silverlight-application");
- configuration.Add("includeArtifactIds", string.Join(",", outputs[targetDirectory].ToArray()));
- configuration.Add("outputDirectory", targetDirectory);
- configuration.Add("overWriteReleases", "true");
- configuration.Add("overWriteSnapshots", "true");
- configuration.Add("stripVersion", "true");
-
- AddPluginExecution(dependencyPlugin, "copy-silverlight", new string[] { "copy-dependencies" }, "prepare-package", configuration);
}
}
Modified: incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/aspnet-webapp-binaries.xml
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/aspnet-webapp-binaries.xml?rev=1239177&r1=1239176&r2=1239177&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/aspnet-webapp-binaries.xml (original)
+++ incubator/npanday/trunk/plugins/aspnet-maven-plugin/src/main/resources/assemblies/components/aspnet-webapp-binaries.xml Wed Feb 1 15:43:32 2012
@@ -24,8 +24,21 @@
<useProjectArtifact>true</useProjectArtifact>
<useTransitiveDependencies>true</useTransitiveDependencies>
<scope>runtime</scope>
+ <excludes>
+ <exclude>*:*:silverlight-application</exclude>
+ </excludes>
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<outputDirectory>bin</outputDirectory>
</dependencySet>
+ <dependencySet>
+ <useProjectArtifact>true</useProjectArtifact>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ <scope>runtime</scope>
+ <includes>
+ <include>*:*:silverlight-application</include>
+ </includes>
+ <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <outputDirectory>ClientBin</outputDirectory>
+ </dependencySet>
</dependencySets>
</component>
\ No newline at end of file