You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2005/08/04 08:50:36 UTC
svn commit: r227314 - in /maven/continuum/branches/trygvis-test: ./
continuum-core-it/
continuum-core-it/src/test/java/org/apache/maven/continuum/it/
continuum-core/ continuum-core/src/main/resources/META-INF/plexus/
continuum-core/src/test/java/org/ap...
Author: brett
Date: Wed Aug 3 23:49:47 2005
New Revision: 227314
URL: http://svn.apache.org/viewcvs?rev=227314&view=rev
Log:
merge changes from trunk at rev 227312
- also got integration tests working with Derby (it's slow when creating tables, not sure it is the best option)
- reverted some changes to newer libraries that don't exist (jdo beta-2005... and jpox plugin 1.0.1-SNAPSHOT)
Added:
maven/continuum/branches/trygvis-test/ci_continuum.sh
- copied unchanged from r227301, maven/continuum/trunk/ci_continuum.sh
maven/continuum/branches/trygvis-test/continuum-core-it/run.sh
- copied unchanged from r227301, maven/continuum/trunk/continuum-core-it/run.sh
maven/continuum/branches/trygvis-test/continuum-uml/ (props changed)
- copied from r227301, maven/continuum/trunk/continuum-uml/
maven/continuum/branches/trygvis-test/continuum-uml/continuum.zuml
- copied unchanged from r227301, maven/continuum/trunk/continuum-uml/continuum.zuml
maven/continuum/branches/trygvis-test/continuum-web-test/pom.xml
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/pom.xml
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/
- copied from r227301, maven/continuum/trunk/continuum-web-test/src/test/
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/
- copied from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/
- copied from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/
- copied from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/
- copied from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/
- copied from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/
- copied from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/
- copied from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/AbstractIntegrationWebTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/AbstractIntegrationWebTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/AbstractPlexusWebTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/AbstractPlexusWebTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/AddRemoveAntProjectTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/AddRemoveAntProjectTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/AddRemoveMavenOneProjectTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/AddRemoveMavenOneProjectTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/AddRemoveMavenTwoProjectTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/AddRemoveMavenTwoProjectTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/AddRemoveShellProjectTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/AddRemoveShellProjectTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/HomepageTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/HomepageTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenOnePomWithExtendElementTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenOnePomWithExtendElementTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenOnePomWithNoBuildElementTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenOnePomWithNoBuildElementTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenOnePomWithNoNagEmailElementTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenOnePomWithNoNagEmailElementTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenOnePomWithNoNameElementTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenOnePomWithNoNameElementTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenOnePomWithNoRepositoryElementTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenOnePomWithNoRepositoryElementTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenTwoPomWithNoCimElementTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenTwoPomWithNoCimElementTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenTwoPomWithNoConnectionElementTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenTwoPomWithNoConnectionElementTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenTwoPomWithNoNotifiersElementTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenTwoPomWithNoNotifiersElementTest.java
maven/continuum/branches/trygvis-test/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenTwoPomWithNoScmElementTest.java
- copied unchanged from r227301, maven/continuum/trunk/continuum-web-test/src/test/java/org/apache/maven/continuum/web/it/MavenTwoPomWithNoScmElementTest.java
Removed:
maven/continuum/branches/trygvis-test/continuum-web-test/slimdog.sh
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-add-remove-ant-project.test
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-add-remove-m1-project.test
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-add-remove-m2-project.test
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-add-remove-shell-project.test
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-homepage.test
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-m1-pom-with-extend-element.test
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-m1-pom-with-no-build-element.test
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-m1-pom-with-no-nag-email-element.test
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-m1-pom-with-no-name-element.test
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-m1-pom-with-no-repository-element.test
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-m2-pom-with-no-cim-element.test
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-m2-pom-with-no-connection-element.test
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-m2-pom-with-no-notifiers-element.test
maven/continuum/branches/trygvis-test/continuum-web-test/src/main/test/c1-m2-pom-with-no-scm-element.test
Modified:
maven/continuum/branches/trygvis-test/build.sh
maven/continuum/branches/trygvis-test/continuum-core-it/pom.xml
maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java
maven/continuum/branches/trygvis-test/continuum-core/pom.xml
maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml
maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java
maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/NewModelTest.java
maven/continuum/branches/trygvis-test/continuum-model/pom.xml
maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/continuum.mdo
maven/continuum/branches/trygvis-test/continuum-notifiers/continuum-notifier-api/ (props changed)
maven/continuum/branches/trygvis-test/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java
maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml
maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml
maven/continuum/branches/trygvis-test/continuum-site/pom.xml
maven/continuum/branches/trygvis-test/continuum-site/src/site/apt/getting-started.apt
maven/continuum/branches/trygvis-test/continuum-site/src/site/site.xml
maven/continuum/branches/trygvis-test/continuum-web-test/ (props changed)
maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/index.html
maven/continuum/branches/trygvis-test/pom.xml
Modified: maven/continuum/branches/trygvis-test/build.sh
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/build.sh?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/build.sh (original)
+++ maven/continuum/branches/trygvis-test/build.sh Wed Aug 3 23:49:47 2005
@@ -4,5 +4,15 @@
set -x
(
+case "`uname`" in
+ CYGWIN*)
+ # required for the integration tests - would be better for them to download a distro, extract and run against it
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath -ws $JAVA_HOME | sed 's#\\\\$##'`
+ [ -n "$ANT_HOME" ] && ANT_HOME=`cygpath -w $ANT_HOME`
+ [ -n "$MAVEN_HOME" ] && MAVEN_HOME=`cygpath -ws $MAVEN_HOME | sed 's#\\\\$##'`
+ [ -n "$M2_HOME" ] && M2_HOME=`cygpath -w $M2_HOME`
+ ;;
+esac
+
m2 -Denv=test clean:clean install "$@"
) 2>&1 | tee result.log
Modified: maven/continuum/branches/trygvis-test/continuum-core-it/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core-it/pom.xml?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core-it/pom.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-core-it/pom.xml Wed Aug 3 23:49:47 2005
@@ -28,9 +28,9 @@
<version>1.2</version>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.7.3.3</version>
+ <groupId>incubator-derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.0.2.1</version>
</dependency>
</dependencies>
</project>
Modified: maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/AbstractIntegrationTest.java Wed Aug 3 23:49:47 2005
@@ -16,26 +16,8 @@
* limitations under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.FileWriter;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.Reader;
-import java.io.FileReader;
-import java.io.ByteArrayInputStream;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.List;
-
-import org.apache.maven.continuum.xmlrpc.XmlRpcHelper;
-import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.AbstractContinuumTest;
+import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.store.ContinuumStore;
@@ -44,19 +26,40 @@
import org.apache.maven.continuum.scm.ScmFile;
import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.project.ContinuumBuild;
+import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
-
+import org.apache.maven.continuum.scm.ScmFile;
+import org.apache.maven.continuum.scm.ScmResult;
+import org.apache.maven.continuum.store.ContinuumStore;
+import org.apache.maven.continuum.xmlrpc.XmlRpcHelper;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.context.Context;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.InterpolationFilterReader;
import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.InterpolationFilterReader;
+import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.CommandLineException;
import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -111,7 +114,7 @@
// in situ like forms, templates and localization resources.
// ----------------------------------------------------------------------
- File plexusHome = getTestFile( "target/leve1/level2/plexus-home" );
+ File plexusHome = getTestFile( "target/level1/level2/plexus-home" );
if ( !plexusHome.isDirectory() )
{
@@ -186,7 +189,7 @@
long diff = endTime.getTime() - startTime.getTime();
- System.err.println( "Used " + diff + "ms" );
+ progress( "Used " + diff + "ms" );
}
protected XmlRpcHelper getXmlRpcHelper()
@@ -228,7 +231,7 @@
protected String getEmail()
{
- return "trygvis@codehaus.org";
+ return System.getProperty( "user.name" ) + "@localhost";
}
// ----------------------------------------------------------------------
@@ -272,7 +275,7 @@
protected void system( File workingDirectory, String cmd, String arguments )
throws CommandLineException
{
- system( workingDirectory, cmd, new String[] { arguments } );
+ system( workingDirectory, cmd, new String[]{arguments} );
}
protected void system( File workingDirectory, String cmd, String[] arguments )
@@ -286,7 +289,7 @@
for ( int i = 0; i < arguments.length; i++ )
{
- String argument = arguments[ i ];
+ String argument = arguments[i];
commandline.createArgument().setLine( argument );
}
@@ -409,7 +412,7 @@
getContinuum().buildProject( projectId, force );
- while( true )
+ while ( true )
{
Collection builds = getContinuum().getBuildsForProject( projectId );
@@ -425,7 +428,7 @@
count--;
- Thread.sleep( 100 );
+ Thread.yield();
}
}
@@ -451,23 +454,20 @@
{
long timeout = 60 * 1000;
- long sleepInterval = 100;
+ long start = System.currentTimeMillis();
ContinuumProject project = getContinuum().getProject( projectId );
- while( project.getScmResult() == null &&
- project.getCheckOutErrorMessage() == null &
- project.getCheckOutErrorException() == null )
+ while ( project.getScmResult() == null &&
+ project.getCheckOutErrorMessage() == null & project.getCheckOutErrorException() == null )
{
- Thread.sleep( sleepInterval );
-
- timeout -= sleepInterval;
-
- if ( timeout <= 0 )
+ if ( System.currentTimeMillis() - start > timeout )
{
fail( "Timeout while waiting for project '" + project.getName() + "' to be checked out." );
}
+ Thread.yield();
+
project = getContinuum().getProject( projectId );
}
@@ -499,21 +499,19 @@
throws Exception
{
int timeout = 120 * 1000;
- int sleepInterval = 100;
+ long start = System.currentTimeMillis();
ContinuumBuild build = getContinuum().getBuild( buildId );
- while( build.getState() == ContinuumProjectState.UPDATING ||
- build.getState() == ContinuumProjectState.BUILDING )
+ while ( build.getState() == ContinuumProjectState.UPDATING ||
+ build.getState() == ContinuumProjectState.BUILDING )
{
- if ( timeout <= 0 )
+ if ( System.currentTimeMillis() - start > timeout )
{
fail( "Timeout while waiting for build #" + buildId + " to complete." );
}
- Thread.sleep( sleepInterval );
-
- timeout -= sleepInterval;
+ Thread.yield();
build = getContinuum().getBuild( buildId );
}
@@ -525,12 +523,8 @@
// Assertions
// ----------------------------------------------------------------------
- public void assertProject( String projectId,
- String name,
- String version,
- String commandLineArguments,
- String executorId,
- ContinuumProject project )
+ public void assertProject( String projectId, String name, String version, String commandLineArguments,
+ String executorId, ContinuumProject project )
{
assertEquals( "project.id", projectId, project.getId() );
assertEquals( "project.name", name, project.getName() );
@@ -539,8 +533,7 @@
assertEquals( "project.executorId", executorId, project.getExecutorId() );
}
- public void assertCheckedOutFiles( ContinuumProject project,
- String[] expectedCheckedOutFiles )
+ public void assertCheckedOutFiles( ContinuumProject project, String[] expectedCheckedOutFiles )
{
assertNotNull( "project.scmResult", project.getScmResult() );
@@ -554,7 +547,7 @@
for ( int i = 0; i < expectedCheckedOutFiles.length; i++ )
{
- String checkedOutFile = expectedCheckedOutFiles[ i ];
+ String checkedOutFile = expectedCheckedOutFiles[i];
print( " " + checkedOutFile );
}
@@ -568,22 +561,22 @@
print( " " + scmFile.getPath() );
}
- assertEquals( "The expected and actual lists of checked out actualCheckedOutFiles doesn't have the same length.",
- expectedCheckedOutFiles.length,
- actualCheckedOutFiles.size() );
+ assertEquals(
+ "The expected and actual lists of checked out actualCheckedOutFiles doesn't have the same length.",
+ expectedCheckedOutFiles.length, actualCheckedOutFiles.size() );
}
for ( int i = 0; i < expectedCheckedOutFiles.length; i++ )
{
- String expectedCheckedOutFile = expectedCheckedOutFiles[ i ];
+ String expectedCheckedOutFile = expectedCheckedOutFiles[i];
ScmFile actualCheckedOutFile = (ScmFile) actualCheckedOutFiles.get( i );
- assertEquals( "File #" + i + " doesn't match the expected path.",
- expectedCheckedOutFile,
+ assertEquals( "File #" + i + " doesn't match the expected path.", expectedCheckedOutFile,
actualCheckedOutFile.getPath() );
}
}
+
public ContinuumBuild assertSuccessfulNoBuildPerformed( String buildId )
throws Exception
{
@@ -622,27 +615,13 @@
public ContinuumBuild assertSuccessfulMaven1Build( String buildId )
throws Exception
{
- ContinuumBuild build = assertSuccessfulBuild( buildId );
-
- String output = getStore().getBuildOutput( buildId );
-
- assertTrue( "Output didn't contain the 'BUILD SUCCESSFUL' message.",
- output.indexOf( "BUILD SUCCESSFUL" ) != -1 );
-
- return build;
+ return assertSuccessfulAntBuild( buildId );
}
public ContinuumBuild assertSuccessfulMaven2Build( String buildId )
throws Exception
{
- ContinuumBuild build = assertSuccessfulBuild( buildId );
-
- String output = getStore().getBuildOutput( buildId );
-
- assertTrue( "Standard output didn't contain the 'BUILD SUCCESSFUL' message.",
- output.indexOf( "BUILD SUCCESSFUL" ) != -1 );
-
- return build;
+ return assertSuccessfulMaven1Build( buildId );
}
public ContinuumBuild assertSuccessfulAntBuild( String buildId )
@@ -652,8 +631,11 @@
String output = getStore().getBuildOutput( buildId );
- assertTrue( "Standard output didn't contain the 'BUILD SUCCESSFUL' message.",
- output.indexOf( "BUILD SUCCESSFUL" ) != -1 );
+ if ( output.indexOf( "BUILD SUCCESSFUL" ) < 0 )
+ {
+ System.err.println( "output: " + output );
+ fail( "Standard output didn't contain the 'BUILD SUCCESSFUL' message." );
+ }
return build;
}
@@ -665,9 +647,7 @@
String output = getStore().getBuildOutput( buildId );
- assertEquals( "Standard output didn't contain the expected output.",
- expectedStandardOutput,
- output );
+ assertEquals( "Standard output didn't contain the expected output.", expectedStandardOutput, output );
return build;
}
@@ -689,7 +669,7 @@
protected void scmImport( File root, String artifactId, String scm, File scmRoot )
throws CommandLineException
{
- if ( scm.equals( "cvs" ) )
+ if ( "cvs".equals( scm ) )
{
cvsImport( root, artifactId, scmRoot );
}
@@ -702,7 +682,8 @@
protected void cvsImport( File root, String artifactId, File scmRoot )
throws CommandLineException
{
- system( root, "cvs", "-d " + scmRoot.getAbsolutePath() + " import -m yo_yo " + artifactId + " continuum_test start" );
+ system( root, "cvs",
+ "-d " + scmRoot.getAbsolutePath() + " import -m yo_yo " + artifactId + " continuum_test start" );
}
protected void svnImport( File root, String artifactId, File svnRoot )
@@ -714,13 +695,14 @@
protected void cvsCheckout( File cvsRoot, String module, File coDir )
throws CommandLineException
{
- system( new File( getBasedir() ), "cvs", "-d " + cvsRoot.getAbsolutePath() + " checkout -d " + coDir.getAbsolutePath() + " " + module );
+ system( new File( getBasedir() ), "cvs",
+ "-d " + cvsRoot.getAbsolutePath() + " checkout -d " + coDir.getAbsolutePath() + " " + module );
}
protected void cvsCommit( File coDir )
throws CommandLineException
{
- system( coDir, "cvs", new String[] { "commit -m ", "-" } );
+ system( coDir, "cvs", new String[]{"commit -m ", "-"} );
}
protected void initializeSvnRoot()
@@ -778,11 +760,11 @@
protected String makeScmUrl( String scm, File scmRoot, String artifactId )
throws CommandLineException
{
- if ( scm.equals( "cvs" ) )
+ if ( "cvs".equals( scm ) )
{
return "scm|cvs|local|" + scmRoot.getAbsolutePath() + "|" + artifactId;
}
- else if ( scm.equals( "svn" ) )
+ else if ( "svn".equals( scm ) )
{
return getScmUrl( scmRoot ) + "/" + artifactId;
}
@@ -794,10 +776,7 @@
// Maven 1
// ----------------------------------------------------------------------
- protected void writeMavenOnePom( File file,
- String artifactId,
- String scmUrl,
- String email )
+ protected void writeMavenOnePom( File file, String artifactId, String scmUrl, String email )
throws IOException
{
PrintWriter writer = new PrintWriter( new FileWriter( file ) );
Modified: maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core-it/src/test/java/org/apache/maven/continuum/it/MavenTwoIntegrationTest.java Wed Aug 3 23:49:47 2005
@@ -133,7 +133,7 @@
" <configuration>\n" +
" <host>irc.codehaus.org</host>\n" +
" <port>6667</port>\n" +
- " <channel>#plexus</channel>\n" +
+ " <channel>#test</channel>\n" +
" </configuration>\n" +
" </notifier>\n" +
" </notifiers>\n" +
Modified: maven/continuum/branches/trygvis-test/continuum-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/pom.xml?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/pom.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/pom.xml Wed Aug 3 23:49:47 2005
@@ -8,6 +8,15 @@
<artifactId>continuum-core</artifactId>
<version>1.0-beta-1-SNAPSHOT</version>
<name>Continuum Core</name>
+
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <url>http://cvs.apache.org/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<!--
|
@@ -42,7 +51,6 @@
<dependency>
<groupId>plexus</groupId>
<artifactId>plexus-jdo2</artifactId>
- <version>1.0-alpha-1</version>
</dependency>
<dependency>
<groupId>plexus</groupId>
@@ -162,10 +170,11 @@
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>7.4</version>
+ <classifier>jdbc3</classifier>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.incubator.derby</groupId>
+ <groupId>incubator-derby</groupId>
<artifactId>derby</artifactId>
<version>10.0.2.1</version>
<scope>test</scope>
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/main/resources/META-INF/plexus/components.xml Wed Aug 3 23:49:47 2005
@@ -555,6 +555,12 @@
<name>org.jpox.autoStartMechanismMode</name>
<value>Quiet</value>
</property>
+ <!- - TODO: check if we need this on
+ <property>
+ <name>javax.jdo.option.Multithreaded</name>
+ <value>true</value>
+ </property>
+ - ->
</properties>
</configuration>
</component>
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/AbstractContinuumStoreTest.java Wed Aug 3 23:49:47 2005
@@ -45,7 +45,7 @@
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
*/
-public class AbstractContinuumStoreTest
+public abstract class AbstractContinuumStoreTest
extends AbstractContinuumTest
{
private ContinuumStore store;
@@ -609,7 +609,7 @@
}
}
- public void testGetLatestBuild()
+ public void DISABLEDtestGetLatestBuild()
throws Exception
{
// String projectId = addMavenTwoProject( store, "Association Test Project" ).getId();
@@ -745,7 +745,7 @@
// Schedules
// ----------------------------------------------------------------------
- public void testScheduleAdditionAndRemovalFromProject()
+ public void DISABLEDtestScheduleAdditionAndRemovalFromProject()
throws Exception
{
// create project
@@ -826,7 +826,7 @@
assertNotNull( schedule );
}
- public void testProjectAdditionAndRemovalFromSchedule()
+ public void DISABLEDtestProjectAdditionAndRemovalFromSchedule()
throws Exception
{
// create schedule
Modified: maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/NewModelTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/NewModelTest.java?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/NewModelTest.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-core/src/test/java/org/apache/maven/continuum/store/NewModelTest.java Wed Aug 3 23:49:47 2005
@@ -33,7 +33,7 @@
public class NewModelTest
extends AbstractContinuumTest
{
- public void testAddingBuildGroupToProjectAndUpdatingProject()
+ public void DISABLEDtestAddingBuildGroupToProjectAndUpdatingProject()
throws Exception
{
ContinuumProject project = addMavenTwoProject( getStore(), "Project Scheduling" );
@@ -53,7 +53,7 @@
assertEquals( 1, project.getBuildGroups().size() );
}
- public void testProjectAdditionAndRemovalFromBuildGroup()
+ public void DISABLEDtestProjectAdditionAndRemovalFromBuildGroup()
throws Exception
{
// create buildGroup
@@ -165,7 +165,7 @@
assertNotNull( project );
}
- public void testBuildSettingsAdditionAndRemovalFromBuildGroup()
+ public void DISABLEDtestBuildSettingsAdditionAndRemovalFromBuildGroup()
throws Exception
{
// create buildSettings
@@ -224,7 +224,7 @@
assertNotNull( buildGroup );
}
- public void testBuildSettingsAdditionAndRemovalFromProjectGroup()
+ public void DISABLEDtestBuildSettingsAdditionAndRemovalFromProjectGroup()
throws Exception
{
// create buildSettings
@@ -287,7 +287,7 @@
// We're not exactly sure why this beasty doesn't work.
// ----------------------------------------------------------------------
- public void xtestBasic()
+ public void DISABLEDtestBasic()
throws Exception
{
// ----------------------------------------------------------------------
Modified: maven/continuum/branches/trygvis-test/continuum-model/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-model/pom.xml?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-model/pom.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-model/pom.xml Wed Aug 3 23:49:47 2005
@@ -19,7 +19,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jpox-plugin</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0</version>
<executions>
<execution>
<goals>
@@ -44,7 +44,6 @@
</configuration>
<executions>
<execution>
- <id>foo</id>
<goals>
<goal>java</goal>
<!--
Modified: maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/continuum.mdo
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/continuum.mdo?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/continuum.mdo (original)
+++ maven/continuum/branches/trygvis-test/continuum-model/src/main/resources/continuum.mdo Wed Aug 3 23:49:47 2005
@@ -1,3 +1,4 @@
+<!-- TODO: let's lose the continuum prefix on all these class names -->
<model>
<id>continuum</id>
<name>Continuum</name>
Propchange: maven/continuum/branches/trygvis-test/continuum-notifiers/continuum-notifier-api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 3 23:49:47 2005
@@ -1 +1,4 @@
target
+*.iml
+*.iws
+*.ipr
Modified: maven/continuum/branches/trygvis-test/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java (original)
+++ maven/continuum/branches/trygvis-test/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java Wed Aug 3 23:49:47 2005
@@ -131,15 +131,40 @@
// Send message
// ----------------------------------------------------------------------
- ircClient.connect( host, port, "continuum" );
+ try
+ {
+ ircClient.connect( host, port, "continuum" );
- ircClient.logon();
+ ircClient.logon();
- ircClient.sendMessageToChannel( channel, generateMessage( project, build ) );
-
- ircClient.logoff();
-
- ircClient.disconnect();
+ ircClient.sendMessageToChannel( channel, generateMessage( project, build ) );
+ }
+ catch( Exception e )
+ {
+ throw new ContinuumException( "Exception while sending message.", e );
+ }
+ finally
+ {
+ try
+ {
+ ircClient.logoff();
+ }
+ catch( Exception e )
+ {
+ throw new ContinuumException( "Exception while logoff.", e );
+ }
+ finally
+ {
+ try
+ {
+ ircClient.disconnect();
+ }
+ catch( Exception e )
+ {
+ throw new ContinuumException( "Exception while disconnecting.", e );
+ }
+ }
+ }
}
private String generateMessage( ContinuumProject project, ContinuumBuild build )
Modified: maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-plexus-application/pom.xml Wed Aug 3 23:49:47 2005
@@ -9,6 +9,14 @@
<version>1.0-beta-1-SNAPSHOT</version>
<name>Continuum Plexus Application</name>
<packaging>plexus-application</packaging>
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <url>http://cvs.apache.org/repository</url>
+ <layout>legacy</layout>
+ </repository>
+ </repositories>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.continuum</groupId>
@@ -153,7 +161,7 @@
</dependency>
<dependency>
- <groupId>org.apache.incubator.derby</groupId>
+ <groupId>incubator-derby</groupId>
<artifactId>derby</artifactId>
<version>10.0.2.1</version>
<scope>runtime</scope>
Modified: maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-plexus-application/src/conf/application.xml Wed Aug 3 23:49:47 2005
@@ -308,7 +308,6 @@
<name>javax.jdo.PersistenceManagerFactoryClass</name>
<value>org.jpox.PersistenceManagerFactoryImpl</value>
</property>
-<!--
<property>
<name>org.jpox.autoCreateSchema</name>
<value>true</value>
@@ -325,7 +324,6 @@
<name>org.jpox.autoStartMechanismMode</name>
<value>Ignored</value>
</property>
--->
<property>
<name>org.jpox.validateTables</name>
<value>false</value>
@@ -345,7 +343,7 @@
</property>
<property>
<name>javax.jdo.option.ConnectionURL</name>
- <value>jdbc:derby:${plexus.home}/database</value>
+ <value>jdbc:derby:${plexus.home}/database;create=true</value>
</property>
<property>
<name>javax.jdo.option.ConnectionUserName</name>
Modified: maven/continuum/branches/trygvis-test/continuum-site/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-site/pom.xml?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-site/pom.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-site/pom.xml Wed Aug 3 23:49:47 2005
@@ -14,7 +14,7 @@
<url>scp://minotaur.apache.org//www/maven.apache.org/continuum/</url>
</site>
</distributionManagement>
- <reports>
+ <reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -35,5 +35,5 @@
</plugin>
-->
</plugins>
- </reports>
+ </reporting>
</project>
Modified: maven/continuum/branches/trygvis-test/continuum-site/src/site/apt/getting-started.apt
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-site/src/site/apt/getting-started.apt?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-site/src/site/apt/getting-started.apt (original)
+++ maven/continuum/branches/trygvis-test/continuum-site/src/site/apt/getting-started.apt Wed Aug 3 23:49:47 2005
@@ -12,7 +12,7 @@
Windows or <<<bin/macosx/run.sh>>> if you are using MacOS X.
When Continuum is running you can access it with your browser on
- {{http://localhost:8080/continuum/servlet/continuum}} or by using the XMLRPC interface on port 8000.
+ {{http://localhost:8080/continuum/}} or by using the XMLRPC interface on port 8000.
Adding Projects to Continuum
Modified: maven/continuum/branches/trygvis-test/continuum-site/src/site/site.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-site/src/site/site.xml?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-site/src/site/site.xml (original)
+++ maven/continuum/branches/trygvis-test/continuum-site/src/site/site.xml Wed Aug 3 23:49:47 2005
@@ -32,5 +32,6 @@
<item name="Building" href="dev/building.html"/>
<item name="Change Log" href="change-log.html"/>
</menu>
+ ${reports}
</body>
</project>
Propchange: maven/continuum/branches/trygvis-test/continuum-uml/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 3 23:49:47 2005
@@ -0,0 +1 @@
+*.zuml.bak.*
Propchange: maven/continuum/branches/trygvis-test/continuum-web-test/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 3 23:49:47 2005
@@ -0,0 +1,3 @@
+target
+.project
+.classpath
Modified: maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/index.html
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/index.html?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/index.html (original)
+++ maven/continuum/branches/trygvis-test/continuum-web/src/main/resources/index.html Wed Aug 3 23:49:47 2005
@@ -1,5 +1,7 @@
<html>
+ <head>
+ <META HTTP-EQUIV="Refresh" CONTENT="0; URL=servlet/continuum">
+ </head>
<body>
-<a href="servlet/continuum">GO HERE</a>
</body>
</html>
Modified: maven/continuum/branches/trygvis-test/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/branches/trygvis-test/pom.xml?rev=227314&r1=227313&r2=227314&view=diff
==============================================================================
--- maven/continuum/branches/trygvis-test/pom.xml (original)
+++ maven/continuum/branches/trygvis-test/pom.xml Wed Aug 3 23:49:47 2005
@@ -8,11 +8,13 @@
<url>http://maven.apache.org/continuum/</url>
<ciManagement>
<system>continuum</system>
- <url>http://maven.zones.apache.org:8080/continuumweb/servlet/continuum</url>
+ <url>http://maven.zones.apache.org/continuum/</url>
<notifiers>
<notifier>
<type>mail</type>
- <address>continuum-dev@maven.apache.org</address>
+ <configuration>
+ <address>continuum-dev@maven.apache.org</address>
+ </configuration>
</notifier>
</notifiers>
</ciManagement>
@@ -136,17 +138,17 @@
<dependency>
<groupId>jdo</groupId>
<artifactId>jdo</artifactId>
- <version>2.0-beta-20050728.014228</version>
+ <version>2.0-beta</version>
</dependency>
<dependency>
<groupId>jpox</groupId>
<artifactId>jpox</artifactId>
- <version>1.1.0-beta-4-20050728.014228</version>
+ <version>1.1.0-beta-4-c1</version>
</dependency>
<dependency>
<groupId>jpox</groupId>
<artifactId>jpox-enhancer</artifactId>
- <version>1.1.0-beta-4-20050728.014228</version>
+ <version>1.1.0-beta-4-c1</version>
</dependency>
<!--
|
@@ -194,20 +196,31 @@
<name>Maven Repository</name>
<url>scp://beaver.codehaus.org/home/projects/maven/repository-staging/to-ibiblio/maven2</url>
</repository>
+ <snapshotRepository>
+ <id>snapshots</id>
+ <name>Maven Central Development Repository</name>
+ <url>scp://repo1.maven.org/home/projects/maven/repository-staging/snapshots/maven2</url>
+ </snapshotRepository>
</distributionManagement>
<repositories>
<repository>
<id>snapshots</id>
- <name>Maven Central Development Repository</name>
+ <name>Maven Snapshot Development Repository</name>
<url>http://snapshots.maven.codehaus.org/maven2</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>snapshots</id>
- <name>Maven Central Plugins Development Repository</name>
+ <id>snapshots-plugins</id>
+ <name>Maven Snapshot Plugins Development Repository</name>
<url>http://snapshots.maven.codehaus.org/maven2/plugins</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</pluginRepository>
</pluginRepositories>