[jira] Updated: (MSITE-25) mvn site:site ignores server configuration in settings.xml

["Rahul Akolkar (JIRA)" <ji...@codehaus.org>]

     [ http://jira.codehaus.org/browse/MSITE-25?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Rahul Akolkar updated MSITE-25:
-------------------------------

    Attachment: MSITE-25-03.patch

I am attaching a patch that fixes this for me for the site:stage-deploy goal as well.

The test case is the same as before, to reproduce please repeat the recipe from a few comments ago with following changes:

(0) Add this to the settings.xml instead:

   <!-- site:stage-deploy repository -->
   <server>
     <id>stagingSite</id>
     <username>notavalidusername</username>
     <configuration>
       <sshExecutable>plink</sshExecutable>
       <scpExecutable>pscp</scpExecutable>
     </configuration>
   </server>

(2) and (4) -- use 'mvn site:stage-deploy' instead

(3) Use patch MSITE-25-03.patch instead.

The patch chooses to make the SiteDeployMojo#configureWagon() method a utility method and reuses it in SiteStageDeployMojo to correctly configure the "stagingSite" server. Alternately, the code could have been duplicated (making it a utility method has a minor/negligible? performance penalty since server settings are no longer cached in a map). The patch appears larger than I'd have liked since changes in SiteDeployMojo#configureWagon() have caused an indentation change. TIA.


> mvn site:site ignores server configuration in settings.xml
> ----------------------------------------------------------
>
>                 Key: MSITE-25
>                 URL: http://jira.codehaus.org/browse/MSITE-25
>             Project: Maven 2.x Site Plugin
>          Issue Type: Bug
>            Reporter: Alan Cabrera
>            Assignee: Dennis Lundberg
>            Priority: Critical
>             Fix For: 2.0-beta-7
>
>         Attachments: MSITE-25-01.patch, MSITE-25-02.patch, MSITE-25-03.patch, MSITE-25.sample.pom.xml, MSITE-25.settings.xml.fragment.txt, MSITE-25.txt, patch-MSITE-25-artifact-manager.diff, patch-MSITE-25-site-plugin.diff
>
>
> mvn site:site ignores parts of my settings.xml:
>     <server>
>       <id>livetribe-website</id>
>       <filePermissions>664</filePermissions>
>       <directoryPermissions>775</directoryPermissions>
>       <configuration>
>         <sshExecutable>plink</sshExecutable>
>         <scpExecutable>pscp</scpExecutable>
>       </configuration>
>       <username>livetribe</username>
>     </server>
> It uses the username when ssh but does not invoke plink.
> [INFO] [site:deploy]
> Using private key: C:\Documents and Settings\adc\.ssh\id_dsa
> scpexe://repo.livetribe.org/home/projects/livetribe/public_html/maven/ - Session: Opened
> Executing command: ssh -i "C:\Documents and Settings\adc\.ssh\id_dsa" -o "BatchMode yes" livetribe@repo.livetribe.org "mkdir -p /home/projects/livetribe/public_html/maven/."
> scpexe://repo.livetribe.org/home/projects/livetribe/public_html/maven/ - Session: Disconnecting
> scpexe://repo.livetribe.org/home/projects/livetribe/public_html/maven/ - Session: Disconnected

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira