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/07/25 13:34:57 UTC
svn commit: r559454 [1/4] - in /incubator/nmaven/trunk: ./ archetypes/
archetypes/maven-archetype-dotnet-simple/
archetypes/maven-archetype-netexecutable/ assemblies/
assemblies/NMaven.Artifact/ assemblies/NMaven.Artifact/src/main/csharp/
assemblies/NM...
Author: sisbell
Date: Wed Jul 25 06:34:15 2007
New Revision: 559454
URL: http://svn.apache.org/viewvc?view=rev&rev=559454
Log:
Merge of SI_GAC branch to trunk.
Added:
incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/PathUtil.cs
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/PathUtil.cs
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/DummyResolver.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/DummyResolver.java
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/PathUtil.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/PathUtil.java
incubator/nmaven/trunk/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/impl/ArtifactFactoryTestStub.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/impl/ArtifactFactoryTestStub.java
incubator/nmaven/trunk/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImplTest.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImplTest.java
incubator/nmaven/trunk/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/impl/DummyLogger.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/impl/DummyLogger.java
incubator/nmaven/trunk/components/dotnet-artifact/src/test/resources/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/resources/
incubator/nmaven/trunk/components/dotnet-artifact/src/test/resources/uac/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/resources/uac/
incubator/nmaven/trunk/components/dotnet-artifact/src/test/resources/uac/gac_msil/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/resources/uac/gac_msil/
incubator/nmaven/trunk/components/dotnet-artifact/src/test/resources/uac/gac_msil/NMaven.Model.Pom/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/resources/uac/gac_msil/NMaven.Model.Pom/
incubator/nmaven/trunk/components/dotnet-artifact/src/test/resources/uac/gac_msil/NMaven.Model.Pom/1.0__NMaven.Model/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/resources/uac/gac_msil/NMaven.Model.Pom/1.0__NMaven.Model/
incubator/nmaven/trunk/components/dotnet-artifact/src/test/resources/uac/gac_msil/NMaven.Model.Pom/1.0__NMaven.Model/NMaven.Model.Pom.dll
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/resources/uac/gac_msil/NMaven.Model.Pom/1.0__NMaven.Model/NMaven.Model.Pom.dll
incubator/nmaven/trunk/components/dotnet-artifact/src/test/resources/uac/gac_msil/NMaven.Test/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/resources/uac/gac_msil/NMaven.Test/
incubator/nmaven/trunk/components/dotnet-artifact/src/test/resources/uac/gac_msil/NMaven.Test/1.0__NMaven/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/resources/uac/gac_msil/NMaven.Test/1.0__NMaven/
incubator/nmaven/trunk/components/dotnet-artifact/src/test/resources/uac/gac_msil/NMaven.Test/1.0__NMaven/NMaven.Test.dll
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-artifact/src/test/resources/uac/gac_msil/NMaven.Test/1.0__NMaven/NMaven.Test.dll
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/null.properties (with props)
incubator/nmaven/trunk/components/dotnet-dao/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/
incubator/nmaven/trunk/components/dotnet-dao/project/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/
incubator/nmaven/trunk/components/dotnet-dao/project/pom.xml
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/pom.xml
incubator/nmaven/trunk/components/dotnet-dao/project/src/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectDao.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectUri.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/ProjectUri.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImpl.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectFactory.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/java/org/apache/maven/dotnet/dao/impl/ProjectFactory.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/resources/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/resources/
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/resources/META-INF/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/resources/META-INF/
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/resources/META-INF/plexus/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/resources/META-INF/plexus/
incubator/nmaven/trunk/components/dotnet-dao/project/src/main/resources/META-INF/plexus/components.xml
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/main/resources/META-INF/plexus/components.xml
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ArtifactFactoryTestStub.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ArtifactFactoryTestStub.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/ProjectDaoImplTest.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/java/org/apache/maven/dotnet/dao/impl/WagonManagerTestStub.java
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test-1.0.0.xml
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test-1.0.0.xml
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test2-1.0.0.xml
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test2-1.0.0.xml
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test3-1.0.0.xml
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test3-1.0.0.xml
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test4-1.0.0.xml
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/NMaven-NMaven.Test4-1.0.0.xml
incubator/nmaven/trunk/components/dotnet-dao/project/src/test/resources/pom.xml
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-dao/project/src/test/resources/pom.xml
incubator/nmaven/trunk/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/ConnectionsRepository.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/ConnectionsRepository.java
incubator/nmaven/trunk/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObject.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObject.java
incubator/nmaven/trunk/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObjectRegistry.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/DataAccessObjectRegistry.java
incubator/nmaven/trunk/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/DataAccessObjectRegistryImpl.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/DataAccessObjectRegistryImpl.java
incubator/nmaven/trunk/components/dotnet-repository/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/
incubator/nmaven/trunk/components/dotnet-repository/pom.xml
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/pom.xml
incubator/nmaven/trunk/components/dotnet-repository/src/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/
incubator/nmaven/trunk/components/dotnet-repository/src/main/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/
incubator/nmaven/trunk/components/dotnet-repository/src/main/java/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/
incubator/nmaven/trunk/components/dotnet-repository/src/main/java/org/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/
incubator/nmaven/trunk/components/dotnet-repository/src/main/java/org/apache/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/
incubator/nmaven/trunk/components/dotnet-repository/src/main/java/org/apache/maven/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/
incubator/nmaven/trunk/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/
incubator/nmaven/trunk/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/
incubator/nmaven/trunk/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Project.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Project.java
incubator/nmaven/trunk/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/ProjectDependency.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/ProjectDependency.java
incubator/nmaven/trunk/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Requirement.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/main/java/org/apache/maven/dotnet/repository/Requirement.java
incubator/nmaven/trunk/components/dotnet-repository/src/test/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/test/
incubator/nmaven/trunk/components/dotnet-repository/src/test/java/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/test/java/
incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/test/java/org/
incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/test/java/org/apache/
incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/test/java/org/apache/maven/
incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/
incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/
- copied from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/
incubator/nmaven/trunk/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/JdoTest.java
- copied unchanged from r559433, incubator/nmaven/branches/SI_GAC/components/dotnet-repository/src/test/java/org/apache/maven/dotnet/repository/JdoTest.java
Removed:
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayout.java
incubator/nmaven/trunk/components/dotnet-artifact/src/test/java/org/apache/maven/dotnet/artifact/AssemblyRepositoryLayoutTest.java
incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/GacInstallerMojo.java
incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/TargetModuleInstallerMojo.java
Modified:
incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml
incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml
incubator/nmaven/trunk/archetypes/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Artifact/NMaven.Artifact.sln
incubator/nmaven/trunk/assemblies/NMaven.Artifact/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj
incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/ArtifactContext.cs
incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/AssemblyRepositoryLayout.cs
incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/IArtifactContext.cs
incubator/nmaven/trunk/assemblies/NMaven.IDE/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj
incubator/nmaven/trunk/assemblies/NMaven.Logging/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Model/AutomationExtensibility/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Plugin.Loader/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/src/main/resources/resgen/pom-java.xml
incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.Solution/IProjectGenerator.cs
incubator/nmaven/trunk/assemblies/NMaven.Solution/NMaven.Solution.csproj
incubator/nmaven/trunk/assemblies/NMaven.Solution/ProjectGeneratorImpl.cs
incubator/nmaven/trunk/assemblies/NMaven.Solution/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/pom.xml
incubator/nmaven/trunk/assemblies/NMaven.VisualStudio/pom.xml
incubator/nmaven/trunk/assemblies/pom.xml
incubator/nmaven/trunk/components/dotnet-artifact/pom.xml
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactMatchPolicy.java
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactContextImpl.java
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java
incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/AssemblyResolverImpl.java
incubator/nmaven/trunk/components/dotnet-artifact/src/main/resources/META-INF/plexus/components.xml
incubator/nmaven/trunk/components/dotnet-assembler/pom.xml
incubator/nmaven/trunk/components/dotnet-core/pom.xml
incubator/nmaven/trunk/components/dotnet-core/src/main/resources/META-INF/nmaven/registry-config.xml
incubator/nmaven/trunk/components/dotnet-embedder/README.txt
incubator/nmaven/trunk/components/dotnet-embedder/build.bat
incubator/nmaven/trunk/components/dotnet-embedder/pom.xml
incubator/nmaven/trunk/components/dotnet-executable/pom.xml
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/compiler/impl/DefaultCompiler.java
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/CompilerContextImpl.java
incubator/nmaven/trunk/components/dotnet-executable/src/main/java/org/apache/maven/dotnet/executable/impl/NetExecutableFactoryImpl.java
incubator/nmaven/trunk/components/dotnet-jetty/pom.xml
incubator/nmaven/trunk/components/dotnet-jetty/src/main/java/org/apache/maven/dotnet/jetty/JettyStarter.java
incubator/nmaven/trunk/components/dotnet-model/assembly-plugins/pom.xml
incubator/nmaven/trunk/components/dotnet-model/compiler-plugins/pom.xml
incubator/nmaven/trunk/components/dotnet-model/configuration-appenders/pom.xml
incubator/nmaven/trunk/components/dotnet-model/entries/pom.xml
incubator/nmaven/trunk/components/dotnet-model/executable-plugins/pom.xml
incubator/nmaven/trunk/components/dotnet-model/netdependency/pom.xml
incubator/nmaven/trunk/components/dotnet-model/pom.xml
incubator/nmaven/trunk/components/dotnet-model/settings/pom.xml
incubator/nmaven/trunk/components/dotnet-plugin/pom.xml
incubator/nmaven/trunk/components/dotnet-registry/pom.xml
incubator/nmaven/trunk/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/RepositoryRegistry.java
incubator/nmaven/trunk/components/dotnet-registry/src/main/java/org/apache/maven/dotnet/registry/impl/RepositoryRegistryImpl.java
incubator/nmaven/trunk/components/dotnet-registry/src/main/resources/META-INF/plexus/components.xml
incubator/nmaven/trunk/components/dotnet-service/embedder/pom.xml
incubator/nmaven/trunk/components/dotnet-vendor/pom.xml
incubator/nmaven/trunk/components/pom.xml
incubator/nmaven/trunk/maven-dotnet.iml
incubator/nmaven/trunk/plugins/maven-compile-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/CompilerMojo.java
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/java/org/apache/maven/dotnet/plugin/compile/ComponentInitializerMojo.java
incubator/nmaven/trunk/plugins/maven-compile-plugin/src/main/resources/META-INF/plexus/components.xml
incubator/nmaven/trunk/plugins/maven-deploy-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployFileMojo.java
incubator/nmaven/trunk/plugins/maven-embedder-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-embedder-plugin/src/main/java/org/apache/maven/dotnet/plugin/embedder/EmbedderStarterMojo.java
incubator/nmaven/trunk/plugins/maven-fxcop-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopAggregateMojo.java
incubator/nmaven/trunk/plugins/maven-fxcop-plugin/src/main/java/org/apache/maven/dotnet/plugin/fxcop/FxCopMojo.java
incubator/nmaven/trunk/plugins/maven-install-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/FileInstallerMojo.java
incubator/nmaven/trunk/plugins/maven-install-plugin/src/main/java/org/apache/maven/dotnet/plugin/install/InstallerMojo.java
incubator/nmaven/trunk/plugins/maven-link-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-mojo-generator-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-repository-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-resgen-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-resgen-plugin/src/main/java/org/apache/maven/dotnet/plugin/resgen/ResourceGeneratorMojo.java
incubator/nmaven/trunk/plugins/maven-resolver-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-resolver-plugin/src/main/java/org/apache/maven/dotnet/plugin/resolver/NetDependencyResolverMojo.java
incubator/nmaven/trunk/plugins/maven-test-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-test-plugin/src/main/java/org/apache/maven/dotnet/plugin/test/TesterMojo.java
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java
incubator/nmaven/trunk/plugins/maven-vsinstaller-plugin/src/main/resources/template/NMaven.VisualStudio.AddIn
incubator/nmaven/trunk/plugins/maven-vstudio-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-webapp-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-webapp-plugin/src/main/java/org/apache/maven/dotnet/plugin/webapp/NetAchiverMojo.java
incubator/nmaven/trunk/plugins/maven-wsdl-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-xsd-plugin/pom.xml
incubator/nmaven/trunk/plugins/maven-xsp-plugin/pom.xml
incubator/nmaven/trunk/plugins/net-exe.bat
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/javabinding/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Addin/src/main/csharp/NMaven/Plugin/Addin/AutomationExtensibilityMojo.cs
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/javabinding/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Devenv/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Resx/src/main/config/NMaven.Plugin.Resx.exe.config
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/javabinding/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Settings/pom.xml
incubator/nmaven/trunk/plugins/netplugins/NMaven.Plugin.Solution/javabinding/pom.xml
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
incubator/nmaven/trunk/plugins/netplugins/pom.xml
incubator/nmaven/trunk/plugins/pom.xml
incubator/nmaven/trunk/pom-dotnet.xml
incubator/nmaven/trunk/pom.xml
incubator/nmaven/trunk/site/conventions.apt
incubator/nmaven/trunk/site/src/site/apt/adding-executables.apt
incubator/nmaven/trunk/site/src/site/apt/getting-started.apt
incubator/nmaven/trunk/site/src/site/apt/ide/visual-studio.apt
incubator/nmaven/trunk/site/src/site/apt/net-plugins.apt
incubator/nmaven/trunk/site/src/site/xdoc/conventions.xml
incubator/nmaven/trunk/thirdparty/Castle/Castle.DynamicProxy-2.0-rc2.pom
incubator/nmaven/trunk/thirdparty/Castle/Castle.MicroKernel-2.0-rc2.pom
incubator/nmaven/trunk/thirdparty/Castle/Castle.Windsor-2.0-rc2.pom
Modified: incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml (original)
+++ incubator/nmaven/trunk/archetypes/maven-archetype-dotnet-simple/pom.xml Wed Jul 25 06:34:15 2007
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-archetypes</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml (original)
+++ incubator/nmaven/trunk/archetypes/maven-archetype-netexecutable/pom.xml Wed Jul 25 06:34:15 2007
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-archetypes</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/archetypes/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/archetypes/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/archetypes/pom.xml (original)
+++ incubator/nmaven/trunk/archetypes/pom.xml Wed Jul 25 06:34:15 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-project</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Artifact/NMaven.Artifact.sln
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Artifact/NMaven.Artifact.sln?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Artifact/NMaven.Artifact.sln (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Artifact/NMaven.Artifact.sln Wed Jul 25 06:34:15 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/trunk/assemblies/NMaven.Artifact/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Artifact/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Artifact/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Artifact/pom.xml Wed Jul 25 06:34:15 2007
@@ -19,12 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Artifact</groupId>
<artifactId>NMaven.Artifact</artifactId>
+ <version>0.14</version>
<packaging>library</packaging>
<name>NMaven.Artifact</name>
<dependencies>
@@ -32,7 +33,7 @@
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
<type>library</type>
- <version>${pom.version}</version>
+ <version>0.14</version>
</dependency>
<dependency>
<groupId>NUnit</groupId>
@@ -40,5 +41,5 @@
<type>library</type>
<version>2.2.8.0</version>
</dependency>
- </dependencies>
+ </dependencies>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven.Artifact.csproj Wed Jul 25 06:34:15 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/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/ArtifactContext.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/ArtifactContext.cs?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/ArtifactContext.cs (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/ArtifactContext.cs Wed Jul 25 06:34:15 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/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/AssemblyRepositoryLayout.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/AssemblyRepositoryLayout.cs?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/AssemblyRepositoryLayout.cs (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/AssemblyRepositoryLayout.cs Wed Jul 25 06:34:15 2007
@@ -5,7 +5,7 @@
{
public sealed class AssemblyRepositoryLayout : ArtifactRepositoryLayout
{
- public string pathOf(Artifact artifact)
+ public String pathOf(Artifact artifact)
{
StringBuilder sb = new StringBuilder();
sb.Append(artifact.GroupId.Replace('.', '\\')).Append(@"\");
Modified: incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/IArtifactContext.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/IArtifactContext.cs?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/IArtifactContext.cs (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Artifact/src/main/csharp/NMaven/Artifact/IArtifactContext.cs Wed Jul 25 06:34:15 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/trunk/assemblies/NMaven.IDE/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.IDE/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.IDE/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.IDE/pom.xml Wed Jul 25 06:34:15 2007
@@ -19,42 +19,47 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.IDE</groupId>
<artifactId>NMaven.IDE</artifactId>
+ <version>0.14</version>
<packaging>library</packaging>
<name>NMaven.IDE</name>
<dependencies>
<dependency>
<groupId>NMaven.Service</groupId>
<artifactId>NMaven.Service.Embedder</artifactId>
- <version>${pom.version}</version>
+ <version>0.14</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Logging</groupId>
<artifactId>NMaven.Logging</artifactId>
- <version>${pom.version}</version>
+ <version>0.14</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Artifact</groupId>
<artifactId>NMaven.Artifact</artifactId>
- <version>${pom.version}</version>
+ <version>0.14</version>
<type>library</type>
</dependency>
<dependency>
<groupId>EnvDTE</groupId>
<artifactId>EnvDTE</artifactId>
<type>gac</type>
+ <version>8.0.0.0</version>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
<dependency>
<groupId>EnvDTE80</groupId>
<artifactId>EnvDTE80</artifactId>
<type>gac</type>
+ <version>8.0.0.0</version>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.IDE/src/main/csharp/NMaven.IDE.csproj Wed Jul 25 06:34:15 2007
@@ -15,13 +15,13 @@
<Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="NMaven.Artifact, Version=0.14.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\..\..\..\.m2\repository\NMaven\Artifact\NMaven.Artifact\0.14-SNAPSHOT\NMaven.Artifact.dll</HintPath>
+ <HintPath>..\..\..\..\..\..\..\.m2\repository\NMaven\Artifact\NMaven.Artifact\0.14\NMaven.Artifact.dll</HintPath>
</Reference>
<Reference Include="NMaven.Logging">
- <HintPath>C:\Documents and Settings\shane\.m2\repository\NMaven\Logging\NMaven.Logging\0.14-SNAPSHOT\NMaven.Logging.dll</HintPath>
+ <HintPath>C:\Documents and Settings\shane\.m2\repository\NMaven\Logging\NMaven.Logging\0.14\NMaven.Logging.dll</HintPath>
</Reference>
<Reference Include="NMaven.Service.Embedder">
- <HintPath>C:\Documents and Settings\shane\.m2\repository\NMaven\Service\NMaven.Service.Embedder\0.14-SNAPSHOT\NMaven.Service.Embedder.dll</HintPath>
+ <HintPath>C:\Documents and Settings\shane\.m2\repository\NMaven\Service\NMaven.Service.Embedder\0.14\NMaven.Service.Embedder.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Drawing" />
Modified: incubator/nmaven/trunk/assemblies/NMaven.Logging/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Logging/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Logging/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Logging/pom.xml Wed Jul 25 06:34:15 2007
@@ -19,12 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Logging</groupId>
<artifactId>NMaven.Logging</artifactId>
+ <version>0.14</version>
<packaging>library</packaging>
- <name>NMaven.Library</name>
+ <name>NMaven.Library</name>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Model/AutomationExtensibility/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Model/AutomationExtensibility/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Model/AutomationExtensibility/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Model/AutomationExtensibility/pom.xml Wed Jul 25 06:34:15 2007
@@ -19,13 +19,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
- <relativePath>..\..\pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.AutomationExtensibility</artifactId>
+ <version>0.14</version>
<packaging>library</packaging>
<name>NMaven.Model.AutomationExtensibility</name>
<!--
Modified: incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Model/Pom/pom.xml Wed Jul 25 06:34:15 2007
@@ -19,13 +19,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
- <relativePath>..\..\pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
+ <version>0.14</version>
<packaging>library</packaging>
<name>NMaven.Model.Pom</name>
<build>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin.Loader/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin.Loader/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin.Loader/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin.Loader/pom.xml Wed Jul 25 06:34:15 2007
@@ -19,12 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.Loader</artifactId>
+ <version>0.14</version>
<packaging>exe</packaging>
<name>NMaven.Plugin.Loader</name>
<dependencies>
@@ -32,7 +33,7 @@
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
<type>library</type>
- <version>${pom.version}</version>
+ <version>0.14</version>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/pom.xml Wed Jul 25 06:34:15 2007
@@ -19,12 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.MojoGenerator</artifactId>
+ <version>0.14</version>
<packaging>exe</packaging>
<name>NMaven.Plugin.MojoGenerator</name>
<dependencies>
@@ -32,7 +33,7 @@
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
<type>library</type>
- <version>${pom.version}</version>
+ <version>0.14</version>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/src/main/resources/resgen/pom-java.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/src/main/resources/resgen/pom-java.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/src/main/resources/resgen/pom-java.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin.MojoGenerator/src/main/resources/resgen/pom-java.xml Wed Jul 25 06:34:15 2007
@@ -10,22 +10,22 @@
<dependency>
<groupId>org.apache.maven.dotnet</groupId>
<artifactId>dotnet-assembler</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
</dependency>
<dependency>
<groupId>org.apache.maven.dotnet</groupId>
<artifactId>dotnet-executable</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
</dependency>
<dependency>
<groupId>org.apache.maven.dotnet</groupId>
<artifactId>dotnet-artifact</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
</dependency>
<dependency>
<groupId>org.apache.maven.dotnet</groupId>
<artifactId>dotnet-plugin</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
</dependency>
</dependencies>
<build>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin.Runner/pom.xml Wed Jul 25 06:34:15 2007
@@ -19,12 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin.Runner</artifactId>
+ <version>0.14</version>
<packaging>exe</packaging>
<name>NMaven.Plugin.Runner</name>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Plugin/pom.xml Wed Jul 25 06:34:15 2007
@@ -19,12 +19,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
+ <version>0.14</version>
<packaging>library</packaging>
<name>NMaven.Plugin</name>
<dependencies>
@@ -32,7 +33,7 @@
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
<type>library</type>
- <version>${pom.version}</version>
+ <version>0.14</version>
</dependency>
</dependencies>
<build>
@@ -52,7 +53,7 @@
<configuration>
<isGacInstall>true</isGacInstall>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Service/Embedder/pom.xml Wed Jul 25 06:34:15 2007
@@ -19,13 +19,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
- <relativePath>..\..\pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.Service</groupId>
<artifactId>NMaven.Service.Embedder</artifactId>
+ <version>0.14</version>
<packaging>library</packaging>
<name>NMaven.Service.Embedder</name>
<build>
@@ -37,24 +38,24 @@
<artifactId>maven-compile-plugin</artifactId>
<extensions>true</extensions>
</plugin>
-<!--
- <plugin>
- <groupId>org.apache.maven.dotnet.plugins</groupId>
- <artifactId>maven-wsdl-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>wsdl</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <paths>
- <path>src/main/resources/MavenEmbedder.wsdl</path>
- </paths>
- </configuration>
- </plugin>
- -->
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.dotnet.plugins</groupId>
+ <artifactId>maven-wsdl-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>wsdl</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <paths>
+ <path>src/main/resources/MavenEmbedder.wsdl</path>
+ </paths>
+ </configuration>
+ </plugin>
+ -->
</plugins>
</build>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.Solution/IProjectGenerator.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Solution/IProjectGenerator.cs?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Solution/IProjectGenerator.cs (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Solution/IProjectGenerator.cs Wed Jul 25 06:34:15 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/trunk/assemblies/NMaven.Solution/NMaven.Solution.csproj
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Solution/NMaven.Solution.csproj?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Solution/NMaven.Solution.csproj (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Solution/NMaven.Solution.csproj Wed Jul 25 06:34:15 2007
@@ -32,7 +32,7 @@
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="NMaven.Model.Pom, Version=0.14.0.0, Culture=neutral, PublicKeyToken=4b435f4d76e2f0e6, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\.m2\repository\NMaven\Model\NMaven.Model.Pom\0.14-SNAPSHOT\NMaven.Model.Pom.dll</HintPath>
+ <HintPath>..\..\..\..\.m2\repository\NMaven\Model\NMaven.Model.Pom\0.14\NMaven.Model.Pom.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Modified: incubator/nmaven/trunk/assemblies/NMaven.Solution/ProjectGeneratorImpl.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Solution/ProjectGeneratorImpl.cs?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Solution/ProjectGeneratorImpl.cs (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Solution/ProjectGeneratorImpl.cs Wed Jul 25 06:34:15 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/trunk/assemblies/NMaven.Solution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.Solution/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.Solution/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.Solution/pom.xml Wed Jul 25 06:34:15 2007
@@ -1,13 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven</groupId>
<artifactId>NMaven.Solution</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<packaging>library</packaging>
<name>NMaven.Solution</name>
<dependencies>
@@ -15,16 +15,25 @@
<groupId>NMaven.Model</groupId>
<artifactId>NMaven.Model.Pom</artifactId>
<type>library</type>
- <version>${pom.version}</version>
+ <version>0.14</version>
</dependency>
<dependency>
- <groupId>Microsoft.Build.Engine</groupId>
- <artifactId>Microsoft.Build.Engine</artifactId>
- <type>gac_msil</type>
+ <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>
+ <type>gac_msil</type>
+ <version>2.0.0.0</version>
+ <classifier>b03f5f7f11d50a3a</classifier>
+ </dependency>
<dependency>
<groupId>NUnit</groupId>
<artifactId>NUnit.Framework</artifactId>
+ <version>2.2.8.0</version>
<type>library</type>
</dependency>
</dependencies>
Modified: incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/pom.xml Wed Jul 25 06:34:15 2007
@@ -19,71 +19,80 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio.Addin</artifactId>
+ <version>0.14</version>
<packaging>visual-studio-addin</packaging>
<name>NMaven.VisualStudio.Addin</name>
<dependencies>
<dependency>
<groupId>NMaven.IDE</groupId>
<artifactId>NMaven.IDE</artifactId>
- <version>${pom.version}</version>
+ <version>0.14</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Plugin</groupId>
<artifactId>NMaven.Plugin</artifactId>
- <version>${pom.version}</version>
+ <version>0.14</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Logging</groupId>
<artifactId>NMaven.Logging</artifactId>
- <version>${pom.version}</version>
+ <version>0.14</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio</artifactId>
- <version>${pom.version}</version>
+ <version>0.14</version>
<type>library</type>
</dependency>
<dependency>
<groupId>NMaven.Service</groupId>
<artifactId>NMaven.Service.Embedder</artifactId>
- <version>${pom.version}</version>
+ <version>0.14</version>
<type>library</type>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>NMaven.Artifact</groupId>
<artifactId>NMaven.Artifact</artifactId>
- <version>${pom.version}</version>
+ <version>0.14</version>
<type>library</type>
</dependency>
<dependency>
<groupId>Microsoft.VisualStudio.CommandBars</groupId>
<artifactId>Microsoft.VisualStudio.CommandBars</artifactId>
<type>gac</type>
+ <version>8.0.0.0</version>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
<dependency>
<groupId>EnvDTE</groupId>
<artifactId>EnvDTE</artifactId>
<type>gac</type>
+ <version>8.0.0.0</version>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
<dependency>
<groupId>EnvDTE80</groupId>
<artifactId>EnvDTE80</artifactId>
<type>gac</type>
+ <version>8.0.0.0</version>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
<dependency>
<groupId>Extensibility</groupId>
<artifactId>Extensibility</artifactId>
<type>gac</type>
+ <version>7.0.3300.0</version>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
<dependency>
<groupId>Castle</groupId>
Modified: incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.Addin/src/main/csharp/NMaven/VisualStudio/Addin/Connect.cs Wed Jul 25 06:34:15 2007
@@ -123,7 +123,7 @@
IWindsorContainer container = new WindsorContainer(new XmlInterpreter(@"C:\Documents and Settings\shane\nmaven-apache\trunk-fix\assemblies\NMaven.VisualStudio.Addin\src\main\resources\components.xml"));
ArtifactContext artifactContext = (ArtifactContext) container[typeof(ArtifactContext)];
- NMaven.Artifact.Artifact artifactWar = artifactContext.CreateArtifact("org.apache.maven.dotnet", "dotnet-service-embedder", "0.14-SNAPSHOT", "war");
+ NMaven.Artifact.Artifact artifactWar = artifactContext.CreateArtifact("org.apache.maven.dotnet", "dotnet-service-embedder", "0.14", "war");
FileInfo warFileInfo = new FileInfo(localRepository + "/" + new JavaRepositoryLayout().pathOf(artifactWar) + "war");
logger.Log(Level.INFO, "Executing external command plugin: "
+ @"mvn org.apache.maven.dotnet.plugins:maven-embedder-plugin:start -Dport=8080 -DwarFile="""
Modified: incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.VisualStudio.ProjectWizard/pom.xml Wed Jul 25 06:34:15 2007
@@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -37,17 +37,23 @@
<groupId>EnvDTE</groupId>
<artifactId>EnvDTE</artifactId>
<type>gac</type>
+ <version>8.0.0.0</version>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
<dependency>
<groupId>EnvDTE80</groupId>
<artifactId>EnvDTE80</artifactId>
<type>gac</type>
+ <version>8.0.0.0</version>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
<!--remmove-->
<dependency>
<groupId>Microsoft.VisualStudio.CommandBars</groupId>
<artifactId>Microsoft.VisualStudio.CommandBars</artifactId>
<type>gac</type>
+ <version>8.0.0.0</version>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
</dependencies>
<build>
@@ -69,6 +75,6 @@
<isGacInstall>true</isGacInstall>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>
Modified: incubator/nmaven/trunk/assemblies/NMaven.VisualStudio/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/NMaven.VisualStudio/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/NMaven.VisualStudio/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/NMaven.VisualStudio/pom.xml Wed Jul 25 06:34:15 2007
@@ -19,25 +19,28 @@
<project xmlns="http://maven.apache.org/POM/4.0.0">
<parent>
<groupId>NMaven</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Assemblies</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven.VisualStudio</groupId>
<artifactId>NMaven.VisualStudio</artifactId>
+ <version>0.14</version>
<packaging>library</packaging>
<name>NMaven.VisualStudio</name>
<dependencies>
<dependency>
<groupId>NMaven.Logging</groupId>
<artifactId>NMaven.Logging</artifactId>
- <version>${pom.version}</version>
+ <version>0.14</version>
<type>library</type>
</dependency>
<dependency>
<groupId>EnvDTE</groupId>
<artifactId>EnvDTE</artifactId>
<type>gac</type>
+ <version>8.0.0.0</version>
+ <classifier>b03f5f7f11d50a3a</classifier>
</dependency>
</dependencies>
</project>
Modified: incubator/nmaven/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/assemblies/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/assemblies/pom.xml (original)
+++ incubator/nmaven/trunk/assemblies/pom.xml Wed Jul 25 06:34:15 2007
@@ -20,13 +20,14 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>NMaven.Project</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>NMaven.Project</artifactId>
<relativePath>../pom-dotnet.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>NMaven</groupId>
<artifactId>NMaven.Assemblies</artifactId>
+ <version>0.14</version>
<packaging>pom</packaging>
<name>NMaven.Assemblies</name>
<url>http://incubator.apache.org/nmaven</url>
Modified: incubator/nmaven/trunk/components/dotnet-artifact/pom.xml
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/pom.xml?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-artifact/pom.xml (original)
+++ incubator/nmaven/trunk/components/dotnet-artifact/pom.xml Wed Jul 25 06:34:15 2007
@@ -20,7 +20,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.maven.dotnet</groupId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
<artifactId>dotnet-components</artifactId>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -40,6 +40,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.dotnet</groupId>
+ <artifactId>dotnet-dao-project</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.dotnet</groupId>
<artifactId>dotnet-model-netdependency</artifactId>
<version>${pom.version}</version>
</dependency>
@@ -49,4 +54,12 @@
<version>${pom.version}</version>
</dependency>
</dependencies>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources/uac</directory>
+ <targetPath>../test-repo/uac</targetPath>
+ </testResource>
+ </testResources>
+ </build>
</project>
Modified: incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java (original)
+++ incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactContext.java Wed Jul 25 06:34:15 2007
@@ -40,19 +40,6 @@
String ROLE = ArtifactContext.class.getName();
/**
- * Returns the dependencies that exist directly within the pom (no transitive dependencies) for the specified artifact.
- *
- * @param artifact the artifact from which to get the direct dependencies. This value should not be null.
- * @param matchPolicies the list of policies for matching artifacts. This list may be null or empty, in which case
- * this method matches all dependencies for the given artifact.
- * @return the list of dependencies that exist directly within the pom (no transitive dependencies)
- * for the given artifact and match policies. This list may not be null.
- * @throws ArtifactException if there is a problem in matching the dependencies of the specified artifact
- */
- List<Artifact> getDirectDependenciesFor( Artifact artifact, List<ArtifactMatchPolicy> matchPolicies )
- throws ArtifactException;
-
- /**
* Returns the list of .NET module dependency artifacts that exist directly within the pom for the specified artifact
* (no transitive dependencies). This is a convenience method that has the same behavior as
* <code>getDirectDependenciesFor</code> but adds a .netmodule match policy. To get net modules, with additional match policies,
Modified: incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java (original)
+++ incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactInstaller.java Wed Jul 25 06:34:15 2007
@@ -52,12 +52,12 @@
* <code>MavenProject.getArtifact</code>. In those cases where the MavenProject object is unavailable, then
* you can use the <code>installFile</code> method from this interface.
*
- * @param artifact the artifact to install
- * @param pomFile the pom file of the installed artifact
+ * @param artifact the artifact to install
+ * @param pomFile the pom file of the installed artifact
* @param modifyProjectMetadata
* @throws ArtifactInstallationException if there is a problem installing the artifact
*/
- void installArtifact( Artifact artifact, File pomFile, boolean modifyProjectMetadata )
+ void installArtifactWithPom( Artifact artifact, File pomFile, boolean modifyProjectMetadata )
throws ArtifactInstallationException;
/**
@@ -71,72 +71,24 @@
* @param artifactFile the artifact to install
* @throws ArtifactInstallationException if there is a problem installing the artifact
*/
- void installFileWithGeneratedPom( String groupId, String artifactId, String version, String packaging,
- File artifactFile )
+ void installFileWithoutPom( String groupId, String artifactId, String version, String packaging, File artifactFile )
throws ArtifactInstallationException;
- /**
- * Installs a file into the local maven repository, without generating a pom.xml. This is used for placing
- * files and resources into the local repository, where there are no explicit dependencies (as given in the pom file).
- *
- * @param groupId the group id of the file to install
- * @param artifactId the artifact id of the file to install
- * @param version the version of the file to install
- * @param installFile the file to install
- * @throws ArtifactInstallationException if there is a problem installing the artifact
- */
- void installFileWithNoPom( String groupId, String artifactId, String version, File installFile )
- throws ArtifactInstallationException;
-
- /**
- * Installs the dependent libraries (or assemblies) of the specified artifact.
- *
- * @param artifact the artifact associated with the specified dependencies
- * @param dependencies a list of dependencies of the specified artifact
- * @throws ArtifactInstallationException if there is a problem installing the artifact
- */
- void installLibraryDependencies( Artifact artifact, List<Dependency> dependencies )
- throws ArtifactInstallationException;
-
- /**
- * Resolves the specified artifact (and its dependencies) and installs the artifact's dependencies into the
- * artifact's directory within the local repository. This method should be used for exe, winexe and
- * netplugins.
- *
- * @param dependency the dependency to resolve
- * @throws ArtifactInstallationException
- * @throws ArtifactNotFoundException
- */
- void resolveAndInstallLibraryDependenciesFor( Dependency dependency )
- throws ArtifactInstallationException , ArtifactNotFoundException;
-
void resolveAndInstallNetDependenciesForProfile( String profile, List<Dependency> dependencies )
- throws ArtifactResolutionException, ArtifactNotFoundException, ArtifactInstallationException;
+ throws ArtifactResolutionException, ArtifactNotFoundException, ArtifactInstallationException;
- /**
- * Copies .netmodules, that the project is dependenct upon, from the local repo to the project's target directory.
- * This method handles placing all the .netmodules in the same directory as the compiled project artifact for use
- * in unit testing and/or packaging.
- *
- * @param projectArtifact the artifact that has .netmodule dependencies
- * @throws ArtifactInstallationException if there is a problem installing the net module artifact(s)
- */
- void installNetModulesToTargetDirectory( Artifact projectArtifact )
+ void installArtifactAndDependenciesIntoPrivateApplicationBase( File applicationBase, Artifact artifact,
+ List<Dependency> dependencies )
throws ArtifactInstallationException;
/**
* 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
+ * @param artifactContext the artifact context associated with this installer
+ * @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/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactMatchPolicy.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactMatchPolicy.java?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactMatchPolicy.java (original)
+++ incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/ArtifactMatchPolicy.java Wed Jul 25 06:34:15 2007
@@ -24,7 +24,6 @@
* Provides a way for a developer to implement custom match policies for an artifact.
*
* @author Shane Isbell
- * @see ArtifactContext#getDirectDependenciesFor
*/
public interface ArtifactMatchPolicy
{
Modified: incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java
URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java?view=diff&rev=559454&r1=559453&r2=559454
==============================================================================
--- incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java (original)
+++ incubator/nmaven/trunk/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/AssemblyResolver.java Wed Jul 25 06:34:15 2007
@@ -26,6 +26,7 @@
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import java.util.List;
+import java.io.File;
/**
* Provides services for resolving .NET assembly artifacts.
@@ -43,8 +44,7 @@
/**
* Resolves transitive dependencies for the project.
*
- * @param project the maven project
- * @param sourceArtifact the artifact to which the resolved dependencies belong
+ * @param mavenProject
* @param dependencies the list of dependencies of the specified artifact
* @param remoteArtifactRepositories
* @param localArtifactRepository
@@ -57,8 +57,8 @@
* @throws ArtifactResolutionException
* @throws ArtifactNotFoundException
*/
- void resolveTransitivelyFor( MavenProject project, Artifact sourceArtifact, List<Dependency> dependencies,
- List<ArtifactRepository> remoteArtifactRepositories, ArtifactRepository localArtifactRepository,
+ void resolveTransitivelyFor( MavenProject mavenProject, List<Dependency> dependencies,
+ List<ArtifactRepository> remoteArtifactRepositories, File localArtifactRepository,
boolean addResolvedDependenciesToProject )
throws ArtifactResolutionException, ArtifactNotFoundException;
}