From nmaven-commits-return-299-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Sun May 13 17:53:04 2007 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 70613 invoked from network); 13 May 2007 17:53:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 May 2007 17:53:03 -0000 Received: (qmail 87286 invoked by uid 500); 13 May 2007 17:53:09 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 87252 invoked by uid 500); 13 May 2007 17:53:09 -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 87243 invoked by uid 99); 13 May 2007 17:53:09 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 May 2007 10:53:09 -0700 X-ASF-Spam-Status: No, hits=-98.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 May 2007 10:53:02 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 2D87D1A9838; Sun, 13 May 2007 10:52:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r537620 - in /incubator/nmaven/branches/SI_XPT: ./ assemblies/NMaven.Core/src/main/csharp/Core/Impl/ components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ components/dotnet-assembler/src/main/java/org/apache/maven/... Date: Sun, 13 May 2007 17:52:41 -0000 To: nmaven-commits@incubator.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070513175242.2D87D1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Sun May 13 10:52:41 2007 New Revision: 537620 URL: http://svn.apache.org/viewvc?view=rev&rev=537620 Log: Some minor bug fixes: Deploy fix that cause the assemblies to be corrupt; fixed embedding copyrights into assembly (largely formatting), fixed exe.config resolve problem Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java incubator/nmaven/branches/SI_XPT/maven-dotnet.iml incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java Modified: incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs?view=diff&rev=537620&r1=537619&r2=537620 ============================================================================== --- incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs (original) +++ incubator/nmaven/branches/SI_XPT/assemblies/NMaven.Core/src/main/csharp/Core/Impl/ProjectGeneratorImpl.cs Sun May 13 10:52:41 2007 @@ -348,8 +348,7 @@ } } return dependencies; - } - + } } } } Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java?view=diff&rev=537620&r1=537619&r2=537620 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-artifact/src/main/java/org/apache/maven/dotnet/artifact/impl/ArtifactInstallerImpl.java Sun May 13 10:52:41 2007 @@ -206,17 +206,17 @@ } //End GAC HACK - if ( configExeFile.exists() && !artifact.getType().equals( ArtifactType.EXECONFIG.getPackagingType() ) ) + if ( configExeFile.exists() ) { logger.info( "NMAVEN-002-000: Found config executable: File = " + configExeFile.getAbsolutePath() ); - Dependency dependency = new Dependency(); - dependency.setArtifactId( project.getArtifactId() ); - dependency.setGroupId( project.getGroupId() ); - dependency.setVersion( project.getVersion().replace( "-SNAPSHOT", "" ) ); - dependency.setType( "exe.config" ); - dependency.setScope( Artifact.SCOPE_RUNTIME ); + Dependency configExeDependency = new Dependency(); + configExeDependency.setArtifactId( project.getArtifactId() ); + configExeDependency.setGroupId( project.getGroupId() ); + configExeDependency.setVersion( project.getVersion() ); + configExeDependency.setType( "exe.config" ); + configExeDependency.setScope( Artifact.SCOPE_RUNTIME ); List dep = new ArrayList(); - dep.add( dependency ); + dep.add( configExeDependency); project.setDependencies( dep ); artifact.getMetadataList().clear(); try Modified: incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java?view=diff&rev=537620&r1=537619&r2=537620 ============================================================================== --- incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java (original) +++ incubator/nmaven/branches/SI_XPT/components/dotnet-assembler/src/main/java/org/apache/maven/dotnet/assembler/impl/AssemblerContextImpl.java Sun May 13 10:52:41 2007 @@ -108,7 +108,7 @@ try { fis = new FileInputStream( file ); - copyright = IOUtil.toString( fis ).replace( "\r", "" ).replace( "\n", "" ).replace( "\"", "\\" ); + copyright = IOUtil.toString( fis ).replace( "\r", " " ).replace( "\n", " " ).replace( "\"", "'" ); } catch ( IOException e ) { Modified: incubator/nmaven/branches/SI_XPT/maven-dotnet.iml URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/maven-dotnet.iml?view=diff&rev=537620&r1=537619&r2=537620 ============================================================================== --- incubator/nmaven/branches/SI_XPT/maven-dotnet.iml (original) +++ incubator/nmaven/branches/SI_XPT/maven-dotnet.iml Sun May 13 10:52:41 2007 @@ -544,6 +544,15 @@ + + + + + + + + + Modified: incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java?view=diff&rev=537620&r1=537619&r2=537620 ============================================================================== --- incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java (original) +++ incubator/nmaven/branches/SI_XPT/plugins/maven-deploy-plugin/src/main/java/org/apache/maven/dotnet/plugins/DeployMojo.java Sun May 13 10:52:41 2007 @@ -1,8 +1,5 @@ package org.apache.maven.dotnet.plugins; -import java.io.File; - -import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.deployer.ArtifactDeployer; import org.apache.maven.artifact.deployer.ArtifactDeploymentException; import org.apache.maven.artifact.repository.ArtifactRepository; @@ -45,16 +42,10 @@ public void execute() throws MojoExecutionException, MojoFailureException { - - // Is snapshot or regular repo depending on project version - ArtifactRepository deployRepo = project.getDistributionManagementArtifactRepository(); - - Artifact artifact = project.getArtifact(); - File sourceFile = project.getFile(); - try { - artifactDeployer.deploy( sourceFile, artifact, deployRepo, localRepo ); + artifactDeployer.deploy( project.getArtifact().getFile(), project.getArtifact(), + project.getDistributionManagementArtifactRepository(), localRepo ); } catch ( ArtifactDeploymentException e ) {