incubator-nmaven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sisb...@apache.org
Subject svn commit: r559342 - in /incubator/nmaven/branches/SI_GAC: assemblies/NMaven.Artifact/ assemblies/NMaven.Artifact/src/main/csharp/ assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/ assemblies/NMaven.Solution/ components/dotnet-artifact/src/m...
Date Wed, 25 Jul 2007 07:26:56 GMT
Author: sisbell
Date: Wed Jul 25 00:26:51 2007
New Revision: 559342

URL: http://svn.apache.org/viewvc?view=rev&rev=559342
Log:
Assemblies now use new repo format. Fixed the solution plugin.

Modified:
    incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/NMaven.Artifact.sln
    incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj
    incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/ArtifactContext.cs
    incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/IArtifactContext.cs
    incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/IProjectGenerator.cs
    incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/ProjectGeneratorImpl.cs
    incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/pom.xml
    incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
    incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
    incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
    incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImplTest.java
    incubator/nmaven/branches/SI_GAC/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
    incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs
    incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java
    incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/pom.xml
    incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/Plugin/Solution/SolutionMojo.cs

Modified: incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/NMaven.Artifact.sln
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/NMaven.Artifact.sln?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/NMaven.Artifact.sln (original)
+++ incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/NMaven.Artifact.sln Wed Jul
25 00:26:51 2007
@@ -1,19 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Artifact", "C:\Documents and
Settings\shane\nmaven-apache\trunk-fix\assemblies\NMaven.Artifact\src\main\csharp\NMaven.Artifact.csproj",
"{819ACFA7-3FFC-4681-B169-1954486E7CB5}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Artifact-Test", "C:\Documents
and Settings\shane\nmaven-apache\trunk-fix\assemblies\NMaven.Artifact\src\test\csharp\NMaven.Artifact-Test.csproj",
"{3C1CA733-CFC6-4256-A767-37FFE8CBD21A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NMaven.Artifact", "C:\Documents and
Settings\shane\nmaven-apache\SI_GAC\assemblies\NMaven.Artifact\src\main\csharp\NMaven.Artifact.csproj",
"{701803D4-90F5-44D7-919D-4844FEB7F936}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{819ACFA7-3FFC-4681-B169-1954486E7CB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{819ACFA7-3FFC-4681-B169-1954486E7CB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C1CA733-CFC6-4256-A767-37FFE8CBD21A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C1CA733-CFC6-4256-A767-37FFE8CBD21A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{701803D4-90F5-44D7-919D-4844FEB7F936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{701803D4-90F5-44D7-919D-4844FEB7F936}.Debug|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj
(original)
+++ incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj
Wed Jul 25 00:26:51 2007
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectGuid>{819ACFA7-3FFC-4681-B169-1954486E7CB5}</ProjectGuid>
+    <ProjectGuid>{701803D4-90F5-44D7-919D-4844FEB7F936}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <RootNameSpace>NMaven.Artifact</RootNameSpace>
     <AssemblyName>NMaven.Artifact</AssemblyName>
@@ -12,10 +12,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NMaven.Model.Pom" />
-    <Reference Include="NUnit.Framework, Version=2.2.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\.m2\repository\NUnit\NUnit.Framework\2.2.8.0\NUnit.Framework.dll</HintPath>
-    </Reference>
+    <Reference Include="NUnit.Framework" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
@@ -30,6 +27,7 @@
     <Compile Include="NMaven\Artifact\AssemblyRepositoryLayout.cs" />
     <Compile Include="NMaven\Artifact\IArtifactContext.cs" />
     <Compile Include="NMaven\Artifact\JavaRepositoryLayout.cs" />
+    <Compile Include="NMaven\Artifact\PathUtil.cs" />
     <Compile Include="NMaven\Artifact\RepositoryType.cs" />
   </ItemGroup>
   <ItemGroup />

Modified: incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/ArtifactContext.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/ArtifactContext.cs?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/ArtifactContext.cs
(original)
+++ incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/ArtifactContext.cs
Wed Jul 25 00:26:51 2007
@@ -10,7 +10,6 @@
     public sealed class ArtifactContext : IArtifactContext
     {
 
-        //public void Init(File
         public ArtifactRepository GetArtifactRepository()
         {
             ArtifactRepository artifactRepository = new ArtifactRepository();
@@ -38,7 +37,7 @@
             return artifact;
         }
 
-        private string GetExtensionFor(string packaging)
+        public String GetExtensionFor(String packaging)
         {
             if (packaging.Equals("library") || packaging.Equals("netplugin")
                 || packaging.Equals("visual-studio-addin") || packaging.Equals("sharp-develop-addin"))

Modified: incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/IArtifactContext.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/IArtifactContext.cs?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/IArtifactContext.cs
(original)
+++ incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/IArtifactContext.cs
Wed Jul 25 00:26:51 2007
@@ -11,5 +11,7 @@
         Artifact GetArtifactFor(NMaven.Model.Model model);
 
         Artifact CreateArtifact(String groupId, String artifactId, String version, String
packaging);
+
+        String GetExtensionFor(String packaging);
     }
 }

Modified: incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/IProjectGenerator.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/IProjectGenerator.cs?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/IProjectGenerator.cs (original)
+++ incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/IProjectGenerator.cs Wed Jul
25 00:26:51 2007
@@ -44,7 +44,8 @@
 		IProjectReference GenerateProjectFor(NMaven.Model.Model model, 
 		                            DirectoryInfo sourceFileDirectory,
 		                            string projectFileName,
-                                    ICollection<IProjectReference> projectReferences);
+                                    ICollection<IProjectReference> projectReferences,
+                                    DirectoryInfo localRepository);
 		
         /// <summary>
         /// Generates a solution file that references the specified projects.

Modified: incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/ProjectGeneratorImpl.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/ProjectGeneratorImpl.cs?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/ProjectGeneratorImpl.cs (original)
+++ incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/ProjectGeneratorImpl.cs Wed
Jul 25 00:26:51 2007
@@ -26,6 +26,7 @@
 
 using Microsoft.Build.BuildEngine;
 
+using NMaven.Artifact;
 using NMaven.Solution;
 using NMaven.Model;
 
@@ -47,7 +48,8 @@
 	    public IProjectReference GenerateProjectFor(NMaven.Model.Model model, 
 		                                  DirectoryInfo sourceFileDirectory,
 		                                  String projectFileName,
-		                                  ICollection<IProjectReference> projectReferences)
+		                                  ICollection<IProjectReference> projectReferences,
+		                                  DirectoryInfo localRepository)
 	    {		
 			Guid projectGuid = Guid.NewGuid();
 
@@ -62,7 +64,8 @@
 			                                         projectGuid,
 			                                         @"..\..\..\target\bin\Debug\", 
 			                                         @"..\..\..\target\obj\",
-			                                         projectReferences);
+			                                         projectReferences,
+			                                         localRepository);
 			FileInfo fileInfo = new FileInfo(sourceFileDirectory.FullName + @"\" + projectFileName
+ ".csproj");
 		    project.Save(fileInfo.FullName);
 
@@ -127,7 +130,8 @@
 		                                       Guid projectGuid,
 		                                       String assemblyOutputPath,
 		                                       String baseIntermediateOutputPath,
-                                               ICollection<IProjectReference> projectReferences)
+                                               ICollection<IProjectReference> projectReferences,
+                                               DirectoryInfo localRepository)
 		{
 			if(model == null || sourceFileDirectory == null)
 			{
@@ -168,7 +172,7 @@
             		}
             	}
             }
-            AddProjectDependencies(project, model, sourceFileDirectory);
+            AddProjectDependencies(project, model, sourceFileDirectory, localRepository);
             AddFoldersToProject(project, null, sourceFileDirectory, sourceFileDirectory);
             AddClassFilesToProject(project, null, sourceFileDirectory, sourceFileDirectory);
             AddProjectReferences(project, assemblyName, projectReferences);
@@ -233,19 +237,21 @@
             }				
 		}
 		
-		private void AddProjectDependencies(Project project, NMaven.Model.Model model, DirectoryInfo
sourceFileDirectory) 
+		private void AddProjectDependencies(Project project, NMaven.Model.Model model, DirectoryInfo
sourceFileDirectory,
+		    DirectoryInfo localRepository)
 		{
 			BuildItemGroup group = project.AddNewItemGroup();
 			group.AddNewItem("Reference", "System.Xml");
 			if(model.dependencies != null) 
 			{
-				foreach(Dependency dependency in model.dependencies) {
-					String artifactExtension = (dependency.type == "module") ? "dll" : GetExtension(dependency.type);
-					String repoPath = Environment.GetEnvironmentVariable("SystemDrive") 
-					    + Environment.GetEnvironmentVariable("HOMEPATH") 
-						+ @"\.m2\repository\" + dependency.groupId.Replace(".", "\\")
-						+ "\\" + dependency.artifactId + "\\" + dependency.version + "\\" + dependency.artifactId
+ "." 
-						+ artifactExtension;
+			    ArtifactContext artifactContext = new ArtifactContext();
+				foreach(Dependency dependency in model.dependencies)
+				{
+					//String artifactExtension = (dependency.type == "module") ? "dll" : GetExtension(dependency.type);
+					NMaven.Artifact.Artifact dependencyArtifact = artifactContext.CreateArtifact(dependency.groupId,
+					    dependency.artifactId, dependency.version, dependency.type);
+
+					String repoPath = PathUtil.GetUserAssemblyCacheFileFor(dependencyArtifact, localRepository).FullName;
 					BuildItem buildItem = group.AddNewItem("Reference", dependency.artifactId);
 					//TODO: Fix this. Just because it is in the GAC on the system that builds the .csproj
does not mean 
 					//it is in the GAC on another system. 

Modified: incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/pom.xml?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Solution/pom.xml Wed Jul 25 00:26:51
2007
@@ -17,6 +17,12 @@
       <type>library</type>
       <version>0.14</version>
     </dependency>
+    <dependency>
+      <groupId>NMaven.Artifact</groupId>
+      <artifactId>NMaven.Artifact</artifactId>
+      <type>library</type>
+      <version>0.14</version>
+    </dependency>
       <dependency>
         <groupId>Microsoft.Build.Engine</groupId>
         <artifactId>Microsoft.Build.Engine</artifactId>

Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
(original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
Wed Jul 25 00:26:51 2007
@@ -85,11 +85,10 @@
      * Initializes the installer.
      *
      * @param artifactContext            the artifact context associated with this installer
-     * @param mavenProject               the maven project associated with the invoking plugin
      * @param remoteArtifactRepositories
      * @param localRepository            the location of the local maven repository
      */
-    void init( ArtifactContext artifactContext, MavenProject mavenProject,
-               List<ArtifactRepository> remoteArtifactRepositories, File localRepository
);
+    void init( ArtifactContext artifactContext, List<ArtifactRepository> remoteArtifactRepositories,
+               File localRepository );
 
 }

Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
(original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
Wed Jul 25 00:26:51 2007
@@ -30,7 +30,6 @@
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.resolver.*;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.project.MavenProject;
 
@@ -187,7 +186,7 @@
     {
         this.project = mavenProject;
         this.localRepository = localRepository.getAbsolutePath();
-        artifactInstaller.init( this, mavenProject, remoteArtifactRepositories, localRepository
);
+        artifactInstaller.init( this, remoteArtifactRepositories, localRepository );
         Map<String, ArtifactHandler> map = new HashMap<String, ArtifactHandler>();
         for ( ArtifactHandler artifactHandler : artifactHandlers )
         {

Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
(original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Wed Jul 25 00:26:51 2007
@@ -74,11 +74,6 @@
     private org.apache.maven.artifact.installer.ArtifactInstaller mavenInstaller;
 
     /**
-     * The maven project
-     */
-    private MavenProject project;
-
-    /**
      * Root path of the local Maven repository
      */
     private File localRepository;
@@ -369,13 +364,9 @@
         installArtifactWithPom( artifact, tempFile, false );
     }
 
-    /**
-     * @see org.apache.maven.dotnet.artifact.ArtifactInstaller#init(org.apache.maven.dotnet.artifact.ArtifactContext,org.apache.maven.project.MavenProject,java.util.List,
File
-     */
-    public void init( ArtifactContext artifactContext, MavenProject mavenProject,
-                      List<ArtifactRepository> remoteArtifactRepositories, File localRepository
)
+    public void init( ArtifactContext artifactContext, List<ArtifactRepository> remoteArtifactRepositories,
+                      File localRepository )
     {
-        this.project = mavenProject;
         this.remoteArtifactRepositories = remoteArtifactRepositories;
         this.localRepository = localRepository;
         this.artifactContext = artifactContext;

Modified: incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImplTest.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImplTest.java?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImplTest.java
(original)
+++ incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImplTest.java
Wed Jul 25 00:26:51 2007
@@ -20,7 +20,7 @@
     {
         File testRepo = new File( System.getProperty( "basedir" ), "target/test-repo/repository"
);
         ArtifactInstallerImpl artifactInstaller = new ArtifactInstallerImpl();
-        artifactInstaller.init( null, null, new ArrayList<ArtifactRepository>(), testRepo
);
+        artifactInstaller.init( null, new ArrayList<ArtifactRepository>(), testRepo
);
         ArtifactFactory stub = new ArtifactFactoryTestStub();
         artifactInstaller.initTest( stub, new DummyLogger() );
         Artifact artifact = stub.createArtifact( "NMaven.Model", "NMaven.Model.Pom", "1.0",
"compile", "library" );

Modified: incubator/nmaven/branches/SI_GAC/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
(original)
+++ incubator/nmaven/branches/SI_GAC/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
Wed Jul 25 00:26:51 2007
@@ -21,7 +21,6 @@
 import org.apache.maven.dotnet.registry.RepositoryRegistry;
 import org.apache.maven.dotnet.vendor.Vendor;
 import org.apache.maven.dotnet.model.netdependency.NetDependency;
-import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.Profile;
 import org.apache.maven.settings.Repository;
@@ -47,14 +46,6 @@
 {
 
     /**
-     * The maven project.
-     *
-     * @parameter expression="${project}"
-     * @required
-     */
-    private MavenProject project;
-
-    /**
      * The the path to the local maven repository.
      *
      * @parameter expression="${settings.localRepository}"
@@ -135,7 +126,7 @@
             remoteRepositories.add( new DefaultArtifactRepository( repository.getId(), repository.getUrl(),
                                                                    new DefaultRepositoryLayout()
) );
         }
-        artifactContext.init( project, remoteRepositories, new File( localRepository ) );
+        artifactContext.init( null, remoteRepositories, new File( localRepository ) );
 
         try
         {

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs
(original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs
Wed Jul 25 00:26:51 2007
@@ -52,11 +52,11 @@
 		}
 
 		public override void Execute()
-		{
-            ArtifactRepositoryLayout layout = new AssemblyRepositoryLayout();
+        {
             ArtifactContext artifactContext = new ArtifactContext();
-            NMaven.Artifact.Artifact artifact = artifactContext.GetArtifactFor(mavenProject);
-            FileInfo artifactFileInfo = new FileInfo(localRepository + @"\" + layout.pathOf(artifact));
+            FileInfo artifactFileInfo = PathUtil.GetPrivateApplicationBaseFileFor(artifactContext.GetArtifactFor(mavenProject),

+                new FileInfo(localRepository).Directory); 
+            
             Console.WriteLine("Artifact Path = " + artifactFileInfo.FullName);
 
             object[] extensibilityItems = new object[2];

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java
(original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/javabinding/src/main/java/NMaven/Plugin/Solution/SolutionMojo.java
Wed Jul 25 00:26:51 2007
@@ -14,7 +14,7 @@
         * @parameter expression = "${settings.localRepository}"
         */
         @FieldAnnotation()
-        public java.lang.String localRep;
+        public java.lang.String localRepo;
 
        /**
         * @parameter expression = "${basedir}"

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/pom.xml?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/pom.xml (original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/pom.xml Wed
Jul 25 00:26:51 2007
@@ -36,6 +36,12 @@
       <type>library</type>
     </dependency>
     <dependency>
+      <groupId>NMaven.Artifact</groupId>
+      <artifactId>NMaven.Artifact</artifactId>
+      <type>library</type>
+      <version>0.14</version>
+    </dependency>    
+    <dependency>
       <groupId>NMaven</groupId>
       <artifactId>NMaven.Solution</artifactId>
       <version>0.14</version>

Modified: incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/Plugin/Solution/SolutionMojo.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/Plugin/Solution/SolutionMojo.cs?view=diff&rev=559342&r1=559341&r2=559342
==============================================================================
--- incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/Plugin/Solution/SolutionMojo.cs
(original)
+++ incubator/nmaven/branches/SI_GAC/plugins/netplugins/NMaven.Plugin.Solution/src/main/csharp/NMaven/Plugin/Solution/SolutionMojo.cs
Wed Jul 25 00:26:51 2007
@@ -87,7 +87,7 @@
 			}
 			
 			List<IProjectReference> projectReferences = new List<IProjectReference>();
-			IProjectGenerator projectGenerator =Factory.createDefaultProjectGenerator();
+			IProjectGenerator projectGenerator = Factory.createDefaultProjectGenerator();
 			if(model.packaging.Equals("pom"))
 			{
 				foreach(String module in GetModulesForProfile(profile, model))
@@ -105,7 +105,7 @@
 					mainProjectReference = 
 			 			projectGenerator.GenerateProjectFor(model,
 			 	                                    new DirectoryInfo(currentDirectory.FullName + @"\src\main\csharp\"),
-			 	                                    model.artifactId, null);
+			 	                                    model.artifactId, null, new DirectoryInfo(localRepository));
 					Console.WriteLine("NMAVEN-000-000: Generated project: File Name = "
 					                  + mainProjectReference.CSProjectFile.FullName);
 					projectReferences.Add(mainProjectReference);
@@ -120,7 +120,7 @@
 					IProjectReference projectReference = 
 			 			projectGenerator.GenerateProjectFor(model,
 			 	                                    new DirectoryInfo(currentDirectory.FullName + @"\src\test\csharp\"),
-			 	                                    model.artifactId + "-Test", mainRef);
+			 	                                    model.artifactId + "-Test", mainRef, new DirectoryInfo(localRepository));
 					Console.WriteLine("NMAVEN-000-000: Generated test project: File Name = "
 					                  + projectReference.CSProjectFile.FullName);
 					projectReferences.Add(projectReference);					



Mime
View raw message