You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@continuum.apache.org by Marica Tan <ma...@gmail.com> on 2009/06/30 10:19:49 UTC
Re: svn commit: r787534 - /continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
Hi Wendy,
Can we also merge this to 1.3.x branch? Same with r787528 :)
Thanks
--
Marica
On Tue, Jun 23, 2009 at 12:08 PM, <ws...@apache.org> wrote:
> Author: wsmoak
> Date: Tue Jun 23 04:08:53 2009
> New Revision: 787534
>
> URL: http://svn.apache.org/viewvc?rev=787534&view=rev
> Log:
> [CONTINUUM-2272] Clarify what happens to the credentials supplied when
> adding a project (and other minor changes.)
>
> Modified:
>
> continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
>
> Modified:
> continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
> URL:
> http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt?rev=787534&r1=787533&r2=787534&view=diff
>
> ==============================================================================
> ---
> continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
> (original)
> +++
> continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
> Tue Jun 23 04:08:53 2009
> @@ -20,14 +20,16 @@
> The pom.xml file must be available through one of the following
> protocols: http, https, or ftp
> (The file protocol is also supported but is disabled by default for
> security and must be enabled manually).
>
> - Or it can be uploaded from a local file (Note this doesn't support multi
> modules project).
> + Or it can be uploaded from a local file (Note this doesn't support multi
> module projects).
>
> [../../images/add-m2-project.png] Add a maven2 project
>
> - You can define username/password if the POM URL requires authentication.
> + You can supply a username and password if the POM URL requires
> authentication. This information will be stored in the database in plain
> text and reused later for scm checkouts and updates.
>
> If your SCM stores credentials like CVS or SVN and you want to use the
> SCM Credentials cache, check the "Use SCM Credentials Cache" field.
>
> +~~ TODO: If 'use cached credentials' is checked, then the credentials
> should NOT be stored in the database. Need to see whether that's actually
> true before documenting it.
> +
> You can define the group you want to use or "Defined by POM" in this case
> project.name will be use as Project Group.
>
> You cannot add a duplicate project (duplicates would mean another
> instance of a project with the same groupId, artifactId, and version) in the
> same Project Group.
> @@ -39,7 +41,7 @@
> at the project group level.
>
> When adding projects whose parent project is building on another server,
> - make sure that the <<<settings.xml>>> exists in <<<[USER_HOME]/.m2/>>>
> directory.
> + make sure that the <<<settings.xml>>> with the necessary repositories
> exists in <<<[USER_HOME]/.m2/>>> directory.
> Continuum uses <<<[USER_HOME]/.m2/settings.xml>>> and not the one found
> in <<<[M2_HOME]/conf/>>>.
>
> * {Maven 1 project}
>
>
>
Re: svn commit: r787534 - /continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
Posted by Marica Tan <ma...@gmail.com>.
Done. :)
Thanks!
On Tue, Jun 30, 2009 at 8:54 PM, Wendy Smoak <ws...@gmail.com> wrote:
> Go ahead if you have time, or I can do it on Wednesday if no one beats
> me to it. -Wendy
>
> On Tue, Jun 30, 2009 at 1:19 AM, Marica Tan<ma...@gmail.com> wrote:
> > Hi Wendy,
> >
> > Can we also merge this to 1.3.x branch? Same with r787528 :)
> >
> >
> > Thanks
> > --
> > Marica
> >
> > On Tue, Jun 23, 2009 at 12:08 PM, <ws...@apache.org> wrote:
> >
> >> Author: wsmoak
> >> Date: Tue Jun 23 04:08:53 2009
> >> New Revision: 787534
> >>
> >> URL: http://svn.apache.org/viewvc?rev=787534&view=rev
> >> Log:
> >> [CONTINUUM-2272] Clarify what happens to the credentials supplied when
> >> adding a project (and other minor changes.)
> >>
> >> Modified:
> >>
> >>
> continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
> >>
> >> Modified:
> >>
> continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
> >> URL:
> >>
> http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt?rev=787534&r1=787533&r2=787534&view=diff
> >>
> >>
> ==============================================================================
> >> ---
> >>
> continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
> >> (original)
> >> +++
> >>
> continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
> >> Tue Jun 23 04:08:53 2009
> >> @@ -20,14 +20,16 @@
> >> The pom.xml file must be available through one of the following
> >> protocols: http, https, or ftp
> >> (The file protocol is also supported but is disabled by default for
> >> security and must be enabled manually).
> >>
> >> - Or it can be uploaded from a local file (Note this doesn't support
> multi
> >> modules project).
> >> + Or it can be uploaded from a local file (Note this doesn't support
> multi
> >> module projects).
> >>
> >> [../../images/add-m2-project.png] Add a maven2 project
> >>
> >> - You can define username/password if the POM URL requires
> authentication.
> >> + You can supply a username and password if the POM URL requires
> >> authentication. This information will be stored in the database in
> plain
> >> text and reused later for scm checkouts and updates.
> >>
> >> If your SCM stores credentials like CVS or SVN and you want to use the
> >> SCM Credentials cache, check the "Use SCM Credentials Cache" field.
> >>
> >> +~~ TODO: If 'use cached credentials' is checked, then the credentials
> >> should NOT be stored in the database. Need to see whether that's
> actually
> >> true before documenting it.
> >> +
> >> You can define the group you want to use or "Defined by POM" in this
> case
> >> project.name will be use as Project Group.
> >>
> >> You cannot add a duplicate project (duplicates would mean another
> >> instance of a project with the same groupId, artifactId, and version) in
> the
> >> same Project Group.
> >> @@ -39,7 +41,7 @@
> >> at the project group level.
> >>
> >> When adding projects whose parent project is building on another
> server,
> >> - make sure that the <<<settings.xml>>> exists in
> <<<[USER_HOME]/.m2/>>>
> >> directory.
> >> + make sure that the <<<settings.xml>>> with the necessary repositories
> >> exists in <<<[USER_HOME]/.m2/>>> directory.
> >> Continuum uses <<<[USER_HOME]/.m2/settings.xml>>> and not the one
> found
> >> in <<<[M2_HOME]/conf/>>>.
> >>
> >> * {Maven 1 project}
> >>
> >>
> >>
> >
>
Re: svn commit: r787534 - /continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
Posted by Wendy Smoak <ws...@gmail.com>.
Go ahead if you have time, or I can do it on Wednesday if no one beats
me to it. -Wendy
On Tue, Jun 30, 2009 at 1:19 AM, Marica Tan<ma...@gmail.com> wrote:
> Hi Wendy,
>
> Can we also merge this to 1.3.x branch? Same with r787528 :)
>
>
> Thanks
> --
> Marica
>
> On Tue, Jun 23, 2009 at 12:08 PM, <ws...@apache.org> wrote:
>
>> Author: wsmoak
>> Date: Tue Jun 23 04:08:53 2009
>> New Revision: 787534
>>
>> URL: http://svn.apache.org/viewvc?rev=787534&view=rev
>> Log:
>> [CONTINUUM-2272] Clarify what happens to the credentials supplied when
>> adding a project (and other minor changes.)
>>
>> Modified:
>>
>> continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
>>
>> Modified:
>> continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
>> URL:
>> http://svn.apache.org/viewvc/continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt?rev=787534&r1=787533&r2=787534&view=diff
>>
>> ==============================================================================
>> ---
>> continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
>> (original)
>> +++
>> continuum/trunk/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
>> Tue Jun 23 04:08:53 2009
>> @@ -20,14 +20,16 @@
>> The pom.xml file must be available through one of the following
>> protocols: http, https, or ftp
>> (The file protocol is also supported but is disabled by default for
>> security and must be enabled manually).
>>
>> - Or it can be uploaded from a local file (Note this doesn't support multi
>> modules project).
>> + Or it can be uploaded from a local file (Note this doesn't support multi
>> module projects).
>>
>> [../../images/add-m2-project.png] Add a maven2 project
>>
>> - You can define username/password if the POM URL requires authentication.
>> + You can supply a username and password if the POM URL requires
>> authentication. This information will be stored in the database in plain
>> text and reused later for scm checkouts and updates.
>>
>> If your SCM stores credentials like CVS or SVN and you want to use the
>> SCM Credentials cache, check the "Use SCM Credentials Cache" field.
>>
>> +~~ TODO: If 'use cached credentials' is checked, then the credentials
>> should NOT be stored in the database. Need to see whether that's actually
>> true before documenting it.
>> +
>> You can define the group you want to use or "Defined by POM" in this case
>> project.name will be use as Project Group.
>>
>> You cannot add a duplicate project (duplicates would mean another
>> instance of a project with the same groupId, artifactId, and version) in the
>> same Project Group.
>> @@ -39,7 +41,7 @@
>> at the project group level.
>>
>> When adding projects whose parent project is building on another server,
>> - make sure that the <<<settings.xml>>> exists in <<<[USER_HOME]/.m2/>>>
>> directory.
>> + make sure that the <<<settings.xml>>> with the necessary repositories
>> exists in <<<[USER_HOME]/.m2/>>> directory.
>> Continuum uses <<<[USER_HOME]/.m2/settings.xml>>> and not the one found
>> in <<<[M2_HOME]/conf/>>>.
>>
>> * {Maven 1 project}
>>
>>
>>
>