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/09/24 20:48:02 UTC

svn commit: r578960 - in /incubator/nmaven/trunk/plugins: README.txt maven-repository-plugin/src/main/java/org/apache/maven/dotnet/plugin/repository/RepositoryAssemblerMojo.java

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<Artifact>) 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();