Author: epunzalan
Date: Thu Mar  9 19:31:38 2006
New Revision: 384692

URL: http://svn.apache.org/viewcvs?rev=384692&view=rev
Log:
PR: MPIR-33

Added parameter checkoutDirectoryName to ScmReport

Modified:
    
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java

Modified: 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL: 
http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=384692&r1=384691&r2=384692&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
 (original)
+++ 
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
 Thu Mar  9 19:31:38 2006
@@ -83,6 +83,14 @@
     protected ScmManager scmManager;
 
     /**
+     * The directory name to checkout right after the scm url
+     *
+     * @parameter expression="${project.artifactId}"
+     * @required
+     */
+    private String checkoutDirectoryName;
+
+    /**
      * Internationalization.
      *
      * @component
@@ -142,7 +150,8 @@
      */
     public void executeReport( Locale locale )
     {
-        ScmRenderer r = new ScmRenderer( scmManager, getSink(), 
getProject().getModel(), i18n, locale );
+        ScmRenderer r = new ScmRenderer( scmManager, getSink(), 
getProject().getModel(),
+                                         i18n, locale, checkoutDirectoryName );
 
         r.render();
     }
@@ -173,7 +182,10 @@
 
         private String devConnection;
 
-        public ScmRenderer( ScmManager scmManager, Sink sink, Model model, 
I18N i18n, Locale locale )
+        private String checkoutDirectoryName;
+
+        public ScmRenderer( ScmManager scmManager, Sink sink, Model model, 
I18N i18n,
+                            Locale locale, String checkoutDirName )
         {
             super( sink );
 
@@ -184,6 +196,8 @@
             this.i18n = i18n;
 
             this.locale = locale;
+
+            this.checkoutDirectoryName = checkoutDirName;
         }
 
         /**
@@ -434,7 +448,7 @@
                     i18n.getString( "project-info-report", locale, 
"report.scm.accessbehindfirewall.svn.intro" ) );
 
                 StringBuffer sb = new StringBuffer();
-                sb.append( "$ svn checkout " ).append( svnRepo.getUrl() 
).append( " " ).append( model.getArtifactId() );
+                sb.append( "$ svn checkout " ).append( svnRepo.getUrl() 
).append( " " ).append( checkoutDirectoryName );
                 verbatimText( sb.toString() );
             }
             else if ( ( devRepository != null ) && ( isScmSystem( 
devRepository, "cvs" ) ) )
@@ -629,7 +643,7 @@
             paragraph( i18n.getString( "project-info-report", locale, 
"report.scm.anonymousaccess.svn.intro" ) );
 
             StringBuffer sb = new StringBuffer();
-            sb.append( "$ svn checkout " ).append( svnRepo.getUrl() ).append( 
" " ).append( model.getArtifactId() );
+            sb.append( "$ svn checkout " ).append( svnRepo.getUrl() ).append( 
" " ).append( checkoutDirectoryName );
 
             verbatimText( sb.toString() );
         }
@@ -649,7 +663,7 @@
 
             StringBuffer sb = new StringBuffer();
 
-            sb.append( "$ svn checkout " ).append( svnRepo.getUrl() ).append( 
" " ).append( model.getArtifactId() );
+            sb.append( "$ svn checkout " ).append( svnRepo.getUrl() ).append( 
" " ).append( checkoutDirectoryName );
 
             verbatimText( sb.toString() );
 


Reply via email to