From nmaven-commits-return-536-apmail-incubator-nmaven-commits-archive=incubator.apache.org@incubator.apache.org Mon Sep 24 20:48:24 2007 Return-Path: Delivered-To: apmail-incubator-nmaven-commits-archive@locus.apache.org Received: (qmail 79412 invoked from network); 24 Sep 2007 20:48:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Sep 2007 20:48:23 -0000 Received: (qmail 68192 invoked by uid 500); 24 Sep 2007 20:48:14 -0000 Delivered-To: apmail-incubator-nmaven-commits-archive@incubator.apache.org Received: (qmail 68165 invoked by uid 500); 24 Sep 2007 20:48:14 -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 68156 invoked by uid 99); 24 Sep 2007 20:48:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Sep 2007 13:48:14 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Mon, 24 Sep 2007 20:48:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 003401A9832; Mon, 24 Sep 2007 13:48:02 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r578960 - in /incubator/nmaven/trunk/plugins: README.txt maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java Date: Mon, 24 Sep 2007 20:48:02 -0000 To: nmaven-commits@incubator.apache.org From: sisbell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070924204803.003401A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sisbell Date: Mon Sep 24 13:48:01 2007 New Revision: 578960 URL: http://svn.apache.org/viewvc?rev=578960&view=rev Log: Added option to change the output directory on the repo assembler. Modified: incubator/nmaven/trunk/plugins/README.txt incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java Modified: incubator/nmaven/trunk/plugins/README.txt URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/README.txt?rev=578960&r1=578959&r2=578960&view=diff ============================================================================== --- incubator/nmaven/trunk/plugins/README.txt (original) +++ incubator/nmaven/trunk/plugins/README.txt Mon Sep 24 13:48:01 2007 @@ -6,6 +6,7 @@ Logs: 900-999 : maven-compile-plugin 1000-1099: maven-install-plugin +1700-1799: maven-repository-plugin 1100-1199: maven-test-plugin 1200-1299: maven-webapp-plugin 1300-1399: maven-wsdl-plugin Modified: incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java URL: http://svn.apache.org/viewvc/incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java?rev=578960&r1=578959&r2=578960&view=diff ============================================================================== --- incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java (original) +++ incubator/nmaven/trunk/plugins/maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java Mon Sep 24 13:48:01 2007 @@ -89,6 +89,13 @@ private boolean withGac = false; /** + * Sets location of assembled artifacts. + * + * @parameter expression="${outputDirectory}" default-value = "archive-tmp/repository/releases" + */ + private String outputDirectory; + + /** * @component */ private AssemblyResolver assemblyResolver; @@ -131,7 +138,7 @@ } catch ( RepositoryException e ) { - throw new MojoExecutionException( e.getMessage() ); + throw new MojoExecutionException( "NMAVEN-1700-007: Message = " + e.getMessage() ); } artifactContext.init( project, project.getRemoteArtifactRepositories(), localRepository ); @@ -151,7 +158,7 @@ } catch ( IOException e ) { - throw new MojoExecutionException( e.getMessage() ); + throw new MojoExecutionException("NMAVEN-1700-008: Message = " + e.getMessage() ); } } @@ -167,8 +174,8 @@ new DefaultArtifactRepository( "local", "file://" + localRepository, layout ); ArtifactRepository deploymentRepository = repositoryFactory.createDeploymentArtifactRepository( null, "file://" + - project.getBuild().getDirectory() + - "/archive-tmp/repository/releases", + project.getBuild().getDirectory() + File.separator + + outputDirectory, layout, true ); try @@ -178,7 +185,7 @@ } catch ( IOException e ) { - throw new MojoExecutionException( e.getMessage() ); + throw new MojoExecutionException( "NMAVEN-1700-009: Message = " + e.getMessage() ); } for ( Artifact artifact : (Set) project.getDependencyArtifacts() ) @@ -210,7 +217,7 @@ } catch ( ArtifactDeploymentException e ) { - throw new MojoExecutionException( "NMAVEN-DEPLOY: Deploy Failed", e ); + throw new MojoExecutionException( "NMAVEN-1700-000: Deploy Failed", e ); } } @@ -218,11 +225,11 @@ try { tarArchiver.addDirectory( - new File( project.getBuild().getDirectory(), "/archive-tmp/repository/releases" ) ); + new File( project.getBuild().getDirectory(), File.separator + outputDirectory ) ); } catch ( ArchiverException e ) { - throw new MojoExecutionException( "", e ); + throw new MojoExecutionException( "NMAVEN-1700-001", e ); } TarArchiver.TarCompressionMethod tarCompressionMethod = new TarArchiver.TarCompressionMethod(); @@ -236,11 +243,11 @@ } catch ( ArchiverException e ) { - throw new MojoExecutionException( "", e ); + throw new MojoExecutionException( "NMAVEN-1700-002", e ); } catch ( IOException e ) { - throw new MojoExecutionException( "", e ); + throw new MojoExecutionException( "NMAVEN-1700-003", e ); } } @@ -274,7 +281,7 @@ } catch ( FileNotFoundException e ) { - throw new MojoExecutionException( "NMAVEN-000-000: Unable to read pom" ); + throw new MojoExecutionException( "NMAVEN-1700-004: Unable to read pom" ); } MavenXpp3Reader reader = new MavenXpp3Reader(); Model model; @@ -284,12 +291,12 @@ } catch ( XmlPullParserException e ) { - throw new MojoExecutionException( "NMAVEN-000-000: Unable to read model" ); + throw new MojoExecutionException( "NMAVEN-1700-005: Unable to read model" ); } catch ( IOException e ) { - throw new MojoExecutionException( "NMAVEN-000-000: Unable to read model" ); + throw new MojoExecutionException( "NMAVEN-1700-006: Unable to read model" ); } Parent parent = model.getParent();