You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/04/11 00:42:19 UTC
svn commit: r764090 -
/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Author: bentmann
Date: Fri Apr 10 22:42:19 2009
New Revision: 764090
URL: http://svn.apache.org/viewvc?rev=764090&view=rev
Log:
[MSITE-400] Make repository id for stage-deploy configurable
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=764090&r1=764089&r2=764090&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java Fri Apr 10 22:42:19 2009
@@ -74,6 +74,16 @@
private String stagingSiteURL;
/**
+ * The identifier of the repository where the staging site will be deployed. This id will be used to lookup a
+ * corresponding <code><server></code> entry from the <code>settings.xml</code>. If a matching
+ * <code><server></code> entry is found, its configured credentials will be used for authentication.
+ *
+ * @parameter expression="${stagingRepositoryId}" default-value="stagingSite"
+ * @since 2.0.1
+ */
+ private String stagingRepositoryId;
+
+ /**
* @component
*/
private WagonManager wagonManager;
@@ -89,8 +99,6 @@
private PlexusContainer container;
- private static final String STAGING_SERVER_ID = "stagingSite";
-
/**
* @see org.apache.maven.plugin.Mojo#execute()
*/
@@ -116,13 +124,13 @@
stagingSiteURL = getStagingSiteURL( project, reactorProjects, stagingSiteURL );
getLog().info( "Using this URL for staging: " + stagingSiteURL );
- Repository repository = new Repository( STAGING_SERVER_ID, stagingSiteURL );
+ Repository repository = new Repository( stagingRepositoryId, stagingSiteURL );
Wagon wagon;
try
{
wagon = wagonManager.getWagon( repository );
- SiteDeployMojo.configureWagon( wagon, STAGING_SERVER_ID, settings, container, getLog() );
+ SiteDeployMojo.configureWagon( wagon, stagingRepositoryId, settings, container, getLog() );
}
catch ( UnsupportedProtocolException e )
{
@@ -150,11 +158,11 @@
ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
if ( proxyInfo != null )
{
- wagon.connect( repository, wagonManager.getAuthenticationInfo( STAGING_SERVER_ID ), proxyInfo );
+ wagon.connect( repository, wagonManager.getAuthenticationInfo( stagingRepositoryId ), proxyInfo );
}
else
{
- wagon.connect( repository, wagonManager.getAuthenticationInfo( STAGING_SERVER_ID ) );
+ wagon.connect( repository, wagonManager.getAuthenticationInfo( stagingRepositoryId ) );
}
wagon.putDirectory( new File( stagingDirectory, getStructure( project, false ) ), "." );
Re: site plugin [was: Re: svn commit: r764090 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java]
Posted by Vincent Siveton <vs...@apache.org>.
Hi Dennis,
2009/4/28 Dennis Lundberg <de...@apache.org>:
> Let me do a 2.0.1 release of the stuff that is in trunk, before we make
> the switch to Doxia 1.1.
Doxia 1.1.1 has been released and I plan to release the site plugin 2.1 soon.
I see 2 options:
- wait for the 2.0.1 release (do you plan it soon?)
- create a 2.0.1 branch for the release/maintenance
In both cases, we need to bring home the 2.1 branch to trunk.
Cheers,
Vincent
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: site plugin [was: Re: svn commit: r764090 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java]
Posted by Dennis Lundberg <de...@apache.org>.
Lukas Theussl wrote:
>
>
> Benjamin Bentmann wrote:
>>> Author: bentmann
>>> Date: Fri Apr 10 22:42:19 2009
>>> New Revision: 764090
>>>
>>> URL: http://svn.apache.org/viewvc?rev=764090&view=rev
>>> Log:
>>> [MSITE-400] Make repository id for stage-deploy configurable
>>>
>>> Modified:
>>>
>>> maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
>>>
>>>
>>> Modified:
>>> maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
>>>
>>> URL:
>>> http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=764090&r1=764089&r2=764090&view=diff
>>>
>>> ==============================================================================
>>>
>>> ---
>>> maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
>>> (original)
>>> +++
>>> maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
>>> Fri Apr 10 22:42:19 2009
>>> @@ -74,6 +74,16 @@
>>> private String stagingSiteURL;
>>>
>>> /**
>>> + * The identifier of the repository where the staging site will
>>> be deployed. This id will be used to lookup a
>>> + * corresponding <code><server></code> entry from the
>>> <code>settings.xml</code>. If a matching
>>> + * <code><server></code> entry is found, its configured
>>> credentials will be used for authentication.
>>> + * + * @parameter expression="${stagingRepositoryId}"
>>> default-value="stagingSite"
>>> + * @since 2.0.1
>>> + */
>>> + private String stagingRepositoryId;
>>
>> I would have liked to bump the plugin version to 2.1 due to this
>> feature addition but noticed there is already a bucket for 2.1 in JIRA
>> (targetting Doxia 1.1). So I wasn't sure whether the 2.0.1 version
>> should just be dropped and its issues merged into the 2.1 bucket or
>> whether 2.0.1 should be renamed to 2.1 and 2.1 to 2.2. Given Dennis is
>> doing most of the work on the Site Plugin, I'm leaving the proper
>> versioning to his judgement.
>
> Dennis,
>
> What are your plans for the site plugin? Any objections to bumping trunk
> to 2.1-SNAPSHOT using Doxia 1.1? An eventual 2.0.x release could be done
> from a branch. WDYT?
Let me do a 2.0.1 release of the stuff that is in trunk, before we make
the switch to Doxia 1.1.
> -Lukas
>
>>
>>
>> Benjamin
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
--
Dennis Lundberg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
site plugin [was: Re: svn commit: r764090 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java]
Posted by Lukas Theussl <lt...@apache.org>.
Benjamin Bentmann wrote:
>> Author: bentmann
>> Date: Fri Apr 10 22:42:19 2009
>> New Revision: 764090
>>
>> URL: http://svn.apache.org/viewvc?rev=764090&view=rev
>> Log:
>> [MSITE-400] Make repository id for stage-deploy configurable
>>
>> Modified:
>>
>> maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
>>
>>
>> Modified:
>> maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
>>
>> URL:
>> http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=764090&r1=764089&r2=764090&view=diff
>>
>> ==============================================================================
>>
>> ---
>> maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
>> (original)
>> +++
>> maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
>> Fri Apr 10 22:42:19 2009
>> @@ -74,6 +74,16 @@
>> private String stagingSiteURL;
>>
>> /**
>> + * The identifier of the repository where the staging site will
>> be deployed. This id will be used to lookup a
>> + * corresponding <code><server></code> entry from the
>> <code>settings.xml</code>. If a matching
>> + * <code><server></code> entry is found, its configured
>> credentials will be used for authentication.
>> + * + * @parameter expression="${stagingRepositoryId}"
>> default-value="stagingSite"
>> + * @since 2.0.1
>> + */
>> + private String stagingRepositoryId;
>
> I would have liked to bump the plugin version to 2.1 due to this feature
> addition but noticed there is already a bucket for 2.1 in JIRA
> (targetting Doxia 1.1). So I wasn't sure whether the 2.0.1 version
> should just be dropped and its issues merged into the 2.1 bucket or
> whether 2.0.1 should be renamed to 2.1 and 2.1 to 2.2. Given Dennis is
> doing most of the work on the Site Plugin, I'm leaving the proper
> versioning to his judgement.
Dennis,
What are your plans for the site plugin? Any objections to bumping trunk to
2.1-SNAPSHOT using Doxia 1.1? An eventual 2.0.x release could be done from a
branch. WDYT?
-Lukas
>
>
> Benjamin
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r764090 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Posted by Benjamin Bentmann <be...@udo.edu>.
> Author: bentmann
> Date: Fri Apr 10 22:42:19 2009
> New Revision: 764090
>
> URL: http://svn.apache.org/viewvc?rev=764090&view=rev
> Log:
> [MSITE-400] Make repository id for stage-deploy configurable
>
> Modified:
> maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
>
> Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
> URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=764090&r1=764089&r2=764090&view=diff
> ==============================================================================
> --- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java (original)
> +++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java Fri Apr 10 22:42:19 2009
> @@ -74,6 +74,16 @@
> private String stagingSiteURL;
>
> /**
> + * The identifier of the repository where the staging site will be deployed. This id will be used to lookup a
> + * corresponding <code><server></code> entry from the <code>settings.xml</code>. If a matching
> + * <code><server></code> entry is found, its configured credentials will be used for authentication.
> + *
> + * @parameter expression="${stagingRepositoryId}" default-value="stagingSite"
> + * @since 2.0.1
> + */
> + private String stagingRepositoryId;
I would have liked to bump the plugin version to 2.1 due to this feature
addition but noticed there is already a bucket for 2.1 in JIRA
(targetting Doxia 1.1). So I wasn't sure whether the 2.0.1 version
should just be dropped and its issues merged into the 2.1 bucket or
whether 2.0.1 should be renamed to 2.1 and 2.1 to 2.2. Given Dennis is
doing most of the work on the Site Plugin, I'm leaving the proper
versioning to his judgement.
Benjamin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org