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/06/20 22:52:43 UTC
svn commit: r549287 - in
/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution:
javabinding/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java pom.xml
src/main/csharp/NMaven/Plugin/Solution/SolutionMojo.cs
Author: sisbell
Date: Wed Jun 20 15:52:42 2007
New Revision: 549287
URL: http://svn.apache.org/viewvc?view=rev&rev=549287
Log:
Uses the NMaven.Solution classes rather than the NMaven.Core classes.
Modified:
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/Plugin/Solution/SolutionMojo.cs
Modified: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java?view=diff&rev=549287&r1=549286&r2=549287
==============================================================================
--- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java (original)
+++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java Wed Jun 20 15:52:42 2007
@@ -9,6 +9,13 @@
public class SolutionMojo
extends org.apache.maven.dotnet.plugin.AbstractMojo
{
+
+ /**
+ * @parameter expression = "${settings.localRepository}"
+ */
+ @FieldAnnotation()
+ public java.lang.String localRep;
+
/**
* @parameter expression = "${basedir}"
*/
Modified: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/pom.xml?view=diff&rev=549287&r1=549286&r2=549287
==============================================================================
--- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/pom.xml (original)
+++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/pom.xml Wed Jun 20 15:52:42 2007
@@ -35,8 +35,8 @@
<type>library</type>
</dependency>
<dependency>
- <groupId>NMaven.Core</groupId>
- <artifactId>NMaven.Core</artifactId>
+ <groupId>NMaven</groupId>
+ <artifactId>NMaven.Solution</artifactId>
<version>${pom.version}</version>
<type>library</type>
</dependency>
Modified: incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/Plugin/Solution/SolutionMojo.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/Plugin/Solution/SolutionMojo.cs?view=diff&rev=549287&r1=549286&r2=549287
==============================================================================
--- incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/Plugin/Solution/SolutionMojo.cs (original)
+++ incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/Plugin/Solution/SolutionMojo.cs Wed Jun 20 15:52:42 2007
@@ -23,8 +23,7 @@
using System.Xml;
using System.Xml.Serialization;
-using NMaven.Core;
-using NMaven.Core.Impl;
+using NMaven.Solution;
using NMaven.Plugin;
namespace NMaven.Plugin.Solution
@@ -39,7 +38,10 @@
public SolutionMojo()
{
}
-
+
+ [FieldAttribute("localRepo", Expression = "${settings.localRepository}", Type = "java.lang.String")]
+ public String localRepository;
+
[FieldAttribute("basedir", Expression = "${basedir}", Type = "java.lang.String")]
public String basedir;
@@ -55,7 +57,7 @@
public override void Execute()
{
- IProjectGenerator projectGenerator = new ProjectGeneratorImpl();
+ IProjectGenerator projectGenerator = Factory.createDefaultProjectGenerator();
FileInfo pomFileInfo = new FileInfo(basedir + @"\pom.xml");
List<IProjectReference> projectReferences = Execute(new DirectoryInfo(pomFileInfo.DirectoryName),
mavenProject, profile);
@@ -85,7 +87,7 @@
}
List<IProjectReference> projectReferences = new List<IProjectReference>();
- IProjectGenerator projectGenerator = new ProjectGeneratorImpl();
+ IProjectGenerator projectGenerator =Factory.createDefaultProjectGenerator();
if(model.packaging.Equals("pom"))
{
foreach(String module in GetModulesForProfile(profile, model))
@@ -105,7 +107,7 @@
new DirectoryInfo(currentDirectory.FullName + @"\src\main\csharp\"),
model.artifactId, null);
Console.WriteLine("NMAVEN-000-000: Generated project: File Name = "
- + mainProjectReference.CsProjFile.FullName);
+ + mainProjectReference.CSProjectFile.FullName);
projectReferences.Add(mainProjectReference);
}
if(new DirectoryInfo( currentDirectory.FullName + @"\src\test\csharp\").Exists)
@@ -120,7 +122,7 @@
new DirectoryInfo(currentDirectory.FullName + @"\src\test\csharp\"),
model.artifactId + "-Test", mainRef);
Console.WriteLine("NMAVEN-000-000: Generated test project: File Name = "
- + projectReference.CsProjFile.FullName);
+ + projectReference.CSProjectFile.FullName);
projectReferences.Add(projectReference);
}
}