You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2008/10/29 05:16:22 UTC
svn commit: r708765 [2/7] - in
/continuum/branches/continuum-transient-state: ./ continuum-api/
continuum-api/src/main/java/org/apache/continuum/configuration/
continuum-api/src/main/java/org/apache/continuum/dao/
continuum-api/src/main/java/org/apache...
Modified: continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java Tue Oct 28 21:16:12 2008
@@ -47,20 +47,26 @@
import org.apache.maven.continuum.reports.surefire.ReportTestSuiteGenerator;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.exception.ResourceNotFoundException;
-import org.codehaus.plexus.mailsender.MailMessage;
-import org.codehaus.plexus.mailsender.MailSender;
-import org.codehaus.plexus.mailsender.MailSenderException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.velocity.VelocityComponent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.mail.javamail.JavaMailSender;
+import javax.mail.Address;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -95,9 +101,9 @@
private Continuum continuum;
/**
- * @plexus.configuration
+ * @plexus.requirement
*/
- private MailSender mailSender;
+ private JavaMailSender javaMailSender;
/**
* @plexus.requirement
@@ -659,23 +665,24 @@
return;
}
- MailMessage message = new MailMessage();
+ try
+ {
- message.addHeader( "X-Continuum-Build-Host", buildHost );
+ MimeMessage message = javaMailSender.createMimeMessage();
- message.addHeader( "X-Continuum-Project-Id", Integer.toString( project.getId() ) );
+ message.addHeader( "X-Continuum-Build-Host", buildHost );
- message.addHeader( "X-Continuum-Project-Name", project.getName() );
+ message.addHeader( "X-Continuum-Project-Id", Integer.toString( project.getId() ) );
+
+ message.addHeader( "X-Continuum-Project-Name", project.getName() );
- try
- {
message.setSubject( subject );
log.info( "Message Subject: '" + subject + "'." );
- message.setContent( content );
+ message.setText( content );
- MailMessage.Address from = new MailMessage.Address( fromMailbox, fromName );
+ InternetAddress from = new InternetAddress( fromMailbox, fromName );
message.setFrom( from );
@@ -693,16 +700,15 @@
if ( StringUtils.isNotEmpty( addressField ) )
{
String[] addresses = StringUtils.split( addressField, "," );
-
for ( String address : addresses )
{
// TODO: set a proper name
- MailMessage.Address to = new MailMessage.Address( address.trim() );
+ InternetAddress to = new InternetAddress( address.trim() );
log.info( "Recipient: To '" + to + "'." );
-
- message.addTo( to );
+ message.addRecipient( Message.RecipientType.TO, to );
}
+
}
String committerField = (String) notifier.getConfiguration().get( COMMITTER_FIELD );
@@ -742,11 +748,10 @@
else
{
// TODO: set a proper name
- MailMessage.Address to = new MailMessage.Address( email.trim() );
-
+ InternetAddress to = new InternetAddress( email.trim() );
log.info( "Recipient: To '" + to + "'." );
- message.addTo( to );
+ message.addRecipient( Message.RecipientType.TO, to );
}
}
}
@@ -760,16 +765,26 @@
{
// TODO: use configuration file instead of to load it fron component configuration
// TODO: set a proper name
- MailMessage.Address to = new MailMessage.Address( toOverride.trim() );
-
+ InternetAddress to = new InternetAddress( toOverride.trim() );
log.info( "Recipient: To '" + to + "'." );
- message.addTo( to );
+ message.addRecipient( Message.RecipientType.TO, to );
}
- mailSender.send( message );
+ message.setSentDate( new Date() );
+
+ javaMailSender.send( message );
+ //mailSender.send( message );
+ }
+ catch ( AddressException ex )
+ {
+ throw new NotificationException( "Exception while sending message.", ex );
+ }
+ catch ( MessagingException ex )
+ {
+ throw new NotificationException( "Exception while sending message.", ex );
}
- catch ( MailSenderException ex )
+ catch ( UnsupportedEncodingException ex )
{
throw new NotificationException( "Exception while sending message.", ex );
}
@@ -802,7 +817,7 @@
return;
}
- MailMessage message = new MailMessage();
+ MimeMessage message = javaMailSender.createMimeMessage();
try
{
@@ -810,9 +825,9 @@
log.info( "Message Subject: '" + subject + "'." );
- message.setContent( content );
+ message.setText( content );
- MailMessage.Address from = new MailMessage.Address( fromMailbox, fromName );
+ InternetAddress from = new InternetAddress( fromMailbox, fromName );
message.setFrom( from );
@@ -839,11 +854,10 @@
for ( String address : addresses )
{
// TODO: set a proper name
- MailMessage.Address to = new MailMessage.Address( address.trim() );
+ InternetAddress to = new InternetAddress( address.trim() );
log.info( "Recipient: To '" + to + "'." );
-
- message.addTo( to );
+ message.addRecipient( Message.RecipientType.TO, to );
}
}
}
@@ -853,19 +867,28 @@
{
// TODO: use configuration file instead of to load it fron component configuration
// TODO: set a proper name
- MailMessage.Address to = new MailMessage.Address( toOverride.trim() );
-
+ InternetAddress to = new InternetAddress( toOverride.trim() );
log.info( "Recipient: To '" + to + "'." );
- message.addTo( to );
+ message.addRecipient( Message.RecipientType.TO, to );
}
- mailSender.send( message );
+ message.setSentDate( new Date() );
+
+ javaMailSender.send( message );
}
- catch ( MailSenderException ex )
+ catch ( AddressException ex )
{
throw new NotificationException( "Exception while sending message.", ex );
- }
+ }
+ catch ( MessagingException ex )
+ {
+ throw new NotificationException( "Exception while sending message.", ex );
+ }
+ catch ( UnsupportedEncodingException ex )
+ {
+ throw new NotificationException( "Exception while sending message.", ex );
+ }
}
private Map<String, String> mapDevelopersToRecipients( List<ProjectDeveloper> developers )
Modified: continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java Tue Oct 28 21:16:12 2008
@@ -19,17 +19,6 @@
* under the License.
*/
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.UnknownHostException;
-
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpException;
import org.apache.http.HttpResponse;
@@ -57,6 +46,17 @@
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.UnknownHostException;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -68,23 +68,23 @@
{
private static final String TMP_DIR = System.getProperty( "java.io.tmpdir" );
-
+
private DefaultHttpClient httpClient;
-
-
+
+
public void initialize()
throws InitializationException
{
SchemeRegistry schemeRegistry = new SchemeRegistry();
// http scheme
- schemeRegistry.register( new Scheme( "http", PlainSocketFactory.getSocketFactory(), 80 ) );
+ schemeRegistry.register( new Scheme( "http", PlainSocketFactory.getSocketFactory(), 80 ) );
// https scheme
- SSLSocketFactory sslSocketFactory = SSLSocketFactory.getSocketFactory();
-
+ SSLSocketFactory sslSocketFactory = SSLSocketFactory.getSocketFactory();
+
// ignore cert
sslSocketFactory.setHostnameVerifier( SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER );
schemeRegistry.register( new Scheme( "https", sslSocketFactory, 443 ) );
-
+
HttpParams params = new BasicHttpParams();
// TODO put this values to a configuration way ???
params.setParameter( ConnManagerPNames.MAX_TOTAL_CONNECTIONS, new Integer( 30 ) );
@@ -92,24 +92,30 @@
HttpProtocolParams.setVersion( params, HttpVersion.HTTP_1_1 );
ClientConnectionManager cm = new ThreadSafeClientConnManager( params, schemeRegistry );
-
+
httpClient = new DefaultHttpClient( cm, params );
-
+
}
- protected File createMetadataFile( URL metadata, String username, String password, ContinuumProjectBuildingResult result )
+ protected File createMetadataFile( URL metadata, String username, String password,
+ ContinuumProjectBuildingResult result )
throws IOException, URISyntaxException, HttpException
{
- getLogger().info( "Downloading " + metadata.toExternalForm() );
+ String url = metadata.toExternalForm();
+ if ( metadata.getProtocol().startsWith( "http" ) )
+ {
+ url = hidePasswordInUrl( url );
+ }
+ getLogger().info( "Downloading " + url );
InputStream is = null;
-
+
if ( metadata.getProtocol().startsWith( "http" ) )
{
URI uri = metadata.toURI();
HttpGet httpGet = new HttpGet( uri );
-
+
// basic auth
if ( username != null && password != null )
{
@@ -117,21 +123,21 @@
.setCredentials( new AuthScope( uri.getHost(), uri.getPort() ),
new UsernamePasswordCredentials( username, password ) );
}
-
+
HttpResponse httpResponse = httpClient.execute( httpGet );
-
+
// basic auth
int res = httpResponse.getStatusLine().getStatusCode();
- switch (res)
+ switch ( res )
{
- case 200 :
+ case 200:
break;
case 401:
getLogger().error( "Error adding project: Unauthorized " + metadata, null );
result.addError( ContinuumProjectBuildingResult.ERROR_UNAUTHORIZED );
return null;
- default :
+ default:
getLogger().warn( "skip non handled http return code " + res );
}
is = IOUtils.toInputStream( EntityUtils.toString( httpResponse.getEntity(), EntityUtils
@@ -178,9 +184,9 @@
// FIXME should deleted after has been reading
File uploadDirectory = new File( continuumTmpDir, baseDirectory );
-
+
uploadDirectory.deleteOnExit();
-
+
// resolve any '..' as it will cause issues
uploadDirectory = uploadDirectory.getCanonicalFile();
@@ -203,6 +209,22 @@
return file;
}
+ private String hidePasswordInUrl( String url )
+ {
+ int indexAt = url.indexOf( "@" );
+
+ if ( indexAt < 0 )
+ {
+ return url;
+ }
+
+ String s = url.substring( 0, indexAt );
+
+ int pos = s.lastIndexOf( ":" );
+
+ return s.substring( 0, pos + 1 ) + "*****" + url.substring( indexAt );
+ }
+
/**
* Create metadata file and handle exceptions, adding the errors to the result object.
*
@@ -233,7 +255,7 @@
{
getLogger().info( "Malformed URL: " + metadata, e );
result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
- }
+ }
catch ( UnknownHostException e )
{
getLogger().info( "Unknown host: " + metadata, e );
@@ -248,7 +270,7 @@
{
getLogger().warn( "Could not download the URL: " + metadata, e );
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
- }
+ }
return null;
}
Modified: continuum/branches/continuum-transient-state/continuum-core/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/main/resources/META-INF/spring-context.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/main/resources/META-INF/spring-context.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/main/resources/META-INF/spring-context.xml Tue Oct 28 21:16:12 2008
@@ -32,4 +32,5 @@
<bean class="org.apache.maven.continuum.notification.manager.spring.NotifierFactoryBean"/>
</property>
</bean>
+
</beans>
Modified: continuum/branches/continuum-transient-state/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm Tue Oct 28 21:16:12 2008
@@ -160,6 +160,11 @@
****************************************************************************
Tests: $testResult.testCount
Failures: $testResult.failureCount
+Errors: $testResult.errorCount
+#if( $testResult.testCount != 0)
+#set( $successRate = (($testResult.testCount - ( $testResult.failureCount + $testResult.errorCount)) * 100) / $testResult.testCount)
+Success Rate: $successRate
+#end
Total time: $testResult.totalTime
#end
Modified: continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java Tue Oct 28 21:16:12 2008
@@ -26,6 +26,7 @@
import java.util.List;
import java.util.Map;
+import org.apache.continuum.model.release.ContinuumReleaseResult;
import org.apache.continuum.model.repository.LocalRepository;
import org.apache.continuum.repository.RepositoryService;
import org.apache.continuum.taskqueue.manager.TaskQueueManager;
@@ -439,7 +440,41 @@
assertNotNull( retrievedRepository );
assertEquals( repository, retrievedRepository );
}
-
+
+ public void testContinuumReleaseResult()
+ throws Exception
+ {
+ Continuum continuum = getContinuum();
+
+ ProjectGroup defaultProjectGroup = continuum.getProjectGroupByGroupId( Continuum.DEFAULT_PROJECT_GROUP_GROUP_ID );
+
+ assertEquals( 0, continuum.getAllContinuumReleaseResults().size() );
+
+ ContinuumReleaseResult releaseResult = new ContinuumReleaseResult();
+ releaseResult.setStartTime( System.currentTimeMillis() );
+
+ File logFile = continuum.getConfiguration().getReleaseOutputFile( defaultProjectGroup.getId(),
+ "releases-" + releaseResult.getStartTime() );
+ logFile.mkdirs();
+
+ assertTrue( logFile.exists() );
+
+ releaseResult.setResultCode( 0 );
+ releaseResult.setEndTime( System.currentTimeMillis() );
+ releaseResult.setProjectGroup( defaultProjectGroup );
+
+ releaseResult = continuum.addContinuumReleaseResult( releaseResult );
+
+ List<ContinuumReleaseResult> releaseResults = continuum.getContinuumReleaseResultsByProjectGroup( defaultProjectGroup.getId() );
+ assertEquals( 1, releaseResults.size() );
+ assertEquals( releaseResult, releaseResults.get( 0 ) );
+
+ continuum.removeContinuumReleaseResult( releaseResult.getId() );
+ assertEquals( 0 , continuum.getAllContinuumReleaseResults().size() );
+ assertFalse( logFile.exists() );
+ assertEquals( defaultProjectGroup, continuum.getProjectGroupByGroupId( Continuum.DEFAULT_PROJECT_GROUP_GROUP_ID ) );
+ }
+
private Continuum getContinuum()
throws Exception
{
Modified: continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/buildcontroller/DefaultBuildControllerTest.java Tue Oct 28 21:16:12 2008
@@ -30,7 +30,12 @@
import org.apache.maven.continuum.model.scm.ScmResult;
import org.apache.maven.continuum.project.ContinuumProjectState;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
import java.util.Calendar;
+import java.util.List;
public class DefaultBuildControllerTest
extends AbstractContinuumTest
@@ -75,6 +80,7 @@
buildResult2.setState( ContinuumProjectState.OK );
buildResult2.setBuildDefinition( bd1 );
buildResultDao.addBuildResult( project1, buildResult2 );
+ createPomFile( getProjectDao().getProjectWithAllDetails( projectId1 ) );
Project project2 = createProject( "project2" );
ProjectDependency dep1 = new ProjectDependency();
@@ -92,7 +98,8 @@
project2.setState( ContinuumProjectState.OK );
projectId2 = addProject( project2 ).getId();
buildDefinitionId2 = buildDefinitionDao.getDefaultBuildDefinition( projectId2 ).getId();
-
+ createPomFile( getProjectDao().getProjectWithAllDetails( projectId2 ) );
+
controller = (DefaultBuildController) lookup( BuildController.ROLE );
}
@@ -176,4 +183,72 @@
assertEquals( 1, context.getModifiedDependencies().size() );
assertTrue( controller.shouldBuild( context ) );
}
+
+ private File getWorkingDirectory()
+ throws Exception
+ {
+ File workingDirectory = getTestFile( "target/working-directory" );
+
+ if ( !workingDirectory.exists() )
+ {
+ workingDirectory.mkdir();
+ }
+
+ return workingDirectory;
+ }
+
+ private File getWorkingDirectory( Project project )
+ throws Exception
+ {
+ File projectDir = new File( getWorkingDirectory(), Integer.toString( project.getId() ) );
+
+ if ( !projectDir.exists() )
+ {
+ projectDir.mkdirs();
+ System.out.println( "projectdirectory created" + projectDir.getAbsolutePath() );
+ }
+
+ return projectDir;
+ }
+
+ private void createPomFile( Project project )
+ throws Exception
+ {
+ File pomFile = new File( getWorkingDirectory( project ), "pom.xml" );
+
+ BufferedWriter out = new BufferedWriter( new FileWriter( pomFile ) );
+ out.write( "<project xmlns=\"http://maven.apache.org/POM/4.0.0\" " +
+ "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
+ "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n" );
+ out.write( "<modelVersion>4.0.0</modelVersion>\n" );
+ out.write( "<groupId>" + project.getGroupId() + "</groupId>\n" );
+ out.write( "<artifactId>" + project.getArtifactId() + "</artifactId>\n" );
+ out.write( "<version>" + project.getVersion() + "</version>\n" );
+ out.write( "<scm>\n" );
+ out.write( "<connection>" + "scm:local|" + getWorkingDirectory().getAbsolutePath() +
+ "|" + project.getId() + "</connection>\n" );
+ out.write( "</scm>" );
+
+ if ( project.getDependencies().size() > 0 )
+ {
+ out.write( "<dependencies>\n" );
+
+ List<ProjectDependency> dependencies = project.getDependencies();
+
+ for ( ProjectDependency dependency : dependencies )
+ {
+ out.write( "<dependency>\n" );
+ out.write( "<groupId>" + dependency.getGroupId() + "</groupId>\n" );
+ out.write( "<artifactId>" + dependency.getArtifactId() + "</artifactId>\n" );
+ out.write( "<version>" + dependency.getVersion() + "</version>\n" );
+ out.write( "</dependency>\n" );
+ }
+ out.write( "</dependencies>\n" );
+ }
+
+ out.write( "</project>" );
+ out.close();
+
+ System.out.println( "pom file created" );
+ }
}
Modified: continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java Tue Oct 28 21:16:12 2008
@@ -25,14 +25,14 @@
import junit.framework.TestCase;
+import org.apache.continuum.utils.shell.ExecutionResult;
+import org.apache.continuum.utils.shell.ShellCommandHelper;
import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.configuration.DefaultConfigurationService;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.utils.ChrootJailWorkingDirectoryService;
-import org.apache.maven.continuum.utils.shell.ExecutionResult;
-import org.apache.maven.continuum.utils.shell.ShellCommandHelper;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
import org.jmock.Expectations;
Modified: continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java Tue Oct 28 21:16:12 2008
@@ -19,6 +19,17 @@
* under the License.
*/
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.mail.Address;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMessage.RecipientType;
+
+import org.apache.continuum.notification.mail.MockJavaMailSender;
import org.apache.maven.continuum.AbstractContinuumTest;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.model.project.Project;
@@ -28,15 +39,9 @@
import org.apache.maven.continuum.notification.MessageContext;
import org.apache.maven.continuum.notification.Notifier;
import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.codehaus.plexus.mailsender.MailMessage;
-import org.codehaus.plexus.mailsender.MailSender;
-import org.codehaus.plexus.mailsender.test.MockMailSender;
-import org.codehaus.plexus.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.mail.javamail.JavaMailSender;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -45,11 +50,15 @@
public class MailContinuumNotifierTest
extends AbstractContinuumTest
{
+
+ protected Logger logger = LoggerFactory.getLogger( getClass() );
+
public void testSuccessfulBuild()
throws Exception
{
MailContinuumNotifier notifier = (MailContinuumNotifier) lookup( Notifier.class.getName(), "mail" );
- notifier.setToOverride( "recipient@host.com" );
+ String toOverride = "recipient@host.com";
+ notifier.setToOverride( toOverride );
ProjectGroup group = createStubProjectGroup( "foo.bar", "" );
@@ -57,7 +66,7 @@
BuildResult build = makeBuild( ContinuumProjectState.OK );
- MailMessage mailMessage = sendNotificationAndGetMessage( project, build, "lots out build output" );
+ MimeMessage mailMessage = sendNotificationAndGetMessage( project, build, "lots out build output", toOverride );
assertEquals( "[continuum] BUILD SUCCESSFUL: foo.bar Test Project", mailMessage.getSubject() );
@@ -73,7 +82,7 @@
BuildResult build = makeBuild( ContinuumProjectState.FAILED );
- MailMessage mailMessage = sendNotificationAndGetMessage( project, build, "output" );
+ MimeMessage mailMessage = sendNotificationAndGetMessage( project, build, "output", null );
assertEquals( "[continuum] BUILD FAILURE: foo.bar Test Project", mailMessage.getSubject() );
@@ -91,38 +100,39 @@
build.setError( "Big long error message" );
- MailMessage mailMessage = sendNotificationAndGetMessage( project, build, "lots of stack traces" );
+ MimeMessage mailMessage = sendNotificationAndGetMessage( project, build, "lots of stack traces", null );
assertEquals( "[continuum] BUILD ERROR: foo.bar Test Project", mailMessage.getSubject() );
dumpContent( mailMessage );
}
- private void dumpContent( MailMessage mailMessage )
+ private void dumpContent( MimeMessage mailMessage )
throws Exception
{
dumpContent( mailMessage, null );
}
- private void dumpContent( MailMessage mailMessage, String toOverride )
+ private void dumpContent( MimeMessage mailMessage, String toOverride )
throws Exception
{
+ Address[] tos = mailMessage.getRecipients( RecipientType.TO );
if ( toOverride != null )
{
- assertEquals( toOverride, ( (MailMessage.Address) mailMessage.getToAddresses().get( 0 ) ).getMailbox() );
+ assertEquals( toOverride, ( (InternetAddress) tos[ 0 ] ).getAddress() );
}
else
{
- assertEquals( "foo@bar", ( (MailMessage.Address) mailMessage.getToAddresses().get( 0 ) ).getMailbox() );
+ assertEquals( "foo@bar", ( (InternetAddress) tos[ 0 ] ).getAddress() );
}
assertTrue( "The template isn't loaded correctly.",
- mailMessage.getContent().indexOf( "#shellBuildResult()" ) < 0 );
+ ((String)mailMessage.getContent()).indexOf( "#shellBuildResult()" ) < 0 );
assertTrue( "The template isn't loaded correctly.",
- mailMessage.getContent().indexOf( "Build statistics" ) > 0 );
+ ((String)mailMessage.getContent()).indexOf( "Build statistics" ) > 0 );
if ( true )
{
- System.err.println( mailMessage.getContent() );
+ logger.info( ((String)mailMessage.getContent()) );
}
}
@@ -130,7 +140,7 @@
//
// ----------------------------------------------------------------------
- private MailMessage sendNotificationAndGetMessage( Project project, BuildResult build, String buildOutput )
+ private MimeMessage sendNotificationAndGetMessage( Project project, BuildResult build, String buildOutput, String toOverride )
throws Exception
{
MessageContext context = new MessageContext();
@@ -166,29 +176,27 @@
//
// ----------------------------------------------------------------------
- MockMailSender mailSender = (MockMailSender) lookup( MailSender.ROLE );
+ MockJavaMailSender mailSender = (MockJavaMailSender) lookup( JavaMailSender.class, "continuum" );
- assertEquals( 1, mailSender.getReceivedEmailSize() );
+ assertEquals( 1, mailSender.getReceivedEmails().size() );
- List mails = CollectionUtils.iteratorToList( mailSender.getReceivedEmail() );
+ List<MimeMessage> mails = mailSender.getReceivedEmails();
- MailMessage mailMessage = (MailMessage) mails.get( 0 );
+ MimeMessage mailMessage = (MimeMessage) mails.get( 0 );
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
- assertEquals( "continuum@localhost", mailMessage.getFrom().getMailbox() );
-
- assertEquals( "Continuum", mailMessage.getFrom().getName() );
+ assertEquals( "continuum@localhost", ((InternetAddress) mailMessage.getFrom()[0]).getAddress() );
- List to = mailMessage.getToAddresses();
+ assertEquals( "Continuum", ((InternetAddress) mailMessage.getFrom()[0]).getPersonal() );
- assertEquals( 1, to.size() );
+ Address[] tos = mailMessage.getRecipients( RecipientType.TO );
- //assertEquals( "foo@bar", ( (MailMessage.Address) to.get( 0 ) ).getMailbox() );
+ assertEquals( 1, tos.length );
- assertNull( ( (MailMessage.Address) to.get( 0 ) ).getName() );
+ assertEquals(toOverride == null ? "foo@bar" : toOverride, ( (InternetAddress) tos[0] ).getAddress() );
return mailMessage;
}
Modified: continuum/branches/continuum-transient-state/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml Tue Oct 28 21:16:12 2008
@@ -19,10 +19,12 @@
<plexus>
<components>
+
<component>
- <role>org.codehaus.plexus.mailsender.MailSender</role>
- <implementation>org.codehaus.plexus.mailsender.test.MockMailSender</implementation>
- </component>
+ <role>org.springframework.mail.javamail.JavaMailSender</role>
+ <implementation>org.apache.continuum.notification.mail.MockJavaMailSender</implementation>
+ <role-hint>continuum</role-hint>
+ </component>
<component>
<role>org.apache.maven.continuum.notification.Notifier</role>
@@ -39,7 +41,9 @@
<role>org.apache.continuum.dao.BuildResultDao</role>
</requirement>
<requirement>
- <role>org.codehaus.plexus.mailsender.MailSender</role>
+ <field-name>javaMailSender</field-name>
+ <role>javaMailSender</role>
+ <role-hint>continuum</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.continuum.configuration.ConfigurationService</role>
Modified: continuum/branches/continuum-transient-state/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml Tue Oct 28 21:16:12 2008
@@ -21,8 +21,9 @@
<components>
<component>
- <role>org.codehaus.plexus.mailsender.MailSender</role>
- <implementation>org.codehaus.plexus.mailsender.test.MockMailSender</implementation>
+ <role>org.springframework.mail.javamail.JavaMailSender</role>
+ <implementation>org.apache.continuum.notification.mail.MockJavaMailSender</implementation>
+ <role-hint>continuum</role-hint>
</component>
<component>
@@ -40,7 +41,9 @@
<role>org.apache.continuum.dao.BuildResultDao</role>
</requirement>
<requirement>
- <role>org.codehaus.plexus.mailsender.MailSender</role>
+ <field-name>javaMailSender</field-name>
+ <role>javaMailSender</role>
+ <role-hint>continuum</role-hint>
</requirement>
<requirement>
<role>org.apache.maven.continuum.Continuum</role>
Modified: continuum/branches/continuum-transient-state/continuum-data-management/continuum-legacy/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-data-management/continuum-legacy/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-data-management/continuum-legacy/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-data-management/continuum-legacy/pom.xml Tue Oct 28 21:16:12 2008
@@ -22,7 +22,7 @@
<parent>
<artifactId>continuum-data-management</artifactId>
<groupId>org.apache.continuum</groupId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>continuum-legacy</artifactId>
Modified: continuum/branches/continuum-transient-state/continuum-data-management/data-management-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-data-management/data-management-api/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-data-management/data-management-api/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-data-management/data-management-api/pom.xml Tue Oct 28 21:16:12 2008
@@ -22,7 +22,7 @@
<parent>
<artifactId>continuum-data-management</artifactId>
<groupId>org.apache.continuum</groupId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>data-management-api</artifactId>
Modified: continuum/branches/continuum-transient-state/continuum-data-management/data-management-cli/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-data-management/data-management-cli/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-data-management/data-management-cli/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-data-management/data-management-cli/pom.xml Tue Oct 28 21:16:12 2008
@@ -22,7 +22,7 @@
<parent>
<artifactId>continuum-data-management</artifactId>
<groupId>org.apache.continuum</groupId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>data-management-cli</artifactId>
Modified: continuum/branches/continuum-transient-state/continuum-data-management/data-management-jdo/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-data-management/data-management-jdo/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-data-management/data-management-jdo/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-data-management/data-management-jdo/pom.xml Tue Oct 28 21:16:12 2008
@@ -22,7 +22,7 @@
<parent>
<artifactId>continuum-data-management</artifactId>
<groupId>org.apache.continuum</groupId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>data-management-jdo</artifactId>
Modified: continuum/branches/continuum-transient-state/continuum-data-management/data-management-redback-jdo/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-data-management/data-management-redback-jdo/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-data-management/data-management-redback-jdo/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-data-management/data-management-redback-jdo/pom.xml Tue Oct 28 21:16:12 2008
@@ -22,7 +22,7 @@
<parent>
<artifactId>continuum-data-management</artifactId>
<groupId>org.apache.continuum</groupId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>data-management-redback-jdo</artifactId>
Modified: continuum/branches/continuum-transient-state/continuum-data-management/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-data-management/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-data-management/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-data-management/pom.xml Tue Oct 28 21:16:12 2008
@@ -25,7 +25,7 @@
<parent>
<artifactId>continuum</artifactId>
<groupId>org.apache.continuum</groupId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<artifactId>continuum-data-management</artifactId>
Modified: continuum/branches/continuum-transient-state/continuum-data-management/redback-legacy/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-data-management/redback-legacy/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-data-management/redback-legacy/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-data-management/redback-legacy/pom.xml Tue Oct 28 21:16:12 2008
@@ -2,7 +2,7 @@
<parent>
<artifactId>continuum-data-management</artifactId>
<groupId>org.apache.continuum</groupId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>redback-legacy</artifactId>
Modified: continuum/branches/continuum-transient-state/continuum-docs/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/pom.xml?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/pom.xml (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/pom.xml Tue Oct 28 21:16:12 2008
@@ -17,12 +17,12 @@
~ under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</parent>
<artifactId>continuum-docs</artifactId>
<groupId>org.apache.continuum</groupId>
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.1</version>
<reportSets>
<reportSet>
<reports>
@@ -69,6 +69,9 @@
</reportSets>
<configuration>
<checkoutDirectoryName>continuum</checkoutDirectoryName>
+ <webAccessUrl>http://svn.apache.org/viewvc/continuum/trunk</webAccessUrl>
+ <anonymousConnection>scm:svn:http://svn.apache.org/repos/asf/continuum/trunk</anonymousConnection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/continuum/trunk</developerConnection>
</configuration>
</plugin>
</plugins>
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/appearance.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/appearance.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/appearance.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/appearance.apt Tue Oct 28 21:16:12 2008
@@ -13,7 +13,7 @@
* {Banner}
You can configure the right logo of the banner including title and link on the image.
- You have to add some informations in a pom (like a company pom) (here informations coming from org.apache:apache :
+ You have to add some information in a pom (like a company pom) (coming from org.apache:apache in this example) :
+----------------------------+
<organization>
@@ -33,15 +33,15 @@
[../images/select-company-pom.png] 'Select a Company POM'
- The result will be display (here using org.apache:apache) :
+ The result will be displayed (using org.apache:apache in this example) :
[../images/selected-company-pom.png] 'Selected a Company POM'
- Note : the pom is searched in central repository and the repositories available for the active profiles from you ${user.home}/.m2/settings.xml
+ Note : the pom is searched in central repository and the repositories available for the active profiles from your <<<${user.home}/.m2/settings.xml>>>
* {Footer}
- You can configure the footer with writing your own html content from the 'Appearance' entry of the menu.
+ You can configure the footer by putting your own html content in the 'Appearance' entry of the menu.
[../images/configuration-footer.png] 'Configure footer'
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/external-db.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/external-db.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/external-db.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/external-db.apt Tue Oct 28 21:16:12 2008
@@ -22,10 +22,10 @@
** Standalone version
- To use an external database with Continuum standalone, you must configure datasources in <<<$CONTINUUM_HOME/conf/jetty.xml>>>
+ To use an external database with Continuum standalone, you must configure DataSources in <<<$CONTINUUM_HOME/conf/jetty.xml>>>
%{snippet|id=datasources|url=http://svn.apache.org/repos/asf/continuum/trunk/continuum-jetty/src/main/conf/jetty.xml}
** Webapp
- To use an external database with the Continuum webapp, you should configure the datasource in your container.
+ To use an external database with the Continuum webapp, you should configure the DataSource in your container.
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/index.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/index.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/index.apt Tue Oct 28 21:16:12 2008
@@ -22,6 +22,10 @@
* {{{configuration.html}Managing General Configuration}}
+ * {{{localRepository.html}Managing Local Repositories}}
+
+ * {{{purgeConfiguration.html}Managing Purge Configuration}}
+
* {{{external-db.html}External Databases}}
* {{{monitoring.html}Monitoring Continuum}}
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/jdk.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/jdk.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/jdk.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/jdk.apt Tue Oct 28 21:16:12 2008
@@ -1,12 +1,12 @@
------
- Managing Jdk
+ Managing JDKs
------
Olivier Lamy
------
Oct 11 2007
------
-Managing Jdk
+Managing JDKs
From the menu, choose the 'Installations' entry
@@ -22,10 +22,10 @@
You can use the checkbox if you want to add a Profile with the same name as your jdk name.
- The value 'Value/Path' field must contains the jdk path (as a JAVA_HOME value).
+ The value 'Value/Path' field must contain the jdk path (as a <<<JAVA_HOME>>> value).
- The value will validated with testing path/bin/java -version
+ The value will validated by testing path<<</bin/java -version>>>
- It the the test, the following error will be displayed
+ If the test fails, the following error will be displayed
[../images/jdk-validation-failed.png] Jdk validation failed
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/security/customising-security.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/security/customising-security.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/security/customising-security.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/security/customising-security.apt Tue Oct 28 21:16:12 2008
@@ -14,7 +14,7 @@
[]
- (In the above list, <<<~>>> is the home directory of the user who is running
+ (In the list above, <<<~>>> is the home directory of the user who is running
Continuum, and <<<$CONTINUUM_HOME>>> is the directory where Continuum is installed,
such as <<</opt/continuum-1.2>>>.)
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/security/ldap.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/security/ldap.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/security/ldap.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/security/ldap.apt Tue Oct 28 21:16:12 2008
@@ -8,7 +8,7 @@
LDAP Configuration
- Continuum support LDAP for authentication. To configure it, you should follow these steps:
+ Continuum supports LDAP for authentication. To configure it, you should follow these steps:
* Shutdown Continuum
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/shutdown.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/shutdown.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/shutdown.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/administrator_guides/shutdown.apt Tue Oct 28 21:16:12 2008
@@ -8,8 +8,7 @@
Shutdown Continuum
- To Shutdown correctly Continuum, you should look at the build queue. It isn't recommended to shutdown Continuum
- when a project is building or in the queue.
+ Shutting down Continuum while a project is building or queued is NOT recommended. The build queues page should be used to cancel any currently running and queued builds before shutting down.
* Queues view
@@ -26,7 +25,6 @@
* Shutdown
- To shutdown Continuum, the queue must be empty, so when you want to shutdown it, you can wait the end of all processes or cancel them.
+ To shutdown Continuum, the queue must be empty, so when you want to shutdown, you can either wait until all builds are complete or cancel them.
- If you don't want to have new projects added in the build queue before you shutdown Continuum, you can disable all schedules (Note: You'll need to enable
- them on the next startup). In future, you'll have an action to automate the disable/enable schedules process.
+ If you don't want to have new projects added in the build queue before you shutdown Continuum, you can disable all schedules. You'll need to re-enable them on the next startup. (In the future, you'll have an action to automate the disable/enable schedules process.)
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/developer_guides/building.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/developer_guides/building.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/developer_guides/building.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/developer_guides/building.apt Tue Oct 28 21:16:12 2008
@@ -6,26 +6,26 @@
Oct 3 2007
------
-Guide to build Continuum
+Guide to building Continuum
* Why would I want to build Continuum?
- Building Continuum yourself is for one of two reasons:
+ You might want to build Continuum yourself for one of two reasons:
* to try out a bleeding edge feature or bugfix (issues can be found in
{{{http://jira.codehaus.org/browse/CONTINUUM} JIRA}}), but you can try our SNAPSHOTs: {{http://vmbuild.apache.org/}}
- * to fix a problem you are having and submit a patch to the developers team.
+ * to fix a problem you are having and submit a patch to the development team.
- Note, that you don't need to build Continuum for day to day use. While we encourage getting
+ Note that you don't need to build Continuum for day to day use. While we encourage getting
involved and fixing bugs that you find, for day to day use we recommend using the latest release.
* Checking out the sources
- All of the source code for Maven and its related libraries is in {{{http://subversion.tigris.org/} Subversion}}.
- You can {{{http://svn.apache.org/viewvc/continuum/} browse the repository}}, or checkout specific modules directly.
+ All of the source code for Continuum and its related libraries is in a {{{http://subversion.tigris.org/} Subversion}} repository.
+ You can also {{{http://svn.apache.org/viewvc/continuum/} browse the repository}}, or checkout specific modules directly.
- All SVN instructions are available in {{{../../../source-repository.html}Source Repository page}}.
+ All SVN instructions are available on the {{{../../../source-repository.html}Source Repository page}}.
* Building the sources
@@ -34,11 +34,11 @@
* JDK 5 or greater
* Maven 2
-
+
** Building
- To build Continuum, you run this command from the top directory:
+ To build Continuum, you run this command from the top (trunk) directory:
-----------------
mvn clean install
------------------
+-----------------
\ No newline at end of file
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/developer_guides/xmlrpc.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/developer_guides/xmlrpc.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/developer_guides/xmlrpc.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/developer_guides/xmlrpc.apt Tue Oct 28 21:16:12 2008
@@ -42,7 +42,7 @@
* password, the user's password
+--------------------------+
-String url = "http://localhost:8080/continuum/xmlrpc";
+URL url = new URL( "http://localhost:8080/continuum/xmlrpc" );
ContinuumXmlRpcClient client = new ContinuumXmlRpcClient( url, username, password );
+--------------------------+
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/getting-started.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/getting-started.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/getting-started.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/getting-started.apt Tue Oct 28 21:16:12 2008
@@ -9,14 +9,14 @@
Getting Started
- When you start continuum for the first time (without existing database), the first you will
- have to do is the admin account creation and the {{{administrator_guides/configuration.html}general configuration}}
+ 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}}.
[images/admin-account-creation.png] Admin account creation
- After admin account creation, you can log as an admin. The next thing you will see is the General Configuration
+ After admin account creation, you can log as the admin. 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.
+ You may also create users, {{{user_guides/managing_project/addProject.html}add projects}}, etc.
\ No newline at end of file
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/index.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/index.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/index.apt Tue Oct 28 21:16:12 2008
@@ -49,3 +49,7 @@
{{{http://continuum.apache.org/faqs.html}Frequently Asked Questions}}
{{{http://docs.codehaus.org/display/CONTINUUMUSER/Home}Wiki}}
+
+ {{{http://cwiki.apache.org/confluence/display/CONTINUUM}New Wiki}}
+
+ {{{http://apache-continuum.blogspot.com/}Blog}}
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/geronimo.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/geronimo.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/geronimo.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/geronimo.apt Tue Oct 28 21:16:12 2008
@@ -8,7 +8,7 @@
Guide to Install Continuum on Geronimo
- Instructions for installing, deploying, configuring Continuum for the Apache Geronimo.
+ Instructions for installing, deploying, configuring Continuum for Apache Geronimo.
Sections:
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/glassfish.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/glassfish.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/glassfish.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/glassfish.apt Tue Oct 28 21:16:12 2008
@@ -9,7 +9,7 @@
Guide to Install Continuum on GlassFish V2
- Instructions for installing, deploying, configuring Continuum for the GlassFish.
+ Instructions for installing, deploying, configuring Continuum for GlassFish.
Sections:
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/installation.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/installation.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/installation.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/installation.apt Tue Oct 28 21:16:12 2008
@@ -8,7 +8,7 @@
Continuum Installation
- In this section, you'll find all information about Continuum installations:
+ In this section, you'll find all information about Continuum installation:
* {{{standalone.html}Standalone}}
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/jboss.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/jboss.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/jboss.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/jboss.apt Tue Oct 28 21:16:12 2008
@@ -8,17 +8,17 @@
Guide to Install Continuum on JBoss
- Instructions for installing, deploying, configuring Continuum JBoss. Tested with JBoss 4.2.2.GA and 4.0.5.GA.
+ Instructions for installing, deploying, configuring Continuum in JBoss. Tested with JBoss 4.2.2.GA and 4.0.5.GA.
Sections:
~~%{toc|section=0}
-* {Datasource Configuration}
+* {DataSource Configuration}
* Copy {{{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}} into <<<$JBOSS_HOME/server/default/lib/>>>
- * Create a jdbc deployment configuration file named <<<derby-continuum-ds.xml>>> in <<<$JBOSS_HOME/server/default/deploy>>> with the following contents:
+ * Create a JDBC deployment configuration file named <<<derby-continuum-ds.xml>>> in <<<$JBOSS_HOME/server/default/deploy>>> with the following contents:
+--------------------------------+
<?xml version="1.0" encoding="UTF-8"?>
@@ -48,7 +48,7 @@
</datasources>
+--------------------------------+
- * Create a jdbc deployment configuration file named <<<derby-users-ds.xml>>> in <<<$JBOSS_HOME/server/default/deploy>>> with the following contents:
+ * Create a JDBC deployment configuration file named <<<derby-users-ds.xml>>> in <<<$JBOSS_HOME/server/default/deploy>>> with the following contents:
+--------------------------------+
<?xml version="1.0" encoding="UTF-8"?>
@@ -95,6 +95,6 @@
By default, the '<<<working directory>>>' and the '<<<build output directory>>>' are stored under the WEB-INF directory. If you want to change them (necessary on Windows
due to the path length limitation), you can configure them in the {{{../administrator_guides/configuration.html}Configuration page}}.
- By default, Continuum logs are stored into <<<${appserver.base}/logs/>>>. appserver.base is a system property. If you don't define it in the jboss startup script, it will be empty,
- so the Continuum logs directory will be at the root of your disk. If you want to use an other location, you should modify
+ By default, Continuum logs are stored into <<<${appserver.base}/logs/>>>. appserver.base is a system property. If you don't define it in the JBoss startup script, it will be empty,
+ so the Continuum logs directory will be at the root of your disk. If you want to use another location, you should modify
<<<$JBOSS_HOME/server/default/deploy/continuum.war/WEB-INF/classes/log4j.xml>>>
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/jetty.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/jetty.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/jetty.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/jetty.apt Tue Oct 28 21:16:12 2008
@@ -8,7 +8,7 @@
Guide to Install Continuum on Jetty
- Instructions for installing, deploying, configuring Continuum for the Jetty. Tested with Jetty 6.1.5.
+ Instructions for installing, deploying, configuring Continuum for Jetty. Tested with Jetty 6.1.5.
Sections:
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/requirements.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/requirements.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/requirements.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/requirements.apt Tue Oct 28 21:16:12 2008
@@ -13,7 +13,7 @@
*----------------------+--------------------------------------------------------------------------------------------------------------------------------+
| <<Memory>> | No minimum requirement |
*----------------------+--------------------------------------------------------------------------------------------------------------------------------+
-| <<Disk>> | The Continuum application is in itself 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-transient-state/continuum-docs/src/site/apt/installation/standalone.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/standalone.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/standalone.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/standalone.apt Tue Oct 28 21:16:12 2008
@@ -16,7 +16,7 @@
* Extract the file
- * Set a JAVA_HOME environnement variable which use a jdk >= 1.5
+ * Set a JAVA_HOME environment variable which use a jdk >= 1.5
** {Defining JNDI Resources}
@@ -58,7 +58,7 @@
** {Basic script in /etc/init.d}
- * Create a <<<'continuum'>>> file under <<</etc/init.d/>>> with the following content:
+ * 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):
------------------
#!/bin/sh
@@ -99,7 +99,8 @@
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:
+ 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):
------------------
#! /bin/sh
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/tomcat.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/tomcat.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/tomcat.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/tomcat.apt Tue Oct 28 21:16:12 2008
@@ -23,7 +23,7 @@
[[1]] A defined \<Context\> xml section to define the JNDI resources.
- [[1]] The Javamail / Activation JAR files.
+ [[1]] The JavaMail / Activation JAR files.
[[1]] The Apache Derby JAR files.
@@ -31,7 +31,7 @@
** {Defining JNDI Resources}.
- Continuum will, on startup, ask the web container for a few JNDI configured resources, two jdbc datasources, and one javamail session.
+ Continuum will, on startup, ask the web container for a few JNDI configured resources, two JDBC DataSources, and one JavaMail session.
To configure these JNDI resources in the Tomcat Web Container, you will need to specify a \<Context\> section that Tomcat can utilize for those requests coming from Continuum.
@@ -51,7 +51,7 @@
* <<<jdbc/users>>>
- 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.
+ 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.
@@ -61,13 +61,13 @@
[[1]] You will be using the embedded Apache Derby database. (not an external database, that's another show)
- [[1]] Details specific to Apache Tomcat, Javamail, or Apache Derby are left for the reader to research on those projects websites.
+ [[1]] Details specific to Apache Tomcat, JavaMail, or Apache Derby are left for the reader to research on those projects websites.
-** {The Javamail / Activation JAR files}
+** {The JavaMail / Activation JAR files}
- <<Note:>> Continuum requires Javamail 1.4 (or later)
+ <<Note:>> Continuum requires JavaMail 1.4 (or later)
- Apache Tomcat does not typically ship with a copy of the Javamail or Activation jar files.
+ 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.
@@ -76,7 +76,7 @@
Direct download links for these jar files.
- * Java Mail 1.4 - {{{http://repo1.maven.org/maven2/javax/mail/mail/1.4/mail-1.4.jar}mail-1.4.jar}}
+ * JavaMail 1.4 - {{{http://repo1.maven.org/maven2/javax/mail/mail/1.4/mail-1.4.jar}mail-1.4.jar}}
* Java Activation Framework 1.1 - {{{http://repo1.maven.org/maven2/javax/activation/activation/1.1/activation-1.1.jar}activation-1.1.jar}}
@@ -84,13 +84,13 @@
<<Note:>>Continuum 1.2 has been tested with Apache Derby 10.1.3.1
- Default installation of Continuum utilizes the Apache Derby 100% Java Database to maintain Continuum specific information, and also the Users / Security Database.
+ 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.
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}}
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/upgrade.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/upgrade.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/upgrade.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/installation/upgrade.apt Tue Oct 28 21:16:12 2008
@@ -4,18 +4,29 @@
Olivier Lamy
Emmanuel Venisse
------
- Nov 23 2007
+ Sep 10 2008
------
Upgrade
* Goal
- When upgrading continuum, it could have some database model changes. This tool exports data from old database model and imports the data into the new database model.
+ When upgrading Continuum, it could have some database model changes. This tool exports data from old database model and imports the data into the new database model.
There are 2 databases that need to be converted, one for the builds and one for the users.
<<Note>> If you are upgrading from 1.1 to 1.2, no upgrade tool is needed.
+
+ Due the fix of {{{http://jira.codehaus.org/browse/CONTINUUM-1688}CONTINUUM-1688}} :
+
+ * if you use mssql server : you have to uncomment lines in a file in the webapp (WEB-INF/classes/META-INF/plexus/application.xml) (search mssql support).
+
+ * if you use a 1.1 database you have to change manually the size of a column (in order to have the fix) :
+
++------------------------------------------+
+-- command tested with derby database
+alter table CHANGESET alter column CHANGECOMMENT SET DATA TYPE varchar(8192)
++------------------------------------------+
* Download The Tool
@@ -28,6 +39,8 @@
* {{http://repo1.maven.org/maven2/org/apache/maven/continuum/data-management-cli/1.1-beta-4/data-management-cli-1.1-beta-4-app.jar}}
* {{http://repo1.maven.org/maven2/org/apache/maven/continuum/data-management-cli/1.1/data-management-cli-1.1-app.jar}}
+
+ * {{http://repo1.maven.org/maven2/org/apache/maven/continuum/data-management-cli/1.2/data-management-cli-1.2-app.jar}}
The first version of this tool is 1.1-beta-2
@@ -58,7 +71,7 @@
+------------------------------------------+
java -Xmx512m -jar data-management-cli-1.1-app.jar -buildsJdbcUrl jdbc:derby:${new.continuum.home}/data/continuum/database -mode IMPORT -directory backups
-java -Xmx512m -jar data-management-cli-1.1-app.jar -usersJdbcUrl jdbc:derby:${new.continuum.home}/data/users/database -mode IMPORT -directory backups
+java -Xmx512m -jar data-management-cli-1.2-app.jar -usersJdbcUrl jdbc:derby:${new.continuum.home}/data/users/database -mode IMPORT -directory backups
+------------------------------------------+
* <<NEXT_VAL values in SEQUENCE_TABLE must be checked before restarting continuum>>
@@ -73,7 +86,7 @@
* Start the new version of continuum.
-* Specific steps to do before to import
+* Specific steps to do before import
** 1.1 import
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/building_project/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/building_project/index.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/building_project/index.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/building_project/index.apt Tue Oct 28 21:16:12 2008
@@ -8,7 +8,7 @@
Building Projects
- For Ant, maven 1/2 builds the following system properties will be added via -D command line :
+ For Ant and maven builds the following system properties will be added via -D command line:
* continuum.project.group.name
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_builddef/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_builddef/index.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_builddef/index.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_builddef/index.apt Tue Oct 28 21:16:12 2008
@@ -9,12 +9,12 @@
Managing Build Definitions
- Each project or the project group must have an attached build definition in order to build.
+ 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 value which will be used in order to build your project.
+ Depending on the project, you can define different values which will be used in order to build your project.
- Continuum contains some default build definitions which can be changed in <<{{{../../administrator_guides/builddefTemplate.html}the build definition templates screen}}>>.
+ 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 definition at the <<{{{builddefGroup.html}project Group level}}>> or at the <<{{{builddefProject.html}project level}}>>.
+ 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
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/addProject.apt Tue Oct 28 21:16:12 2008
@@ -17,22 +17,22 @@
[../../images/add-m2-project-menu.png] Add a maven2 project
- The pom.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).
+ 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 (Note this doesn't support multi modules project).
+ 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 require an authentication.
+ You can define username/password if the POM URL requires 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 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 add each sub-module POM as a Continuum Project. If you want to add only the root POM without sub-modules, check the "load only root as recursive build" field.
+ 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 apply to your project.
+ You can choose a Build Definition Template which will be applied to your project.
* {Maven 1 project}
@@ -53,19 +53,19 @@
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 use as 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 apply to your project.
+ 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
+[../../images/add-ant-project-menu.png] Add a Ant project
TO WRITE
-[../../images/add-ant-project.png] Add a ANT project
+[../../images/add-ant-project.png] Add a Ant project
* {Shell Project}
@@ -79,15 +79,15 @@
* {Add a project from the Project Group}
- From the Project Group, you can add a project without to use 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}
-** {Clearcase}
+** {ClearCase}
- With Clearcase, you can configure SCM things in few ways. For example, you can use, in the scm url in your POM, the absolute path of your config spec file like this:
+ With ClearCase, you can configure SCM things in few ways. For example, you can use, in the scm URL in your POM, the absolute path of your config spec file like this:
+----------------------------+
<scm>
@@ -95,7 +95,7 @@
</scm>
+----------------------------+
- The SCM URL format used for Clearcase is defined {{{http://maven.apache.org/scm/clearcase.html}here}}
+ The SCM URL format used for ClearCase is defined {{{http://maven.apache.org/scm/clearcase.html}here}}
and you can create a <<<clearcase-settings.xml>>> file under <<<${user.home}/.scm/>>> with the following content:
@@ -106,5 +106,5 @@
</clearcase-settings>
+----------------------------+
- This configuration won't work with each Clearcase installation because each Clearcase configuration is different, so we recommend to read the
- {{{http://maven.apache.org/scm/clearcase.html}Clearcase page}} on the Maven-SCM site.
+ 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.
Modified: continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt?rev=708765&r1=708764&r2=708765&view=diff
==============================================================================
--- continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt (original)
+++ continuum/branches/continuum-transient-state/continuum-docs/src/site/apt/user_guides/managing_project/editProject.apt Tue Oct 28 21:16:12 2008
@@ -13,8 +13,8 @@
* {Project View}
- When you edit a project from the groupSummary, you will see basics informations.
- First part of the page contains some informations regarding :
+ 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
@@ -33,7 +33,7 @@
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.
- Second part contains informations regarding :
+ Second part contains information regarding:
* project notifiers