From nmaven-commits-return-795-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Thu May 22 06:57:43 2008 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 48588 invoked from network); 22 May 2008 06:57:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 22 May 2008 06:57:43 -0000 Received: (qmail 42722 invoked by uid 500); 22 May 2008 06:57:44 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 42699 invoked by uid 500); 22 May 2008 06:57:44 -0000 Mailing-List: contact nmaven-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: nmaven-dev@incubator.apache.org Delivered-To: mailing list nmaven-commits@incubator.apache.org Received: (qmail 42690 invoked by uid 99); 22 May 2008 06:57:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 May 2008 23:57:44 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 May 2008 06:56:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A7DAF2388A0A; Wed, 21 May 2008 23:57:11 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r659023 - in /incubator/nmaven/branches/NMAVEN_0.14: components/pom.xml misc/dotnet-repository-builder/pom.xml plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java pom.xml Date: Thu, 22 May 2008 06:57:11 -0000 To: nmaven-commits@incubator.apache.org From: eworley@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080522065711.A7DAF2388A0A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: eworley Date: Wed May 21 23:57:10 2008 New Revision: 659023 URL: http://svn.apache.org/viewvc?rev=659023&view=rev Log: Appling NMAVEN-123.patch, http://jira.codehaus.org/browse/NMAVEN-123 Modified: incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java incubator/nmaven/branches/NMAVEN_0.14/pom.xml Modified: incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml?rev=659023&r1=659022&r2=659023&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml (original) +++ incubator/nmaven/branches/NMAVEN_0.14/components/pom.xml Wed May 21 23:57:10 2008 @@ -36,14 +36,12 @@ dotnet-assembler dotnet-core dotnet-dao/project - dotnet-embedder dotnet-executable dotnet-jetty dotnet-model dotnet-plugin dotnet-registry dotnet-repository - dotnet-service/embedder dotnet-vendor Modified: incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml?rev=659023&r1=659022&r2=659023&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml (original) +++ incubator/nmaven/branches/NMAVEN_0.14/misc/dotnet-repository-builder/pom.xml Wed May 21 23:57:10 2008 @@ -25,7 +25,7 @@ dotnet-repository-builder pom - 2.1-SNAPSHOT + 2.0.8 ${pom.version} 6.1.5 1.2.5 @@ -69,11 +69,6 @@ org.apache.maven.dotnet - dotnet-embedder - 0.14-incubating-SNAPSHOT - - - org.apache.maven.dotnet dotnet-executable 0.14-incubating-SNAPSHOT @@ -108,12 +103,6 @@ dotnet-vendor 0.14-incubating-SNAPSHOT - - org.apache.maven.dotnet - dotnet-service-embedder - war - 0.14-incubating-SNAPSHOT - org.apache.maven.dotnet.plugins @@ -233,11 +222,6 @@ ${mavenVersion} - org.apache.maven - maven-embedder - ${mavenVersion} - - org.codehaus.xfire xfire-plexus ${xfireVersion} Modified: incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java?rev=659023&r1=659022&r2=659023&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java (original) +++ incubator/nmaven/branches/NMAVEN_0.14/plugins/maven-vsinstaller-plugin/src/main/java/org/apache/maven/dotnet/plugin/vsinstaller/VsInstallerMojo.java Wed May 21 23:57:10 2008 @@ -141,23 +141,6 @@ new DefaultRepositoryLayout() ) ); } artifactContext.init( null, remoteRepositories, new File( localRepository ) ); - List javaDependencies = new ArrayList(); - Dependency warFile = new Dependency(); - warFile.setGroupId( "org.apache.maven.dotnet" ); - warFile.setArtifactId( "dotnet-service-embedder" ); - warFile.setVersion( pomVersion ); - warFile.setType( "war" ); - javaDependencies.add( warFile ); - - try - { - artifactContext.getArtifactInstaller().resolveAndInstallNetDependenciesForProfile( "VisualStudio2005", null, - javaDependencies ); - } - catch ( IOException e ) - { - throw new MojoExecutionException( e.getMessage() ); - } //GAC Installs Modified: incubator/nmaven/branches/NMAVEN_0.14/pom.xml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/NMAVEN_0.14/pom.xml?rev=659023&r1=659022&r2=659023&view=diff ============================================================================== --- incubator/nmaven/branches/NMAVEN_0.14/pom.xml (original) +++ incubator/nmaven/branches/NMAVEN_0.14/pom.xml Wed May 21 23:57:10 2008 @@ -258,11 +258,6 @@ ${mavenVersion} - org.apache.maven - maven-embedder - ${mavenVersion} - - org.codehaus.xfire xfire-plexus ${xfireVersion}