continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
Subject svn commit: r941625 [14/24] - in /continuum/branches/continuum-flat-multi-module: ./ continuum-api/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/ continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/ cont...
Date Thu, 06 May 2010 09:23:34 GMT
Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/administrator_guides/security/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/administrator_guides/security/index.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/administrator_guides/security/index.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/administrator_guides/security/index.apt Thu May  6 09:23:13 2010
@@ -3,11 +3,11 @@
  ------
  Emmanuel Venisse
  ------
- Oct 3 2007
+ 2010-02-18
  ------
 
 Managing Users and Security
 
-    {{{customising-security.html}Security Configuration}}
+    {{{./customising-security.html}Security Configuration}}
 
-    {{{ldap.html}LDAP Configuration}}
+    {{{./ldap.html}LDAP Configuration}}

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/administrator_guides/security/ldap.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/administrator_guides/security/ldap.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/administrator_guides/security/ldap.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/administrator_guides/security/ldap.apt Thu May  6 09:23:13 2010
@@ -12,28 +12,32 @@ LDAP Configuration
 
     * Shutdown Continuum
 
-    * Open <<<apps/continuum/webapp/WEB-INF/classes/META-INF/plexus/application.xml>>> and uncomment the following xml
-
-    []
-
-%{snippet|id=ldap|url=http://svn.apache.org/repos/asf/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml}
-
-    All you need to configure is the ConfigurableLdapConnectionFactory and LdapUserMapper components
-
     * Add a security.properties files under $CONTINUUM_HOME/conf/ with the following content:
 
 --------------------------------------------
-user.manager.impl=ldap
-ldap.bind.authenticator.enabled=true
-redback.default.admin=adminuser
 security.policy.password.expiration.enabled=false
-user.manager.impl=cached
+
+user.manager.impl=ldap
 ldap.bind.authenticator.enabled=true
+
+ldap.config.context.factory=com.sun.jndi.ldap.LdapCtxFactory
+ldap.config.hostname=[ldap_hostname]
+ldap.config.base.dn=[ldap_base_dn]
+ldap.config.port=[ldap_port]
+ldap.config.mapper.attribute.user.id=cn
+ldap.config.mapper.attribute.user.email=email
+ldap.config.mapper.attribute.fullname=givenName
+ldap.config.mapper.attribute.password=userPassword
+
+redback.default.admin=[adminuser]
+redback.default.guest=[guestuser]
 --------------------------------------------
 
     <<adminuser>> is a LDAP user and will be the default Continuum admin. <<guestuser>> is a LDAP user and will be used for the <<<guest>>> role, generally, it is an utility LDAP account.
 
     * Restart Continuum
+    
+    []
 
 * Other resources
 

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/developer_guides/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/developer_guides/index.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/developer_guides/index.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/developer_guides/index.apt Thu May  6 09:23:13 2010
@@ -3,11 +3,11 @@
  ------
  Emmanuel Venisse
  ------
- Oct 3 2007
+ 2010-02-18
  ------
 
 Developer's Guides
 
- * {{{building.html}Building Continuum}}
+ * {{{./building.html}Building Continuum}}
 
- * {{{xmlrpc.html}XML-RPC}}
+ * {{{./xmlrpc.html}XML-RPC}}

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/getting-started.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/getting-started.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/getting-started.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/getting-started.apt Thu May  6 09:23:13 2010
@@ -4,19 +4,19 @@
  Emmanuel Venisse
  Olivier Lamy
  ------
- Oct 5 2007
+ 2010-02-18
  ------
 
 Getting Started
 
     When you start Continuum for the first time (without an existing database), the first thing you will
-    do is create the admin account and perform the {{{administrator_guides/configuration.html}General Configuration}}.
-    
+    do is create the admin account and perform the {{{./administrator_guides/configuration.html}General Configuration}}.
+
 [images/admin-account-creation.png] Admin account creation
 
-    After admin account creation, you can log as the admin. The next thing you will see is the General Configuration
+    After the admin account has been created, you can log as the admin user. The next thing you will see is the <<General Configuration>>
     page.
 
 [images/configuration.png] General Configuration
 
-    You may also create users, {{{user_guides/managing_project/addProject.html}add projects}}, etc.
\ No newline at end of file
+    You may also create more users, {{{./user_guides/managing_project/addProject.html}add projects}}, etc.
\ No newline at end of file

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/index.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/index.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/index.apt Thu May  6 09:23:13 2010
@@ -3,60 +3,56 @@
  ------
  Emmanuel Venisse
  ------
- Oct 3 2007
+ 2010-02-18
+ ------
 
 Welcome to Apache Continuum
 
   Apache Continuum is an enterprise-ready continuous integration server with features such as automated builds,
-  release management, role-based security, and integration with popular build tools and source control management
+  release management, role-based security and integration with popular build tools and source control management
   systems. Whether you have a centralized build team or want to put control of releases in the hands of developers,
-  Continuum can help you improve quality and maintain a consistent build environment. 
+  Continuum can help you improve quality and maintain a consistent build environment.
+
+* Documentation
 
-Documentation
+  * {{{./release-notes.html} Release Notes}}
 
-* Installation/Upgrade Guides
+  * Installation/Upgrade Guides
 
-** {{{installation/index.html}Installation}}
+    * {{{./installation/index.html}Installation}}
 
-*** Standalone version
+      * Standalone version:
 
-    {{{installation/standalone.html}Standard (Linux, Mac OSX, Solaris, Windows, others) as a service or not}}
+        {{{./installation/standalone.html}Standard (Linux, Mac OSX, Solaris, Windows, others) as a service or not}}
 
-*** Webapp
+      * Webapp:
 
-    {{{installation/tomcat.html}Tomcat}},
-    {{{installation/jetty.html}Jetty}},
-    {{{installation/jboss.html}JBoss}},
-    {{{installation/geronimo.html}Geronimo}},
-    {{{installation/glassfish.html}GlassFish}},
-    ...
+        {{{./installation/tomcat.html}Tomcat}}
 
-** Release Notes
+      []
 
-    {{{release-notes.html} Release Notes}}
+    * {{{./installation/upgrade.html} How to upgrade from a previous version}}
 
-** Upgrade
+    []
 
-    {{{installation/upgrade.html} How to upgrade from a previous version}}
+  * {{{./user_guides/index.html} User's Guide}}
 
-* User's Guide
+  * {{{./administrator_guides/index.html} Administrator's Guide}}
 
-    {{{user_guides/index.html} User's Guide}}
+  * {{{./developer_guides/building.html} Developer's Guide to building Continuum}}
 
-* Administrator's Guide
+  * Knowledge Base
 
-    {{{administrator_guides/index.html} Administrator's Guide}}
+      {{{http://continuum.apache.org/faqs.html}Frequently Asked Questions}}
 
-* Developer's Guide
+      {{{http://cwiki.apache.org/confluence/display/CONTINUUM}Wiki}}
 
-    {{{developer_guides/building.html}Guide to building Continuum}}
+      {{{http://docs.codehaus.org/display/CONTINUUMUSER/Home}Old Wiki}}
 
-* Knowledge Base
+      {{{http://apache-continuum.blogspot.com/}Blog}}
 
-    {{{http://continuum.apache.org/faqs.html}Frequently Asked Questions}}
+   []
 
-    {{{http://cwiki.apache.org/confluence/display/CONTINUUM}Wiki}}
+   This documentation is also available in {{{./apache-continuum.pdf}PDF}} format.
 
-    {{{http://docs.codehaus.org/display/CONTINUUMUSER/Home}Old Wiki}}
 
-    {{{http://apache-continuum.blogspot.com/}Blog}}

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/build-agent.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/build-agent.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/build-agent.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/build-agent.apt Thu May  6 09:23:13 2010
@@ -1,82 +1,113 @@
-
-
+ ------
+ Installing and Configuring a Build Agent
+ ------
+ ------
+ 2010-02-22
+ ------
 
 Installing and Configuring a Build Agent
 
     First, {{{http://continuum.apache.org/download.html}download}} the Continuum Build Agent standalone
     distribution or webapp.
 
+    <<Note>>: It is recommended to use Build Agents that come with the release of Continuum (Continuum Master) to be used.
+    While 1.3.x Build Agents can be used with 1.4.x Continuum (Continuum Master), using a later version of Build Agent than the
+    Continuum (Continuum Master) will not work.
+
 * Standalone
 
     The Build Agent is available as a separate standalone Jetty-bundled
     webapp.  Installing it is as simple as extracting it to a preferred
-    directory.  
+    directory.
 
     The Build Agent runs on a specific port (defaulting to 8181), so it is possible
     to install multiple Build Agents in one machine.  It is also possible to
-    install Slaves in the same machine as the Master.  To configure the Build Agent
-    to run using a different port, edit the 
+    install Build Agents in the same machine as the Master.  To configure the Build Agent
+    to run using a different port, edit the
     <<<$CONTINUUM_BUILDAGENT_HOME/conf/jetty.xml>>> file.
 
     Another configuration file to look at is the
     <<<$CONTINUUM_BUILDAGENT_HOME/conf/continuum-buildagent.xml>>>.  This file must
-    be manually edited, as there is no web interface for configuration.
+    be manually edited, as there is no web interface for this configuration.
 
 +--------------+
 <continuum-buildagent-configuration>
-<buildOutputDirectory>/path/to/build/agent/data/build-output-directory</buildOutputDirectory>
- <workingDirectory>/path/to/build/agent/data/working-directory</workingDirectory>
- <continuumServerUrl>http://builds.example.com:8080/continuum/master-xmlrpc</continuumServerUrl>
- <installations>
-  <installation>
-    <name>Maven 2 Home</name>
-    <type>maven2</type>
-    <varValue>/Applications/apache-maven-2.0.9</varValue>
-  </installation>
- </installations>
+  <buildOutputDirectory>/path/to/build/agent/data/build-output-directory</buildOutputDirectory>
+  <workingDirectory>/path/to/build/agent/data/working-directory</workingDirectory>
+  <continuumServerUrl>http://builds.example.com:8080/continuum/master-xmlrpc</continuumServerUrl>
+  <installations>
+    <installation>
+      <name>Maven 2 Home</name>
+      <type>maven2</type>
+      <varValue>/Applications/apache-maven-2.0.9</varValue>
+    </installation>
+  </installations>
+  <localRepositories>
+    <localRepository>
+      <name>default</name>
+      <location>/home/user/.m2/repository</location>
+      <layout>default</layout>
+    </localRepository>
+  </localRepositories>
 </continuum-buildagent-configuration>
 +----------------+
-	
+
     A minimal configuration will have the following fields:
 
     * <<<buildOutputDirectory>>> - similar to the build output directory of Continuum
 
     * <<<workingDirectory>>> - similar to the working directory of Continuum
 
-    * <<<continuumServerUrl>>> - the url pointing to the XML-RPC context of the Master Build Agent
+    * <<<continuumServerUrl>>> - the URL pointing to the XML-RPC context of the Continuum Master
 
-    * <<<installations>>> - a list of the installations available on the build agent, including Maven, Ant, JDK, etc.
-	
-  Note that all of your agents need to be identical, as there is no way to control which agent Continuum chooses.
-  In addition, if you are using the Continuum Release functionality, the master needs to match the agents, as releases
-  will be executed on the master.
+    * <<<installations>>> - a list of the installations available on the Build Agent, including Maven, Ant, JDK, etc.
+    
+    * <<<localRepositories>>> - a list of the local repositories that will be used by the build agent when building and releasing projects. 
+    The local repository <<<name>>> must match that of the local repository configured in the Continuum Master. This configuration is 
+    only available in Continuum 1.4.0+ to fix {{{http://jira.codehaus.org/browse/CONTINUUM-2391}CONTINUUM-2391}}.
+    
+  Note that all of your agents need not be identical, as there is a way to control which agent Continuum chooses by using a
+  {{{../administrator_guides/build-agent-groups.html}Build Agent Group}}. In addition, you need to {{{../administrator_guides/buildEnvironment.html} configure}}
+  the Build Environment from the Master in order to specify which installation to use for the build.
 
   Now start the Build Agent by executing the startup script available in
   <<<$CONTINUUM_BUILDAGENT_HOME/bin/>>>.  For example:
 
-  <<<continuum-buildagent start>>> (or <<<continuum-buildagent console>>> on Windows).
++---+
+continuum-buildagent start
++---+
+
+  or if you are on Windows
+
++---+
+continuum-buildagent.bat console
++---+
 
-  Next, enable the Distributed Builds option in the {{{../administrator_guides/configuration.html}General Configuration}},
-  and {{{../administrator_guides/build-agents.html}add the agent}} to the Continuum master server.
+  Next, enable the <<Distributed Builds>> option in the {{{../administrator_guides/configuration.html}General Configuration}},
+  and {{{../administrator_guides/build-agents.html}add the agent}} to the Continuum Master server.
 
-  TODO:  Does the Jetty bundle still want CONTINUUM_BUILDAGENT_HOME set?
+~~ TODO:  Does the Jetty bundle still want CONTINUUM_BUILDAGENT_HOME set?
 
 * Webapp
 
-  The build agent is also available as a web application which you can install into your own container.
+  The Build Agent is also available as a web application which you can install into your own container.
 
-  The build agent needs two things in order to function properly:  A CONTINUUM_BUILDAGENT_HOME environment variable, 
-  and a continuum-buildagent.xml configuration file in $CONTINUUM_BUILDAGENT_HOME/conf.
+  The Build Agent needs two things in order to function properly:  A <<<CONTINUUM_BUILDAGENT_HOME>>> environment variable,
+  and a <<<continuum-buildagent.xml>>> configuration file in <<<$CONTINUUM_BUILDAGENT_HOME/conf>>>.
 
   First, set the environment variable:
 
-  export CONTINUUM_BUILDAGENT_HOME=/path/to/build/agent/home
++---+
+export CONTINUUM_BUILDAGENT_HOME=/path/to/build/agent/home
++---+
 
   or
 
-  set CONTINUUM_BUILDAGENT_HOME=c:\path\to\build\agent\home
++---+
+set CONTINUUM_BUILDAGENT_HOME=c:\path\to\build\agent\home
++---+
 
-  Next, create the continuum-buildagent.xml file as shown above, and save it in $CONTINUUM_BUILDAGENT_HOME/conf.
+  Next, create the <<<continuum-buildagent.xml>>> file as shown above, and save it in <<<$CONTINUUM_BUILDAGENT_HOME/conf>>>.
   You will need to create these directories.
 
   Finally, drop the webapp into your container, and start it.

Propchange: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/build-agent.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/index.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/index.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/index.apt Thu May  6 09:23:13 2010
@@ -3,19 +3,19 @@
  ------
  Emmanuel Venisse
  ------
- Oct 3 2007
+ 2010-02-18
  ------
 
 Installation/Upgrade Guides
 
-    In this section, you'll find informations about Continuum installations:
+    In this section, you'll find information about Continuum installations:
 
-    * {{{requirements.html}System Requirements}}
+    * {{{./requirements.html}System Requirements}}
 
-    * {{{installation.html}Installation in different environment (standalone, webapp, service)}}
+    * {{{./installation.html}Installation in different environments (standalone, webapp, service)}}
 
     * {{{../release-notes.html}Release Notes}}
 
-    * {{{upgrade.html}How to upgrade from a previous version?}}
+    * {{{./upgrade.html}How to upgrade from a previous version?}}
 
-    * {{{build-agent.html}Installation of Build Agent for Distributed Builds}}
\ No newline at end of file
+    * {{{./build-agent.html}Installation of Build Agent for Distributed Builds}}
\ No newline at end of file

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/installation.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/installation.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/installation.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/installation.apt Thu May  6 09:23:13 2010
@@ -3,21 +3,13 @@
  ------
  Emmanuel Venisse
  ------
- Oct 3 2007
+ 2010-02-18
  ------
 
 Continuum Installation
 
-    In this section, you'll find all information about Continuum installation:
+    In this section, you'll find information about Continuum installations:
 
-    * {{{standalone.html}Standalone}}
+    * {{{./standalone.html}Standalone}}
 
-    * {{{tomcat.html}Tomcat}}
-
-    * {{{jboss.html}JBoss}}
-
-    * {{{jetty.html}Jetty}}
-
-    * {{{geronimo.html}Geronimo}}
-
-    * {{{glassfish.html}GlassFish}}
+    * {{{./tomcat.html}Tomcat}}

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/requirements.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/requirements.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/requirements.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/requirements.apt Thu May  6 09:23:13 2010
@@ -13,7 +13,7 @@ System Requirements
 *----------------------+--------------------------------------------------------------------------------------------------------------------------------+
 | <<Memory>>           | No minimum requirement                                                                                                         |
 *----------------------+--------------------------------------------------------------------------------------------------------------------------------+
-| <<Disk>>             | The Continuum application package is less than 30MB but will use more disk space when it's checking out and building sources |
+| <<Disk>>             | The Continuum application package is less than 30MB but will use more disk space when it's checking out and building sources   |
 *----------------------+--------------------------------------------------------------------------------------------------------------------------------+
 | <<Operating System>> | No minimum requirement. Tested on Windows XP, Debian, Fedora Core, Solaris and Mac OS X                                        |
 *----------------------+--------------------------------------------------------------------------------------------------------------------------------+

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/standalone.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/standalone.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/standalone.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/standalone.apt Thu May  6 09:23:13 2010
@@ -3,7 +3,7 @@
  ------
  Emmanuel Venisse
  ------
- 2008-09-01
+ 2010-02-19
  ------
 
 Installing Continuum Standalone
@@ -15,14 +15,14 @@ Installing Continuum Standalone
     * Download the standalone version from the {{{http://continuum.apache.org/download.html} Download page}}
 
     * Extract the file
-    
-    * Set a JAVA_HOME environment variable which use a jdk >= 1.5 
+
+    * Set a <<<JAVA_HOME>>> environment variable which use a jdk >= 1.5
 
 ** {Defining JNDI Resources}
 
 *** {Mail server configuration}
 
-    Before to start Continuum, you must configure your SMTP configuration for mail notification. The configuration to do is in <<<$CONTINUUM_HOME/conf/jetty.xml>>>:
+    Before you start Continuum, you must configure your SMTP configuration for mail notification. The configuration is in <<<$CONTINUUM_HOME/conf/jetty.xml>>>:
 
 %{snippet|id=mail|url=http://svn.apache.org/repos/asf/continuum/trunk/continuum-jetty/src/main/conf/jetty.xml}
 
@@ -41,40 +41,40 @@ Installing Continuum Standalone
 continuum.bat install
 ------------------
 
-    * Edit the <<<'Apache Continuum'>>> service
+    * Edit the <<Apache Continuum>> service
 
-        * To see the services that are on your computer go to Start|Run and enter <<<'services.msc'>>>.
+        * To see the services that are on your computer go to Start|Run and enter <<<services.msc>>>.
 
-    * Select the <<<'Startup Type'>>>
+    * Select the <<Startup Type>>
 
-    * Go to the <<<'Log On'>>> tab and select a real user. A real user is required because you'll need a home directory for maven repository and some other things
+    * Go to the <<Log On>> tab and select a real user. A real user is required because you'll need a home directory for Maven repository and some other things
 
     * Validate your changes
 
 * {Installing as a Linux Service}
 
-    Since the Continuum linux script bin/linux/run.sh understands the same arguments as linux boot scripts, there is no need to write a particular
-    startup script to add Continuum to the linux boot process. All you need to do, as root, is:
-    
+    Since the Continuum Linux script <<<bin/continuum>>> understands the same arguments as Linux boot scripts, there is no need to write a particular
+    startup script to add Continuum to the Linux boot process. All you need to do, as root, is:
+
 ** {Basic script in /etc/init.d}
 
-    * Create a <<<'continuum'>>> file under <<</etc/init.d/>>> with the following content (replacing <<<continuum_user>>> with the name of an account you have already created):
+    * Create a <<<continuum>>> file under <<</etc/init.d/>>> with the following content. Replace <<<continuum_user>>> with the name of an account you have already created.
 
 ------------------
 #!/bin/sh
 
-CONTINUUM_HOME=/opt/continuum-1.2
+CONTINUUM_HOME=/opt/continuum-1.3
 su - continuum_user -c "$CONTINUUM_HOME/bin/continuum console $@ &"
 ------------------
 
-** {In a Debian-based system}
+** {On a Debian-based system}
 
 ------------------
-ln -s /usr/local/continuum-[VERSION]/bin/linux/run.sh /etc/init.d/continuum
+ln -s /usr/local/continuum-[VERSION]/bin/continuum /etc/init.d/continuum
 ------------------
 
-    At this point you have Continuum ready to be symlinked from different runlevels. This might sound a bit esoteric, but it is not, you will find these words
-    very fast as soon as you start reading about the init process. Fortunately, Debian GNU/Linux comes with a very handy utility to create this links, just run as root:
+    At this point you have Continuum ready to be symlinked from different runlevels. This might sound a bit esoteric, but it is not. You will find these words
+    very fast as soon as you start reading about the init process. Fortunately, Debian GNU/Linux comes with a very handy utility to create these links, just run as root:
 
 ------------------
 update-rc.d -n continuum defaults 80
@@ -93,20 +93,20 @@ update-rc.d -n continuum defaults 80
    /etc/rc5.d/S80continuum -> ../init.d/continuum
 ------------------
 
-    What you see is the symlinks that would be created. The above command didn't do anything because of the -n  switch, remove it to get the real links created.
+    What you see is the symlinks that would be created. The above command didn't actually create anything because of the -n  switch. Remove that switch and run the command again to have the real links created.
 
-** {In a RedHat-based system}
+** {On a RedHat-based system}
 
-    Configuring Continuum in a RedHat-based system (like Fedora Core) is slightly different: Instead of running update-rc.d, you need to add a new
-    service using chkconfig. And in order to add Continuum to chkconfig, it is necessary to add some comments to the /etc/rc.d/init.d/continuum script
-    and run a couple of commands; these tasks are automatically executed by running the chkconfig_install.sh script (note that _continuum_user_ needs to be
-    replaced by the name of an account you have already created):
+    Configuring Continuum on a RedHat-based system (like Fedora Core) is slightly different. Instead of running <<<update-rc.d>>>, you need to add a new
+    service using the <<<chkconfig>>> command. In order to add Continuum using <<<chkconfig>>>, it is necessary to add some comments to the <<</etc/rc.d/init.d/continuum>>> script
+    and run a couple of commands. These tasks are executed by running the <<<chkconfig_install.sh>>> script below. Note that <<<_continuum_user_>>> needs to be
+    replaced by the name of an account you have already created.
 
 ------------------
 #! /bin/sh
 #
-# chkconfig_install.sh - install Continuum on a chkconfig-bases system
-# 
+# chkconfig_install.sh - install Continuum on a chkconfig-based system
+#
 # Author: Felipe Leme <felipeal at apache.org>
 #
 
@@ -123,7 +123,7 @@ then
   exit 1
 fi
 
-echo "Creating file ${INITD_SCRIPT}"  
+echo "Creating file ${INITD_SCRIPT}"
 cat >> ${INITD_SCRIPT} <<EOF
 #! /bin/sh
 # chkconfig: 345 90 10
@@ -140,19 +140,19 @@ then
 fi
 # run Continuum as root
 cd ${CONTINUUM_HOME}
-./run.sh \$*
+./bin/continuum \$*
 # run Continuum as user _continuum_user_
-#su - _continuum_user_ -c "cd ${CONTINUUM_HOME}; ./run.sh \$*"
+#su - _continuum_user_ -c "cd ${CONTINUUM_HOME}; ./bin/continuum \$*"
 EOF
 chmod +x ${INITD_SCRIPT}
 
-echo "Adding Continuum to chkconfig"  
+echo "Adding Continuum to chkconfig"
 chkconfig --add continuum
 
-echo "Enabling Continuum on chkconfig"  
+echo "Enabling Continuum on chkconfig"
 chkconfig continuum on
 echo "Continuum set to start on run levels 3, 4 and 5."
-echo "To start continuum now, run 'service continuum start'"
+echo "To start Continuum now, run 'service continuum start'"
 
 ------------------
 

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/tomcat.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/tomcat.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/tomcat.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/tomcat.apt Thu May  6 09:23:13 2010
@@ -4,7 +4,7 @@
  Joakim Erdfelt
  Emmanuel Venisse
  ------
- 2008-09-01
+ 2010-02-18
  ------
 
 Guide to Install Continuum on Tomcat
@@ -19,7 +19,7 @@ Guide to Install Continuum on Tomcat
 
     With every Tomcat version you will need a few things before you can deploy Continuum.
 
-    [[1]] Use at least Java JDK 1.5.0_11 to run Tomcat w/Continuum.
+    [[1]] Use at least Java JDK 1.5.0_11 to run Tomcat with Continuum.
 
     [[1]] A defined \<Context\> xml section to define the JNDI resources.
 
@@ -54,7 +54,7 @@ Guide to Install Continuum on Tomcat
     The individual techniques for describing these resources, and the parameters associated with them are specific to the Tomcat version, resource type, and even JDBC implementation type.
 
     For the purposes of this document, the following assumptions are made.
-    
+
     [[1]] You are an Apache Tomcat administrator.
 
     [[1]] You have an SMTP Server on localhost, port 25, with no login / password.
@@ -67,14 +67,14 @@ Guide to Install Continuum on Tomcat
 
     <<Note:>> Continuum requires JavaMail 1.4 (or later)
 
-    Apache Tomcat does not typically ship with a copy of the JavaMail or Activation jar files. 
-    In your role as the Apache Tomcat administrator of your installation, you will need to obtain these jar files and place it into your preferred lib directory.
+    Apache Tomcat does not typically ship with a copy of the JavaMail or Activation JAR files.
+    In your role as the Apache Tomcat administrator of your installation, you will need to obtain these JAR files and place it into your preferred <<<lib>>> directory.
 
     The appropriate lib directory to choose is a personal preference, and we do not encourage or enforce a specific location for it, as all installations of Apache Tomcat are different.
 
     For the record, we personally put them in the <<<$CATALINA_HOME/common/lib/>>> directory.
 
-    Direct download links for these jar files.
+    Direct download links for these JAR files.
 
     * JavaMail 1.4 - {{{http://repo1.maven.org/maven2/javax/mail/mail/1.4/mail-1.4.jar}mail-1.4.jar}}
 
@@ -84,13 +84,15 @@ Guide to Install Continuum on Tomcat
 
     <<Note:>>Continuum 1.2 has been tested with Apache Derby 10.1.3.1
 
+~~TODO What version of Derby should be used with Continuum 1.3?
+
     The default installation of Continuum uses the Apache Derby 100% Java database to maintain Continuum-specific information, and also the Users / Security Database.
 
-    You will need to obtain the derby.jar and derbytools.jar and place them into your preferred lib directory.
+    You will need to obtain the <<<derby.jar>>> and <<<derbytools.jar>>> and place them into your preferred lib directory.
 
     We put them into the <<<$CATALINA_HOME/common/lib/>>> directory.
 
-    Direct download links for these jar files:
+    Direct download links for these JAR files:
 
     * {{{http://repo1.maven.org/maven2/org/apache/derby/derby/10.1.3.1/derby-10.1.3.1.jar}derby-10.1.3.1.jar}}
 
@@ -104,7 +106,7 @@ Guide to Install Continuum on Tomcat
 
     The format typically expected is <<<\-Dappserver.base=\<SOMEWHERE\>>>>
 
-    You can utilize the <<<$CATALINA_HOME/bin/setenv.sh>>> script to set this value in a tomcat specific way.
+    You can utilize the <<<$CATALINA_HOME/bin/setenv.sh>>> script to set this value in a Tomcat specific way.
 
 ------------------------------------------
 #!/bin/bash
@@ -115,10 +117,12 @@ export CATALINA_OPTS="-Dappserver.home=$
 
 * {Tomcat 5.0.x Specifics}
 
-    Tested on Tomcat v5.0.28
+    Tested on Tomcat v5.0.28.
 
     These instructions explain how to deploy the Continuum 1.2 web application in an existing installation of Tomcat 5.0.x.
 
+~~TODO What about for Continuum 1.3?
+
     <<Extra Jars:>>
 
         * You will need the {{{http://repo1.maven.org/maven2/xalan/xalan/2.7.0/xalan-2.7.0.jar}xalan-2.7.0.jar}} copied into your <<<$CATALINA_HOME/common/lib/>>> directory.
@@ -191,9 +195,9 @@ export CATALINA_OPTS="-Dappserver.home=$
 
 * {Tomcat 5.5.x Specifics}
 
-    Tested on Tomcat v5.5.17 and v5.5.25
+    Tested on Tomcat v5.5.17 and v5.5.25.
 
-    This example \<Context\> assumes technique #2 in the {{{#Defining_JNDI_Resources}Define JNDI Resource}} list. (This example lists out the <<<docBase>>> to the war file itself.)
+    This example \<Context\> assumes technique #2 in the {{{Defining_JNDI_Resources}Define JNDI Resource}} list. (This example lists out the <<<docBase>>> to the WAR file itself.)
 
 ------------------------------------------
 <Context path="/continuum"
@@ -222,12 +226,12 @@ export CATALINA_OPTS="-Dappserver.home=$
 </Context>
 ------------------------------------------
 
-    <<Warning:>> The Tomcat 5.5.20 and 5.5.23 releases are missing MailSessionFactory and a few other classes. 
+    <<Warning:>> The Tomcat 5.5.20 and 5.5.23 releases are missing MailSessionFactory and a few other classes.
     JNDI mail sessions will <<not>> work.  Use Tomcat 5.5.17 or see the workaround on {{{http://issues.apache.org/bugzilla/show_bug.cgi?id=40668}Bug 40668}}.
 
 * {Tomcat 6.0.x Specifics}
 
-    Tested on Tomcat v6.0.14
+    Tested on Tomcat v6.0.14.
 
 ------------------------------------------
 <Context path="/continuum"

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/upgrade.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/upgrade.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/upgrade.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/installation/upgrade.apt Thu May  6 09:23:13 2010
@@ -12,9 +12,23 @@ Upgrading Continuum
     This document will help you upgrade Continuum from 1.2.x to 1.3.3 and above.
 
     When upgrading Continuum, it could have some database model changes. Usually these changes will be migrated for you, but in some cases
-    you may need to use a backup from the previous version and to restore the data into the new version. The Data Management tool exports data from the
+    you may need to use a backup from the previous version and restore that data into the new version. The Data Management tool exports data from the
     old database model and imports the data into the new database model.
 
+    If you had used the <<<APP_BASE>>> environment variable in Continuum 1.2 to differentiate your configuration from the
+    installation, you should rename it to <<<CONTINUUM_BASE>>> in Continuum 1.3.
+    
+* Changes to Take Note of in Continuum 1.3.x
+    
+    The Jetty version in Continuum 1.3.4 and above has been upgraded to 6.1.19. When upgrading to Continuum 1.3.4 or higher, there is a need to update 
+    the library contents listed in <<<$CONTINUUM_BASE/conf/wrapper.conf>>> with the ones included in the new distribution especially if the
+    <<<$CONTINUUM_BASE>>> directory is separate from the installation.
+    
+    In Continuum 1.3.6, configuration for local repositories in build agents were added. This is used to match the local repository in the build
+    agent to that of the local repository (used by the project to be built) set in the master. So if you are upgrading from a lower version, 
+    you might need to add the <<<localRepositories>>> configuration in your build agent's configuration file. For more details, 
+    read {{{./build-agent.html}Installing and Configuring a Build Agent}}. 
+
 * Using Backup and Restore to upgrade
 
     There are 2 databases that need to be considered:  one for the builds and one for the users.
@@ -24,7 +38,7 @@ Upgrading Continuum
 
     The builds database has had model changes, and will need to be exported and imported.
 
-    First, download the Data Management tools you will need.  The tool is a standalone jar that you can download from the central repo.
+    First, download the Data Management tools you will need.  The tool is a standalone JAR that you can download from the central repo.
 
     You will need to download two versions of the tool, one for the export out of the old version and one for the import into the new version:
 
@@ -59,11 +73,13 @@ java -Xmx512m -jar data-management-cli-1
         * Execute this command to import the builds data from the xml file you created earlier:
 
 +------------------------------------------+
-java -Xmx512m -jar data-management-cli-1.3.2-app.jar -buildsJdbcUrl jdbc:derby:${new.continuum.home}/data/databases/continuum -mode IMPORT -directory backups
+java -Xmx512m -jar data-management-cli-1.3.2-app.jar -buildsJdbcUrl jdbc:derby:${new.continuum.home}/data/databases/continuum -mode IMPORT -directory backups -strict
 +------------------------------------------+
-        
+
+    <<Note:>> Remove <<<-strict>>> when importing data from 1.3.1 to 1.3.x to ignore unrecognized tags due to model changes.
+
         []
- 
+
         Finally, be aware that sometimes the NEXT_VAL values in the SEQUENCE_TABLE need to be adjusted.
 
             * Before starting Continuum for the first time after the import, connect to the db with a client like {{{http://squirrel-sql.sourceforge.net/}Squirrel SQL}} and check the values in the <<NEXT_VAL>> column of the SEQUENCE_TABLE.
@@ -90,4 +106,4 @@ UPDATE SEQUENCE_TABLE set NEXT_VAL = (se
         []
 
         Now you can start your new version of Continuum.
-  
+

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/build_results.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/build_results.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/build_results.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/build_results.apt Thu May  6 09:23:13 2010
@@ -10,32 +10,37 @@ Build Results Management
 [../../images/build_result-2.png] Builds tab
 
     To view the result of the build:
-    
+
     [[1]] Click the link for the project group of the project you want to view - the link will be
     under the <<Name>> column.
-    
+
     [[2]] Click the build number link under the <<Build>> column of the project you want to view.
     Or you can click the project link again and click the <<Builds>> link at the top of the page, then click
-    the <<Result>> link, next to the State column.
-    
+    the <<Result>> link, next to the <<State>> column.
+
     []
-    
+
     When builds are executed frequently, deleting unnecessary and failed build results is needed.
     To delete build results, follow these steps:
 
     [[1]] Click the name of the project group.
-    
+
     [[2]] Click on the build number under the <<Build>> column. You will be directed to the build result
     page as shown below.
 
+    \ 
+
 [../../images/build_result-1.png] Build Results page
 
+    The <<Triggered by>> field displays the username of the person who forced the build. 
+    However, this field is empty when the build is triggered by a schedule.
+
     Or you can click on the name of the project that you want to delete build results from.
 
-        * Click the <<Builds>> tab. Build results list will be displayed.
-        
+        * Click the <<Builds>> tab. The build results list will be displayed.
+
         * Check the box of the build results that you want to delete.
-        
+
         []
-        
-    [[3]] Click the <<Delete>> button.
\ No newline at end of file
+
+    [[3]] Click the <<Delete>> button.

Propchange: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/build_results.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/forced_build.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/forced_build.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/forced_build.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/forced_build.apt Thu May  6 09:23:13 2010
@@ -2,38 +2,50 @@
  Force Project Build
  ------
  ------
- Feb 23 2009
+ 2010-02-18
  ------
 
 Force Project Build
 
     Occasionally you may want to force a build outside of the regular schedule.
-    The following procedure explains how to do this.
-    
+    When builds are triggered manually, the following happens:
+
+    * Projects are updated from the SCM.
+      These are queued under the <<Prepare Build Queues>> section in <<Queues>> page.
+
+    * Builds of the projects are executed.
+      These are queued under the <<Build Queues>> in <<Queues>> page.
+
+    []
+
     To manually build a project perform the following steps:
-    
+
     [[1]] Click <<Show Project Groups>>.
-    
+
     [[2]] Click the project group link of the project you want to build.
     This will put you on the <<Summary>> page of the project group.
-    
+
     [[3]] You can click <<Build all projects>> button under <<Group Actions>> to build all
     the projects in the project group.
-    
+
 [../../images/force_build.png] Project Group Actions
 
     [[4]] To build an individual project, you can click on the build icon that is found
     along the row of the project you want to build. It is the first icon on the right of
     the project name. This will execute the default build goal you have defined for that project.
-    
+
     To build selected projects, check the box beside the name of the project,
     then click the <<Build Project(s)>> button.
-    
+
     If you want to build the project according to a specific build goal other than the
     default build goal, click on the project name to go to the <<Project's Information>> page.
     All build goal definitions for the project are listed under the <<Build Definitions>> section.
     Click on the build icon to the right of the specific build goal you want to execute.
-    
+
     []
     
-    To view the results of the build, refer to {{{build_results.html}Build Results Management}}.
\ No newline at end of file
+    *Note* In a distributed build setup, the project builds are not executed if no build agent is
+    configured or if a build agent group with no build agent, is configured in the build environment 
+    that is attached to the project's build definition.
+
+    To view the results of the build, refer to {{{./build_results.html}Build Results Management}}.

Propchange: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/forced_build.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/index.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/index.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/index.apt Thu May  6 09:23:13 2010
@@ -3,31 +3,49 @@
  ------
  Emmanuel Venisse
  ------
- Oct 3 2007
+ 2010-02-18
  ------
 
 Building Projects
 
-    For Ant and maven builds the following system properties will be added via -D command line:
-    
-    * continuum.project.group.name
-    
-    * continuum.project.lastBuild.state : last build state int flag
-    
-    * continuum.project.lastBuild.number
-    
-    * continuum.project.nextBuild.number
-    
-    * continuum.project.id
-    
-    * continuum.project.name
-    
-    * continuum.project.version
-    
-    [] 
-    
+    For Ant and Maven builds the following system properties will be added via -D command line:
+
+    * <<<continuum.project.group.name>>>
+
+    * <<<continuum.project.lastBuild.state>>> : last build state int flag
+
+    * <<<continuum.project.lastBuild.number>>>
+
+    * <<<continuum.project.nextBuild.number>>>
+
+    * <<<continuum.project.id>>>
+
+    * <<<continuum.project.name>>>
+
+    * <<<continuum.project.version>>>
+
+    []
+
+    When building projects, the build order is determined by the inter-dependency of the projects.
+    This would mean that the dependencies of a project are built first.
+
+    In cases when a project group can build projects in parallel build queues but one of those projects depend
+    on another project, the inter-dependent projects will build in the same build queue.
+
     Projects can be built in two ways:
-    
-    [[1]] {{{schedule_build.html} Scheduled Builds}}
-    
-    [[2]] {{{forced_build.html} Forced Builds}}
\ No newline at end of file
+
+    [[1]] {{{./schedule_build.html} Scheduled Builds}}
+
+    [[2]] {{{./forced_build.html} Forced Builds}}
+
+    []
+
+    Projects will have the <<in queue>> icon once the forced build or a scheduled build is triggered. This means that the project is either in the <<prepare build
+    queue>> or in the <<build queue>>.
+
+[../../images/inqueue.gif]
+
+    []
+
+    Checkout or update of projects takes longer with distributed builds enabled because after an SCM checkout or SCM update, an SCM changelog follows to get the "latest
+    update date" needed to determine whether projects should build or not.

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/schedule_build.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/schedule_build.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/schedule_build.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/schedule_build.apt Thu May  6 09:23:13 2010
@@ -2,14 +2,24 @@
  Scheduling Project Build
  ------
  ------
- Feb 23 2009
+ 2010-02-18
  ------
 
 Scheduling Project Build
 
-    Schedules determine the project's time interval to build. In this section,
-    how to configure a project to build on a schedule is discussed.
-    
+    Schedules determine the project's time interval to build.
+
+    When scheduled builds are triggered, there is no dependency ordering between project groups
+    and the following happens:
+
+    * Projects are updated from the SCM.
+      These are queued under the <<Prepare Build Queues>> section in <<Queues>> page.
+
+    * Builds of the projects are executed.
+      These are queued under the <<Build Queues>> in <<Queues>> page.
+
+    []
+
     To configure a scheduled build:
 
     [[1]] Create a schedule. You can refer to {{{../../administrator_guides/schedules.html} Managing Schedules}} section.
@@ -21,4 +31,8 @@ Scheduling Project Build
 
     []
     
-    To view the results of the build, refer to {{{build_results.html}Build Results Management}}.
\ No newline at end of file
+    *Note* In a distributed build setup, the project builds are not executed if no build agent is
+    configured or if a build agent group with no build agent, is configured in the build environment 
+    that is attached to the project's build definition.
+
+    To view the results of the build, refer to {{{./build_results.html}Build Results Management}}.

Propchange: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/building_project/schedule_build.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/cancelling_build/cancelGroupBuild.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/cancelling_build/cancelProjectBuild.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/cancelling_build/cancelProjectBuild.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/cancelling_build/cancelProjectBuild.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/cancelling_build/cancelProjectBuild.apt Thu May  6 09:23:13 2010
@@ -10,6 +10,6 @@ Cancelling Project Build
 
     This will cancel the build of the selected project.
 
-    To cancel build for project, click the
+    To cancel the build for project, click the <<Cancel>> button of the project on the <<Project Group Summary>> page or on the <<Queues>> page.
 
-[../../images/cancelbuild.gif] Cancel Button of the project on the Project Group Summary page or on the Queues page.
+[../../images/cancelbuild.gif] Cancel Button

Propchange: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/cancelling_build/cancelProjectBuild.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/cancelling_build/index.apt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/index.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/index.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/index.apt Thu May  6 09:23:13 2010
@@ -1,17 +1,20 @@
  ------
  User's Guides
  ------
+ ------
+ 2010-02-18
+ ------
 
 User's Guides
 
- * {{{building_project/index.html}Building Projects}}
+ * {{{./building_project/index.html}Building Projects}}
 
- * {{{cancelling_build/index.html}Cancelling Builds}}
+ * {{{./cancelling_build/index.html}Cancelling Builds}}
 
- * {{{managing_builddef/index.html}Managing Build Definitions}}
+ * {{{./managing_builddef/index.html}Managing Build Definitions}}
 
- * {{{managing_project/index.html}Managing Projects}}
+ * {{{./managing_project/index.html}Managing Projects}}
 
- * {{{notification/index.html}Notifications}}
+ * {{{./notification/index.html}Notifications}}
 
- * {{{release/index.html}Releasing Projects}}
+ * {{{./release/index.html}Releasing Projects}}

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefGroup.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefGroup.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefGroup.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefGroup.apt Thu May  6 09:23:13 2010
@@ -12,35 +12,35 @@ Project Group Build Definition
 
 [../../images/buildDefGroup.png] Project Group Build Definitions
 
-    To add build defintion to your project group:
-    
+    To add a build defintion to your project group:
+
     [[1]] Under the <<Build Definitions>> tab in the <<Project Information>> screen, click <<Add>>.
-    
+
     [[2]] Supply the values for the necessary fields.
 
     * Enter your <<POM filename>>, which is very likely the same as previous builds, <<<pom.xml>>>.
-    
+
     * In the <<Goals>> text box, enter your new goals. For example, <<<clean site deploy>>> or <<<release:branch>>>.
 
     * You may have arguments for Maven, such as <<<--batch-mode --non-recursive>>>.
-    Add your arguments in the Arguments text box or leave it empty.
+    Add your arguments in the <<Arguments>> text box or leave it empty.
 
-    * Check <<Build Fresh>> to do a fresh checkout from CVS before the build process.
+    * Check <<Build Fresh>> to do a fresh checkout from SCM before the build process.
     Check <<Always Build>> if you want to execute the goal every time you build the project.
     If you want this build definition to be your default for building your project,
     check the <<Is it default?>> check box.
-    
+
     * Select your build schedule from the pull-down menu. There will only be the <<<DEFAULT_SCHEDULE>>>
     if you have not defined any others.
-    
-    * Select from the pull-down menu the <<Build Environment>> for the build goal.
-    
+
+    * Select from the pull-down menu the <<Build Environment>> for the build definition.
+
     * Select the <<Type>> from the pull-down menu.
-    
+
     * You can supply a short description of the build definition (<<Definition>>).
-    
+
     []
 
 [../../images/add_goal.png]
-    
+
     [[3]] Click <<Save>>.
\ No newline at end of file

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefProject.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefProject.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefProject.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_builddef/builddefProject.apt Thu May  6 09:23:13 2010
@@ -8,41 +8,41 @@
 
 Project Build Definition
 
-    The project level build definition is executed to a specific project where the build definition is defined.
+    The project level build definition is executed for a specific project where the build definition is defined.
 
 [../../images/buildDefProject.png] Project Build Definitions
 
-    To add build defintion to your project:
-    
+    To add a build defintion to your project:
+
     [[1]] Select a project within the group.
-    
+
     [[2]] Under the <<Build Definitions>> section in the <<Project Information>> screen, click <<Add>>.
-    
+
     [[3]] Supply the values for the necessary fields.
 
     * Enter your <<POM filename>>, which is very likely the same as previous builds, <<<pom.xml>>>.
-    
+
     * In the <<Goals>> text box, enter your new goals. For example, <<<clean site deploy>>> or <<<release:branch>>>.
 
     * You may have arguments for Maven, such as <<<--batch-mode --non-recursive>>>.
-    Add your arguments in the Arguments text box or leave it empty.
+    Add your arguments in the <<Arguments>> text box or leave it empty.
 
-    * Check <<Build Fresh>> to do a fresh checkout from CVS before the build process.
+    * Check <<Build Fresh>> to do a fresh checkout from SCM before the build process.
     Check <<Always Build>> if you want to execute the goal every time you build the project.
     If you want this build definition to be your default for building your project,
     check the <<Is it default?>> check box.
-    
+
     * Select your build schedule from the pull-down menu. There will only be the <<<DEFAULT_SCHEDULE>>>
     if you have not defined any others.
-    
-    * Select from the pull-down menu the <<Build Environment>> for the build goal.
-    
+
+    * Select from the pull-down menu the <<Build Environment>> for the build definition.
+
     * Select the <<Type>> from the pull-down menu.
-    
+
     * You can supply a short description of the build definition (<<Definition>>).
-    
+
     []
 
 [../../images/add_goal.png]
-    
+
     [[4]] Click <<Save>>.
\ No newline at end of file

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_builddef/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_builddef/index.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_builddef/index.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_builddef/index.apt Thu May  6 09:23:13 2010
@@ -4,17 +4,16 @@
  Emmanuel Venisse
  Olivier Lamy
  ------
- Oct 3 2007
+ 2010-02-18
  ------
 
 Managing Build Definitions
 
     Each project or project group must have at least one attached build definition in order to build.
-    
+
     Depending on the project, you can define different values which will be used in order to build your project.
-    
-    Continuum includes some default build definitions which can be changed in the <<{{{../../administrator_guides/builddefTemplate.html}Build Definition Templates screen}}>>.
-    
-    You can add or edit build definitions at the <<{{{builddefGroup.html}Project Group level}}>> or at the <<{{{builddefProject.html}Project level}}>>.
-    
-     
\ No newline at end of file
+
+    Continuum includes some default build definitions which can be changed in the <<{{{../../administrator_guides/builddefTemplate.html}Build Definition Templates}}>> screen.
+
+    You can add or edit build definitions at the <<{{{./builddefGroup.html}Project Group level}}>> or at the <<{{{./builddefProject.html}Project level}}>>.
+

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt Thu May  6 09:23:13 2010
@@ -13,66 +13,86 @@ Add a Project
 
 * {Maven 2 project}
 
-  From the menu, choose the 'Maven 2.0.x Project' entry
-    
-[../../images/add-m2-project-menu.png] Add a maven2 project
-
-  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 enabled manually).
-    
-  Or it can be uploaded from a local file (Note this doesn't support multi modules project).
-    
-[../../images/add-m2-project.png] Add a maven2 project
-
-  You can define username/password if the POM URL requires authentication.
-
-  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.
-
-  You can define the group you want to use or "Defined by POM" in this case project.name will be use as Project Group.
-
-  By default, Continuum adds each sub-module POM as an individual Continuum Project. If you want to add only the root POM without sub-modules, check the "load only root as recursive build" field.
-  
-  You can choose a Build Definition Template which will be applied to your project.  If you choose a Build Definition
-  Template, the build definitions from the template will be added in addition to any build definitions that are defined
+  From the menu, choose the <<Maven 2.0.x Project>> entry
+
+[../../images/add-m2-project-menu.png] Add a Maven 2 project
+
+  The <<<pom.xml>>> file must be available through one of the following protocols: http, https, or ftp.
+
+  <<Note:>> The file protocol is also supported but is disabled by default for security and must be enabled manually.
+
+~~ TODO: Explain how to enable the file protocol
+
+  The <<<pom.xml>>> can also be uploaded from a local file.
+
+  <<Note:>> This doesn't support multi module projects.
+
+[../../images/add-m2-project.png] Add a Maven 2 project
+
+  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 used 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.
+
+  By default, Continuum adds each sub-module POM as an individual Continuum Project. If you want to add only the root POM without sub-modules, check the <<load only root as recursive build>> field.
+
+  You can choose a <<Build Definition Template>> which will be applied to your project.  If you choose a <<Build Definition
+  Template>>, the build definitions from the template will be added in addition to any build definitions that are defined
   at the project group level.
 
+  When adding projects whose parent project is building on another server,
+  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/>>>.
+
+  The scm connection url must be present in the POM and must match the actual location of the pom in the scm repository.
+
 * {Maven 1 project}
-    
-  From the menu, choose the 'Maven 1.x Project' entry
-    
-[../../images/add-m1-project-menu.png] Add a maven1 project
-
-  The project.xml file must be available through one of the following format : http, https and ftp 
-  (file protocol is off by default for security and must enabled manually).
-    
-  Or it can be uploaded (Note this doesn't support multi modules project).
+
+  From the menu, choose the <<Maven 1.x Project>> entry
+
+[../../images/add-m1-project-menu.png] Add a Maven 1 project
+
+  The <<<project.xml>>> file must be available through one of the following format : http, https and ftp.
+
+  <<Note:>> The file protocol is off by default for security and must enabled manually.
+
+  The <<<project.xml>>> can also be uploaded from a local file.
+
+  <<Note:>> This doesn't support multi modules project.
 
   The project you're adding can't use a parent.
-    
-[../../images/add-m1-project.png] Add a maven1 project
+
+[../../images/add-m1-project.png] Add a Maven 1 project
 
   You can define username/password if the POM URL require an authentication.
 
-  If your SCM store credentials like CVS or SVN and you want to use the SCM Credentials cache, check the "Use SCM Credentials Cache" field.
+  If your SCM store credentials like CVS or SVN and you want to use the SCM Credentials cache, check the <<Use SCM Credentials Cache>> field.
+
+  You can define the group you want to use or <<Defined by POM>>. In this case <<<project.name>>> will be used as the <<Project Group>>.
 
-  You can define the group you want to use or "Defined by POM." In this case project.name will be used as the Project Group.
-  
-  You can choose a Build Definition Template which will be applied to your project.
+  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>>.
+
+  You can choose a <<Build Definition Template>> which will be applied to your project.
 
 * {ANT Project}
 
-  From the menu, choose the 'Ant Project' entry
-    
-[../../images/add-ant-project-menu.png] Add a Ant project
+  From the menu, choose the <<Ant Project>> entry
+
+[../../images/add-ant-project-menu.png] Add an Ant project
 
     TO WRITE
 
-[../../images/add-ant-project.png] Add a Ant project
+[../../images/add-ant-project.png] Add an Ant project
 
 * {Shell Project}
 
-  From the menu, choose the 'Shell Project' entry
-    
+  From the menu, choose the <<Shell Project>> entry
+
 [../../images/add-shell-project-menu.png] Add a shell project
 
     TO WRITE
@@ -81,11 +101,11 @@ Add a Project
 
 * {Add a project from the Project Group}
 
-    From the Project Group, you can add a project without using the menu. With this operation, the Project Group will be set to the current group.
+    From the <<Project Group>>, you can add a project without using the menu. With this operation, the <<Project Group>> will be set to the current group.
 
 [../../images/add-project-from-group.png] Add a project from a project group
 
-* {Scm hints}
+* {SCM hints}
 
 ** {ClearCase}
 
@@ -109,4 +129,4 @@ Add a Project
 +----------------------------+
 
     This configuration won't work with each ClearCase installation because each ClearCase configuration is different, so we recommend reading the
-    {{{http://maven.apache.org/scm/clearcase.html}ClearCase page}} on the Maven-SCM site.
+    {{{http://maven.apache.org/scm/clearcase.html}ClearCase page}} on the Maven SCM site.

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt Thu May  6 09:23:13 2010
@@ -13,14 +13,14 @@ Edit a Project
 
 * {Project View}
 
-  When you edit a project from the Group Summary page, you will see basic information.
+  When you edit a project from the <<Group Summary>> page, you will see basic information.
   The first part of the page contains information regarding:
 
   * project name
 
-  * project version 
+  * project version
 
-  * project scm url
+  * project SCM URL
 
   * project Last Build Date
 
@@ -30,16 +30,16 @@ Edit a Project
 
 [../../images/project-view-top.png] Project View Top
 
-  With the <<<'Edit'>>> button, you can change some project informations like the scm url if your project was moved.
-  With the <<<'Build Now'>>> button, you build the project manually with the default build definition.
+  With the <<Edit>> button, you can change some project information like the SCM URL if your project was moved.
+  With the <<Build Now>> button, you build the project manually with the default build definition.
 
-  Second part contains information regarding:
+  The second part contains information regarding:
 
   * project notifiers
 
   * project dependencies
 
-  * project developpers
+  * project developers
 
   []
 
@@ -47,9 +47,9 @@ Edit a Project
 
 * {Build Results}
 
-  You can view all project's Build Results with the link Builds 
-  You will see all build results summary : start/end Time, result.
-  It's possible to delete some build results with checkboxes
+  You can view all project's <<Build Results>> with the link <<Builds>>.
+  You will see all build results summary: start/end time, result.
+  It's possible to delete some build results with checkboxes.
 
 [../../images/build-results.png] Build Results
 
@@ -57,11 +57,11 @@ Edit a Project
 
 * {Build Result}
 
-  Editing a build result will display :
+  Editing a build result will display:
 
-  * scm changes (author and file path)
+  * SCM changes (author and file path)
 
-  * project dependencies (project recorded in this continuum instance)
+  * project dependencies (project recorded in this Continuum instance)
 
   * detail of the build definition used
 
@@ -70,7 +70,3 @@ Edit a Project
   []
 
 [../../images/build-result.png] Build Result
-
-
-
-

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/index.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/index.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/index.apt Thu May  6 09:23:13 2010
@@ -3,13 +3,15 @@
  ------
  Emmanuel Venisse
  ------
- Nov 15 2007
+ 2010-02-18
  ------
 
 Managing Projects
 
-    * {{{addProject.html}How to add a project}}
+    * {{{./addProject.html}How to add a project}}
 
-    * {{{editProject.html}How to edit a project}}
+    * {{{./editProject.html}How to edit a project}}
 
-    * {{{removeProject.html}How to remove a project}}
+    * {{{./removeProject.html}How to remove a project}}
+
+    * {{{./workingCopy.html}Viewing the project's working copy}}

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/managing_project/removeProject.apt Thu May  6 09:23:13 2010
@@ -8,8 +8,8 @@
 
 Remove a Project
 
-    To remove a project, go to the Project Group Summary and click the <<delete>> icon.
+    To remove a project, go to the <<Project Group Summary>> and click the <<delete>> icon.
 
 [../../images/delete.gif] Delete icon
 
-    You can also use the <<<'Delete group'>>> button in the Project Group Summary to remove the whole project group.
+    You can also use the <<Delete group>> button in the <<Project Group Summary>> to remove the whole project group.

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/index.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/index.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/index.apt Thu May  6 09:23:13 2010
@@ -3,15 +3,15 @@
  ------
  Emmanuel Venisse
  ------
- Oct 3 2007
+ 2010-02-18
  ------
 
 Managing Notification
 
-  Notifiers can be attached to a Maven project by adding them to the pom in the {{{http://maven.apache.org/pom.html#Continuous_Integration_Management}ciManagement section}}.
-  
+  Notifiers can be attached to a Maven project by adding them to the POM in the {{{http://maven.apache.org/pom.html#Continuous_Integration_Management}ciManagement section}}.
+
 +-------------------------------+
-  
+
   <ciManagement>
     <system>continuum</system>
     <url>http://127.0.0.1:8080/continuum</url>
@@ -27,32 +27,32 @@ Managing Notification
         </configuration>
       </notifier>
     </notifiers>
-  </ciManagement>  
-  
-+-------------------------------+  
-
-  Or they can be added to a Project Group with the Notifiers link:
-  
-[../../images/notifiers-link-project-group.png] Notifiers Link  
-  
-  Or to a project with the Add button on the Edit Project page:
-  
-[../../images/notifiers-button-project.png] Notifier Button 
+  </ciManagement>
+
++-------------------------------+
+
+  Or they can be added to a <<Project Group>> with the <<Notifiers>> link:
+
+[../../images/notifiers-link-project-group.png] Notifiers Link
+
+  Or added to a project with the <<Add>> button on the <<Edit Project>> page:
+
+[../../images/notifiers-button-project.png] Notifier Button
 
-  Here you select between Notifier implementations provided with Continuum:
+  Here you select between the Notifier implementations provided with Continuum:
 
 [../../images/notifiers-type-choice.png] Notifier Type Choice
 
   You have the following choices:
-  
-  * {{{mail.html}Mail}}
-  
-  * {{{irc.html}IRC}}
-  
-  * {{{jabber.html}Jabber}}
-  
-  * {{{msn.html}MSN}}
-  
-  * {{{wagon.html}Wagon}}
-    
-   
+
+  * {{{./mail.html}Mail}}
+
+  * {{{./irc.html}IRC}}
+
+  * {{{./jabber.html}Jabber}}
+
+  * {{{./msn.html}MSN}}
+
+  * {{{./wagon.html}Wagon}}
+
+

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/irc.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/irc.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/irc.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/irc.apt Thu May  6 09:23:13 2010
@@ -1,5 +1,5 @@
  ------
- Irc Notification
+ IRC Notification
  ------
  Olivier Lamy
  ------
@@ -8,33 +8,33 @@
 
 IRC Notification
 
-  [[1]] Under Notifiers from the Project Information page, click Add.
-  
-  [[2]] On the Add Notifier form select IRC from the pull-down menu and click Submit.
-  
+  [[1]] Under <<Notifiers>> from the <<Project Information>> page, click <<Add>>.
+
+  [[2]] On the <<Add Notifier>> form select <<IRC>> from the pull-down menu and click <<Submit>>.
+
   [[3]] On the next page, fill out the form with the following information:
-    
+
     * IRC Host
-    
+
     * IRC Port
-    
+
     * IRC Channel
-    
+
     * Nick Name
-    
+
     * Alternate Nick Name
-    
+
     * User Name
-    
+
     * Full Name
-    
+
     * Password which can be left blank if you did not specify one in your IRC account
-    
+
     []
-    
+
 [../../images/notifier-irc-add.png] Add IRC Notifier
-  
-  [[4]] Select the “Send on ...” options you want.
-  
-  [[5]] Click Save. The IRC notifier you just added will be listed under Notifiers on the Project
-  Information page along with the other notifiers you may have set up prior to this.
+
+  [[4]] Select the <<Send on ...>> options you want.
+
+  [[5]] Click <<Save>>. The IRC notifier you just added will be listed under <<Notifiers>> on the <<Project
+  Information>> page along with the other notifiers you may have set up prior to this.

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/jabber.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/jabber.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/jabber.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/jabber.apt Thu May  6 09:23:13 2010
@@ -8,32 +8,32 @@
 
 Jabber Notification
 
-  [[1]] Under Notifiers from the Project Information page, click Add.
-  
-  [[2]] Select Jabber from the pull-down menu and click Submit.
-  
-  [[3]] On the Add/Edit Jabber Notifier page, fill out the form with the following:
-  
+  [[1]] Under <<Notifiers>> from the <<Project Information>> page, click <<Add>>.
+
+  [[2]] Select <<Jabber>> from the pull-down menu and click Submit.
+
+  [[3]] On the <<Add/Edit Jabber Notifier>> page, fill out the form with the following:
+
     * Jabber Host
-    
+
     * Jabber Port is typically 5222
-    
+
     * Jabber Login
-    
+
     * Jabber Password
-    
+
     * Jabber Domain Name is the fully qualified domain name of your Jabber login
-    
+
     * Jabber Recipient Address
-    
+
     []
-    
+
 [../../images/notifier-jabber-add.png] Add Jabber Notifier
-    
+
   The Jabber login and Jabber recipient address must be different. The Jabber
   recipient must also be added in the contact list of the sender (at least for Google talk).
-  
-  [[4]] Select the “Send on ...” options you want.
-  
-  [[5]] Click Save. The Jabber notifier you just added will be listed under Notifiers on the Project
-  Information page along with the other notifiers you may have set up prior to this.
\ No newline at end of file
+
+  [[4]] Select the <<Send on ...>> options you want.
+
+  [[5]] Click <<Save>>. The Jabber notifier you just added will be listed under <<Notifiers>> on the <<Project
+  Information>> page along with the other notifiers you may have set up prior to this.

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/mail.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/mail.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/mail.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/mail.apt Thu May  6 09:23:13 2010
@@ -3,41 +3,44 @@
  ------
  Olivier Lamy
  ------
- Oct 23 2007
+ 2010-03-02
  ------
 
 Mail Notification
 
-  If you are using Maven 2, email notifiers configured in pom.xml will be automatically added, and you may
+  If you are using Maven 2, email notifiers configured in <<<pom.xml>>> will be automatically added, and you may
   have as many as you need.
-    
+
 +-------------------------------+
-  
+
   <ciManagement>
     <system>continuum</system>
     <notifiers>
       <notifier>
         <configuration>
           <address>email adress</address>
+          <committers>true</committers>
+          <developers>true</developers>
         </configuration>
       </notifier>
     </notifiers>
-  </ciManagement>  
-  
-+-------------------------------+     
+  </ciManagement>
+
++-------------------------------+
 
   Or can you can manually add mail notifiers at the project group or individual project level.
-  
-  On the <<Add Notifier>> form select <<Mail>> from the pull-down menu and click Submit.
-  
-[../../images/notifier-mail-add.png] Add Email Notifier 
 
-  You must either provide a single email address, or select to notify the latest committers.
+  On the <<Add Notifier>> form select <<Mail>> from the pull-down menu and click <<Submit>>.
+
+[../../images/notifier-mail-add.png] Add Email Notifier
+
+  You must either provide a single email address, or select to notify the latest committers or project
+  developers.
 
 ~~ TODO:  Does notifying an email address in addition to the latest committers also work?
 
-  In addition you may select one or more "Send on..." options.
+  In addition you may select one or more <<Send on...>> options.
 
 ~~ TODO:  What is "Send on Warning"?  We only have three build states:  error, failure, success
-  
+
   Then, click <<Save>>.

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/msn.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/msn.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/msn.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/msn.apt Thu May  6 09:23:13 2010
@@ -8,23 +8,23 @@
 
 MSN Notification
 
-  [[1]] Under Notifiers from the Project Information page, click Add.
-  
-  [[2]] On the Add Notifier form select, MSN from the pull-down menu and click Submit.
-  
+  [[1]] Under <<Notifiers>> from the <<Project Information>> page, click <<Add>>.
+
+  [[2]] On the <<Add Notifier>> form select <<MSN>> from the pull-down menu and click <<Submit>>.
+
   [[3]] On the next page, fill out the form with the following:
-  
+
     * MSN Login
-    
+
     * MSN Password
-    
+
     * MSN Recipient Address
-    
+
     []
-  
+
 [../../images/notifier-msn-add.png] Add MSN Notifier
-  
-  [[4]] Select the “Send on ...” options you want.
-  
-  [[5]] Click Save. The MSN notifier you just added will be listed under Notifiers on the Project
-  Information page along with the other notifiers you may have set up prior to this.
\ No newline at end of file
+
+  [[4]] Select the <<Send on ...>> options you want.
+
+  [[5]] Click <<Save>>. The MSN notifier you just added will be listed under <<Notifiers>> on the <<Project
+  Information>> page along with the other notifiers you may have set up prior to this.

Modified: continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/wagon.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/wagon.apt?rev=941625&r1=941624&r2=941625&view=diff
==============================================================================
--- continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/wagon.apt (original)
+++ continuum/branches/continuum-flat-multi-module/continuum-docs/src/site/apt/user_guides/notification/wagon.apt Thu May  6 09:23:13 2010
@@ -1,5 +1,5 @@
  ------
- Jabber Notification
+ Wagon Notification
  ------
  Olivier Lamy
  ------
@@ -8,16 +8,16 @@
 
 Wagon Notification
 
-  [[1]] Under Notifiers from the Project Information page, click Add.
-  
-  [[2]] On the Add Notifier form select Wagon from the pull-down menu and click Submit.
-  
+  [[1]] Under <<Notifiers>> from the <<Project Information>> page, click <<Add>>.
+
+  [[2]] On the <<Add Notifier>> form select <<Wagon>> from the pull-down menu and click <<Submit>>.
+
   [[3]] On the next page, enter the Project Site URL.
-  
+
   It must be a Wagon URL like the URL used in <<<distributionManagement>>>. For the Webdav protocol,
-  you can use <<<dav:[http_url]>>> or <<<file:///path_to_the_directory>>> if you want to copy it locally
+  you can use <<<dav:[http_url]>>>, or <<<file:///path_to_the_directory>>> if you want to copy it locally
   with the file protocol.
-  
+
   [[4]] Enter the ServerId. This should match the value of the <<<\<id\>>>> in the server configuration found in
   <<<settings.xml>>>. Sample configuration follows:
 
@@ -30,23 +30,23 @@ Wagon Notification
 +------+
 
   Using the server configuration in <<<[user_home]/.m2/settings.xml>>> is a workaround
-  for user authentication using the wagon notifier.
+  for user authentication using the Wagon notifier.
 
   The <<<\<username\>>>> and <<<\<password\>>>> should be set to the user account that has the <<Site
   Producer>> and <<Site Observer>> roles.
-  
+
 [../../images/notifier-wagon-add.png] Add Wagon Notifier
-  
-  [[5]] Select the “Send on ...” options you want.
-  
-  [[6]] Click Save. The Wagon notifier you just added will be listed under Notifiers on the Project
-  Information page along with the other notifiers you may have set up prior to this.
-  
+
+  [[5]] Select the <<Send on ...>> options you want.
+
+  [[6]] Click <<Save>>. The Wagon notifier you just added will be listed under <<Notifiers>> on the <<Project
+  Information>> page along with the other notifiers you may have set up prior to this.
+
   []
-  
-  The file protocol will create <<<buildresult.txt>>> file locally in the location specified in the
-  Wagon Notifier configuration. If you used the Webdav protocol, a <<<buildresult.txt>>> file will
+
+  The file protocol will create a <<<buildresult.txt>>> file locally in the location specified in the
+  Wagon Notifier configuration. If you use the Webdav protocol, a <<<buildresult.txt>>> file will
   be copied to your disk, relative to where you told it to be placed when you set up the Wagon
   notifier.
-  
-  You can also view the <<<buildresult.txt>>> file from a browser at the Project Site URL you specified.
\ No newline at end of file
+
+  You can also view the <<<buildresult.txt>>> file from a browser at the Project Site URL you specified.



Mime
View raw message