svn commit: r511935 - /incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Author: sisbell Date: Mon Feb 26 10:04:52 2007 New Revision: 511935 URL: http://svn.apache.org/viewvc?view=rev&rev=511935 Log: Fixed artifact installer to handle GAC: it removes the GAC dependency before installing into local repo. Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=511935&r1=511934&r2=511935 == --- incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java Mon Feb 26 10:04:52 2007 @@ -24,6 +24,7 @@ import org.apache.maven.dotnet.artifact.ApplicationConfig; import org.apache.maven.project.MavenProject; import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.artifact.metadata.ArtifactMetadata; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.artifact.installer.ArtifactInstallationException; @@ -45,6 +46,7 @@ import java.io.FileReader; import java.util.List; import java.util.ArrayList; +import java.util.Collections; /** * Provides an implementation of the ArtifactInstaller interface. @@ -121,6 +123,18 @@ ApplicationConfig applicationConfig = artifactContext.getApplicationConfigFor( artifact ); File configExeFile = new File( applicationConfig.getConfigDestinationPath() ); +//TODO: Remove GAC dependencies before installing. This should be removed and replaced with solution in the core. +artifact.getMetadataList().clear(); +try +{ +artifact.addMetadata( createArtifactMetadataFor( artifact, pomFile, project.getDependencies() ) ); +} +catch ( IOException e ) +{ +throw new ArtifactInstallationException( "NMAVEN-002-001: Unable to add metadata to artifact", e ); +} +//End GAC HACK + if ( configExeFile.exists() ) { logger.info( "NMAVEN-002-000: Found config executable: File = " + configExeFile.getAbsolutePath() ); @@ -343,10 +357,21 @@ e.printStackTrace(); throw new IOException( "NMAVEN-002-013: Unable to read pom file" ); } +List dest = new ArrayList(); +dest.addAll( model.getDependencies()); +for ( Dependency dependency : dest ) +{ +model.removeDependency( dependency ); +} for ( Dependency dependency : dependencies ) { -model.addDependency( dependency ); +//TODO: This condition is only here since transitive gac dependencies break the build. This needs to be fixed +//within the core. +if ( !dependency.getType().equals( "gac" ) ) +{ +model.addDependency( dependency ); +} } File tempFile = File.createTempFile( "mvninstall", ".pom" );
svn commit: r512011 - /incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
Author: sisbell Date: Mon Feb 26 12:59:35 2007 New Revision: 512011 URL: http://svn.apache.org/viewvc?view=rev&rev=512011 Log: Fixed bug NMAVEN_10: Unit test handles testing of .NET module. Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java?view=diff&rev=512011&r1=512010&r2=512011 == --- incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java Mon Feb 26 12:59:35 2007 @@ -133,6 +133,13 @@ { artifacts.add( project.getArtifact() ); } + +if ( config.isTestCompile() && +project.getArtifact().getType().equals( ArtifactType.MODULE.getArtifactTypeName() ) && +project.getArtifact().getFile() != null && project.getArtifact().getFile().exists() ) +{ +artifacts.add( project.getArtifact() ); +} return artifacts; } @@ -153,7 +160,7 @@ { if ( config.isTestCompile() && config.getArtifactType().equals( ArtifactType.LIBRARY ) && project.getArtifact().getFile() != null && project.getArtifact().getFile().exists() && -!libraries.contains( project.getArtifact() ) ) +!libraries.contains( project.getArtifact() ) && !project.getArtifact().getType().equals( "module" ) ) { libraries.add( project.getArtifact() ); }
svn commit: r512021 - in /incubator/nmaven/branches/SI_IDE/assemblies: NMaven.Core/pom.xml NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs NMaven.Model/Pom/pom.xml NMaven.Plugin.Solution
Author: sisbell Date: Mon Feb 26 13:38:45 2007 New Revision: 512021 URL: http://svn.apache.org/viewvc?view=rev&rev=512021 Log: Changed library types to module types. Did this as a work-around to NMaven-9: we can use the existing code that handles adding module dependencies to executables both within the target directory and the local maven repo. Only downside is that each plugin will have a copy of the .netmodules, resulting in duplicate modules to download. Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml?view=diff&rev=512021&r1=512020&r2=512021 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/pom.xml Mon Feb 26 13:38:45 2007 @@ -2,14 +2,14 @@ 4.0.0 NMaven.Core NMaven.Core - library + module 0.14 NMaven.Core NMaven.Model NMaven.Model.Pom - library + module 0.14 @@ -37,4 +37,29 @@ + + + + + +debug + + + + + +org.apache.maven.dotnet.plugins +maven-compile-plugin +true + + +/debug+ + + + + + + + + Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs?view=diff&rev=512021&r1=512020&r2=512021 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs Mon Feb 26 13:38:45 2007 @@ -121,7 +121,18 @@ groupProject.AddNewProperty( "OutputPath", assemblyOutputPath, false); project.AddNewImport(@"$(MSBuildBinPath)\Microsoft.CSharp.Targets", null); - +DirectoryInfo configDirectory = new DirectoryInfo(Environment.CurrentDirectory + @"\src\main\config"); +if(configDirectory.Exists) +{ + BuildItemGroup configGroup = project.AddNewItemGroup(); + foreach(FileInfo fileInfo in configDirectory.GetFiles()) + { + if(fileInfo.Extension.Equals("exe.config")) + { + configGroup.AddNewItem("None", @"src\main\config\" + fileInfo.Name); + } + } +} addProjectDependencies(project, model, sourceFileDirectory); addFoldersToProject(project, null, sourceFileDirectory, sourceFileDirectory); addClassFilesToProject(project, null, sourceFileDirectory, sourceFileDirectory); @@ -240,6 +251,7 @@ if (type.Equals("library")) return "Library"; else if (type.Equals("exe")) return "Exe"; else if (type.Equals("winexe")) return "WinExe"; + else if (type.Equals("module")) return "Module"; return null; } Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml?view=diff&rev=512021&r1=512020&r2=512021 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Model/Pom/pom.xml Mon Feb 26 13:38:45 2007 @@ -2,7 +2,7 @@ 4.0.0 NMaven.Model NMaven.Model.Pom - library + module 0.14 NMaven.Model.Pom Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml?view=diff&rev=512021&r1=512020&r2=
svn commit: r512063 - in /incubator/nmaven/branches/SI_IDE: ./ assemblies/ assemblies/NMaven.Plugin.Resx/ assemblies/NMaven.Plugin.Settings/ assemblies/NMaven.Plugin.Solution/ components/dotnet-core/s
Author: sisbell Date: Mon Feb 26 15:03:55 2007 New Revision: 512063 URL: http://svn.apache.org/viewvc?view=rev&rev=512063 Log: Moved over the .NET plugins into the assembly directory: changed bootstrap build. Added: incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml (with props) Removed: incubator/nmaven/branches/SI_IDE/plugins/nmaven-utility-resx/ incubator/nmaven/branches/SI_IDE/plugins/nmaven-utility-settings/ Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/pom.xml incubator/nmaven/branches/SI_IDE/bootstrap-build.bat incubator/nmaven/branches/SI_IDE/components/dotnet-core/src/main/resources/META-INF/nmaven/net-dependencies.xml incubator/nmaven/branches/SI_IDE/maven-dotnet.iml incubator/nmaven/branches/SI_IDE/maven-dotnet.ipr incubator/nmaven/branches/SI_IDE/plugins/imports/nunit-2.0/nunit.framework.dll incubator/nmaven/branches/SI_IDE/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java incubator/nmaven/branches/SI_IDE/plugins/maven-settings-plugin/src/main/java/org/apache/maven/dotnet/plugin/settings/SettingsGeneratorMojo.java incubator/nmaven/branches/SI_IDE/plugins/pom.xml incubator/nmaven/branches/SI_IDE/plugins/scripts/build-2.0.bat Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml?view=diff&rev=512063&r1=512062&r2=512063 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/pom.xml Mon Feb 26 15:03:55 2007 @@ -1,7 +1,7 @@ http://maven.apache.org/POM/4.0.0";> 4.0.0 -NMaven.Plugin.ResX -RexPlugin +NMaven.Plugin +NMaven.Plugin.Resx exe 0.14 NMaven.Plugin.ResX Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml?view=diff&rev=512063&r1=512062&r2=512063 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Settings/pom.xml Mon Feb 26 15:03:55 2007 @@ -1,7 +1,7 @@ http://maven.apache.org/POM/4.0.0";> 4.0.0 -NMaven.Plugin.Settings -SettingsPlugin +NMaven.Plugin +NMaven.Plugin.Settings exe 0.14 NMaven.Plugin.Settings Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml?view=diff&rev=512063&r1=512062&r2=512063 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml Mon Feb 26 15:03:55 2007 @@ -1,7 +1,7 @@ http://maven.apache.org/POM/4.0.0";> 4.0.0 -NMaven.Plugin.Solution -SolutionPlugin +NMaven.Plugin +NMaven.Plugin.Solution exe 0.14 NMaven.Plugin.Solution Added: incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml?view=auto&rev=512063 == --- incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml (added) +++ incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml Mon Feb 26 15:03:55 2007 @@ -0,0 +1,30 @@ +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +4.0.0 +org.apache.maven.dotnet.plugins +maven-dotnet-plugins +pom +0.14-SNAPSHOT +maven-dotnet-plugins + +NMaven.Plugin.Resx +NMaven.Plugin.Settings + + + +org.apache.maven.dotnet +dotnet-assembler +0.14-SNAPSHOT + + +org.apache.maven.dotnet +dotnet-executable +0.14-SNAPSHOT + + +org.apache.maven.dotnet +dotnet-artifact +0.14-SNAPSHOT + + + \ No newline at end of file Propchange: incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml -
svn commit: r512117 - /incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
Author: sisbell Date: Mon Feb 26 18:29:35 2007 New Revision: 512117 URL: http://svn.apache.org/viewvc?view=rev&rev=512117 Log: Fixed bug where GAC dependency breaks build on multi-module builds. Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java Modified: incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=512117&r1=512116&r2=512117 == --- incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java (original) +++ incubator/nmaven/branches/SI_IDE/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java Mon Feb 26 18:29:35 2007 @@ -127,6 +127,16 @@ artifact.getMetadataList().clear(); try { +List dependencies = project.getDependencies(); +List newDependencies = new ArrayList(); +for(Dependency dependency : dependencies) +{ +if(!dependency.getType().equals("gac")) +{ +newDependencies.add( dependency ); +} +} +project.setDependencies( newDependencies ); artifact.addMetadata( createArtifactMetadataFor( artifact, pomFile, project.getDependencies() ) ); } catch ( IOException e )
svn commit: r512118 - in /incubator/nmaven/branches/SI_IDE: ./ assemblies/ assemblies/NMaven.Plugin.Resx/src/main/config/ assemblies/NMaven.Plugin.Solution/
Author: sisbell Date: Mon Feb 26 18:40:51 2007 New Revision: 512118 URL: http://svn.apache.org/viewvc?view=rev&rev=512118 Log: Build now works with a -DwithIde option, using a profile within the pom. Adding this option will compile the .NET assemblies used for generating csproj files. This requires MS/Windows/.NET 2.0, so we need a profile so that the bootstrap build does not break for everyone else. Added: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config (with props) Removed: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/resx.exe.config Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml incubator/nmaven/branches/SI_IDE/assemblies/pom-net-bootstrap.xml incubator/nmaven/branches/SI_IDE/assemblies/pom.xml incubator/nmaven/branches/SI_IDE/bootstrap-build.bat Added: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config?view=auto&rev=512118 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config (added) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config Mon Feb 26 18:40:51 2007 @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config -- svn:eol-style = native Modified: incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml?view=diff&rev=512118&r1=512117&r2=512118 == --- incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml (original) +++ incubator/nmaven/branches/SI_IDE/assemblies/NMaven.Plugin.Solution/pom.xml Mon Feb 26 18:40:51 2007 @@ -1,40 +1,39 @@ http://maven.apache.org/POM/4.0.0";> -4.0.0 -NMaven.Plugin -NMaven.Plugin.Solution -exe -0.14 -NMaven.Plugin.Solution - - -org.nunit -nunit.framework -2.2.8.0 -library - - -NMaven.Core -NMaven.Core -0.14 -module - + 4.0.0 + NMaven.Plugin + NMaven.Plugin.Solution + exe + 0.14 + NMaven.Plugin.Solution + + + org.nunit + nunit.framework + 2.2.8.0 + library + + + NMaven.Core + NMaven.Core + 0.14 + module + NMaven.Model NMaven.Model.Pom module 0.14 - - - -src/main/csharp -src/test/csharp - - -org.apache.maven.dotnet.plugins -maven-compile-plugin -true - - - + + +src/main/csharp +src/test/csharp + + +org.apache.maven.dotnet.plugins +maven-compile-plugin +true + + + Modified: incubator/nmaven/branches/SI_IDE/assemblies/pom-net-