Author: trygvis
Date: Mon Jun 13 13:21:50 2005
New Revision: 190504
URL: http://svn.apache.org/viewcvs?rev=190504&view=rev
Log:
o Cleaing out old code.
o Removing the project state guard. Closes CONTINUUM-182.
Removed:
maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/ContinuumConstants.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/state/ContinuumProjectStateGuard.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/state/ContinuumProjectStateGuardException.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/state/DefaultContinuumProjectStateGuard.java
Modified:
maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/TestUtils.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/network/NetCat.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java
maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java
maven/continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/project/ContinuumProjectState.java
maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpc.java
maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java
Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java (original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java Mon Jun 13 13:21:50 2005
@@ -43,10 +43,6 @@
void updateProjectFromScm( String projectId )
throws ContinuumException;
-// void updateProjectConfiguration( String projectId,
-// Properties configuration )
-// throws ContinuumException;
-
ContinuumProject getProject( String projectId )
throws ContinuumException;
Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/store/ContinuumStore.java Mon Jun 13 13:21:50 2005
@@ -40,19 +40,6 @@
String addProject( ContinuumProject project )
throws ContinuumStoreException;
-// /**
-// * @deprecated
-// */
-// String addProject( String name,
-// String scmUrl,
-// String nagEmailAddress,
-// String version,
-// String commandLineArguments,
-// String executorId,
-// String workingDirectory,
-// Properties properties )
-// throws ContinuumStoreException;
-
void removeProject( String projectId )
throws ContinuumStoreException;
@@ -67,9 +54,6 @@
String commandLineArguments )
throws ContinuumStoreException;
-// void updateProjectConfiguration( String projectId, Properties configuration )
-// throws ContinuumStoreException;
-
Collection getAllProjects()
throws ContinuumStoreException;
@@ -81,9 +65,6 @@
ContinuumProject getProject( String projectId )
throws ContinuumStoreException;
-
-// ContinuumProject getProjectByBuild( String buildId )
-// throws ContinuumStoreException;
CheckOutScmResult getCheckOutScmResultForProject( String projectId )
throws ContinuumStoreException;
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Mon Jun 13 13:21:50 2005
@@ -128,12 +128,6 @@
core.updateProjectFromScm( projectId );
}
-// public void updateProjectConfiguration( String projectId, Properties configuration )
-// throws ContinuumException
-// {
-// core.updateProjectConfiguration( projectId, configuration );
-// }
-
public void removeProject( String projectId )
throws ContinuumException
{
@@ -236,16 +230,6 @@
public AntProject getAntProject( String projectId )
throws ContinuumException
{
-// ContinuumProject p = getProject( id );
-//
-// AntProject ap = new AntProject();
-//
-// copyProject( p, ap );
-//
-// ap.setTargets( p.getConfiguration().getProperty( AntBuildExecutor.CONFIGURATION_TARGETS ) );
-//
-// ap.setExecutable( p.getConfiguration().getProperty( AntBuildExecutor.CONFIGURATION_EXECUTABLE ) );
-
return (AntProject) core.getProject( projectId );
}
@@ -253,20 +237,6 @@
throws ContinuumException
{
updateProject( project );
-
-// // ----------------------------------------------------------------------
-// // The configuration will be null here because the "executable" and
-// // "targets" fields in the AntProject are used to create the
-// // configuration. We probably don't even need the configuration.
-// // ----------------------------------------------------------------------
-//
-// Properties configuration = new Properties();
-//
-// configuration.setProperty( AntBuildExecutor.CONFIGURATION_EXECUTABLE, project.getExecutable() );
-//
-// configuration.setProperty( AntBuildExecutor.CONFIGURATION_TARGETS, project.getTargets() );
-//
-// updateProjectConfiguration( project.getId(), configuration );
}
// ----------------------------------------------------------------------
@@ -332,10 +302,6 @@
public String addMavenOneProject( MavenOneProject project )
throws ContinuumException
{
-// Properties configuration = new Properties();
-//
-// configuration.setProperty( MavenOneBuildExecutor.CONFIGURATION_GOALS, project.getGoals() );
-
project.setExecutorId( MavenOneBuildExecutor.ID );
// ----------------------------------------------------------------------
@@ -367,15 +333,6 @@
public MavenOneProject getMavenOneProject( String projectId )
throws ContinuumException
{
-// ContinuumProject p = getProject( projectId );
-//
-// MavenOneProject mp = new MavenOneProject();
-//
-// copyProject( p, mp );
-//
-// mp.setGoals( p.getConfiguration().getProperty( MavenOneBuildExecutor.CONFIGURATION_GOALS ) );
-//
-// return mp;
return (MavenOneProject) core.getProject( projectId );
}
@@ -383,12 +340,6 @@
throws ContinuumException
{
updateProject( project );
-
-// Properties configuration = new Properties();
-//
-// configuration.setProperty( MavenOneBuildExecutor.CONFIGURATION_GOALS, project.getGoals() );
-//
-// updateProjectConfiguration( project.getId(), configuration );
}
// ----------------------------------------------------------------------
@@ -463,12 +414,6 @@
public String addMavenTwoProject( MavenTwoProject project )
throws ContinuumException
{
-// //TODO: these need to go away
-//
-// Properties configuration = new Properties();
-//
-// configuration.setProperty( MavenTwoBuildExecutor.CONFIGURATION_GOALS, project.getGoals() );
-
project.setExecutorId( MavenTwoBuildExecutor.ID );
// ----------------------------------------------------------------------
@@ -500,15 +445,6 @@
public MavenTwoProject getMavenTwoProject( String projectId )
throws ContinuumException
{
-// ContinuumProject p = getProject( projectId );
-//
-// MavenTwoProject mp = new MavenTwoProject();
-//
-// copyProject( p, mp );
-//
-// mp.setGoals( p.getConfiguration().getProperty( MavenTwoBuildExecutor.CONFIGURATION_GOALS ) );
-//
-// return mp;
return (MavenTwoProject) core.getProject( projectId );
}
@@ -516,14 +452,6 @@
throws ContinuumException
{
updateProject( project );
-
-// Properties configuration = new Properties();
-//
-// String goals = StringUtils.clean( project.getGoals() );
-//
-// configuration.setProperty( MavenTwoBuildExecutor.CONFIGURATION_GOALS, goals );
-//
-// updateProjectConfiguration( project.getId(), configuration );
}
public String addShellProject( ShellProject project )
@@ -539,15 +467,6 @@
public ShellProject getShellProject( String projectId )
throws ContinuumException
{
-// ContinuumProject p = getProject( id );
-//
-// ShellProject sp = new ShellProject();
-//
-// copyProject( p, sp );
-//
-// sp.setExecutable( p.getConfiguration().getProperty( ShellBuildExecutor.CONFIGURATION_EXECUTABLE ) );
-//
-// return sp;
return (ShellProject) core.getProject( projectId );
}
@@ -555,12 +474,6 @@
throws ContinuumException
{
updateProject( project );
-
-// Properties configuration = new Properties();
-//
-// configuration.setProperty( ShellBuildExecutor.CONFIGURATION_EXECUTABLE, project.getExecutable() );
-//
-// updateProjectConfiguration( project.getId(), configuration );
}
// ----------------------------------------------------------------------
@@ -577,19 +490,4 @@
project.getVersion(),
project.getCommandLineArguments() );
}
-
-// private void copyProject( ContinuumProject p1, ContinuumProject p2 )
-// {
-// p2.setId( p1.getId() );
-//
-// p2.setName( p1.getName() );
-//
-// p2.setScmUrl( p1.getScmUrl() );
-//
-// p2.setNagEmailAddress( p1.getNagEmailAddress() );
-//
-// p2.setVersion( p1.getVersion() );
-//
-// p2.setExecutorId( p1.getExecutorId() );
-// }
}
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/TestUtils.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/TestUtils.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/TestUtils.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/TestUtils.java Mon Jun 13 13:21:50 2005
@@ -24,7 +24,7 @@
/**
* @author Trygve Laugstøl
- * @version $Id: TestUtils.java,v 1.2 2005/04/04 15:24:03 trygvis Exp $
+ * @version $Id$
*/
public class TestUtils
{
@@ -72,11 +72,6 @@
result = continuumStore.getBuild( buildId );
Assert.assertNotNull( result );
-
-// if ( result.getState() == ContinuumProjectState.BUILD_SIGNALED )
-// {
-// continue;
-// }
if ( result.getState() != ContinuumProjectState.BUILDING )
{
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/ContinuumCore.java Mon Jun 13 13:21:50 2005
@@ -64,9 +64,6 @@
String commandLineArguments )
throws ContinuumException;
-// void updateProjectConfiguration( String projectId, Properties configuration )
-// throws ContinuumException;
-
ContinuumProject getProject( String projectId )
throws ContinuumException;
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/DefaultContinuumCore.java Mon Jun 13 13:21:50 2005
@@ -303,19 +303,6 @@
}
}
-// public void updateProjectConfiguration( String projectId, Properties configuration )
-// throws ContinuumException
-// {
-// try
-// {
-// store.updateProjectConfiguration( projectId, configuration );
-// }
-// catch ( ContinuumStoreException ex )
-// {
-// throw logAndCreateException( "Error while updating project configuration.", ex );
-// }
-// }
-
public void removeProject( String projectId )
throws ContinuumException
{
@@ -488,22 +475,22 @@
}
// TODO: Reenable
-// try
-// {
-// if ( store.getProjectByName( project.getName() ) != null )
+ try
+ {
+ if ( store.getProjectByName( project.getName() ) != null )
+ {
+ throw new ContinuumException( "A project with the name '" + project.getName() + "' already exist." );
+ }
+
+// if ( getProjectByScmUrl( scmUrl ) != null )
// {
-// throw new ContinuumException( "A project with the name '" + project.getName() + "' already exist." );
+// throw new ContinuumStoreException( "A project with the scm url '" + scmUrl + "' already exist." );
// }
-//
-//// if ( getProjectByScmUrl( scmUrl ) != null )
-//// {
-//// throw new ContinuumStoreException( "A project with the scm url '" + scmUrl + "' already exist." );
-//// }
-// }
-// catch ( ContinuumStoreException e )
-// {
-// throw new ContinuumException( "Error while validating the project.", e );
-// }
+ }
+ catch ( ContinuumStoreException e )
+ {
+ throw new ContinuumException( "Error while validating the project.", e );
+ }
// ----------------------------------------------------------------------
// Validate each field
@@ -525,14 +512,6 @@
// Store the project
// ----------------------------------------------------------------------
-// projectId = store.addProject( project.getName(),
-// project.getScmUrl(),
-// project.getNagEmailAddress(),
-// project.getVersion(),
-// project.getCommandLineArguments(),
-// executorId,
-// null,
-// project.getConfiguration() );
projectId = store.addProject( project );
// ----------------------------------------------------------------------
@@ -647,8 +626,6 @@
project.getNagEmailAddress(),
project.getVersion(),
project.getCommandLineArguments() );
-
-// store.updateProjectConfiguration( id, project.getConfiguration() );
}
catch ( ContinuumStoreException e )
{
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java Mon Jun 13 13:21:50 2005
@@ -31,11 +31,10 @@
throw new ContinuumException( "No such executor with id '" + project.getExecutorId() + "'." );
}
- // TODO: re-enable
-// if ( getStore().getProjectByName( project.getName() ) != null )
-// {
-// throw new ContinuumException( "A project with the name '" + project.getName() + "' already exist." );
-// }
+ if ( getStore().getProjectByName( project.getName() ) != null )
+ {
+ throw new ContinuumException( "A project with the name '" + project.getName() + "' already exist." );
+ }
// if ( getProjectByScmUrl( scmUrl ) != null )
// {
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java Mon Jun 13 13:21:50 2005
@@ -64,11 +64,6 @@
File workingDirectory = new File( project.getWorkingDirectory() );
-// Properties configuration = project.getConfiguration();
-//
-// String executable = getConfiguration( configuration, CONFIGURATION_EXECUTABLE );
-//
-// String targets = getConfiguration( configuration, CONFIGURATION_TARGETS );
String executable = project.getExecutable();
String targets = project.getTargets();
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java Mon Jun 13 13:21:50 2005
@@ -127,12 +127,6 @@
}
// Goals
-// Properties configuration = new Properties();
-//
-// if ( StringUtils.isEmpty( configuration.getProperty( MavenOneBuildExecutor.CONFIGURATION_GOALS ) ) )
-// {
-// configuration.setProperty( MavenOneBuildExecutor.CONFIGURATION_GOALS, "clean:clean jar:install" );
-// }
if ( StringUtils.isEmpty( project.getGoals() ) )
{
project.setGoals( "clean:clean jar:install" );
@@ -149,8 +143,6 @@
project.setNagEmailAddress( nagEmailAddress );
project.setVersion( version );
-
-// project.setConfiguration( configuration );
}
// ----------------------------------------------------------------------
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java Mon Jun 13 13:21:50 2005
@@ -59,10 +59,6 @@
File workingDirectory = new File( project.getWorkingDirectory() );
-// Properties configuration = project.getConfiguration();
-//
-// String goals = getConfiguration( configuration, CONFIGURATION_GOALS );
-
String commandLine = project.getCommandLineArguments() + " " + project.getGoals();
ExecutionResult executionResult;
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Mon Jun 13 13:21:50 2005
@@ -87,12 +87,6 @@
continuumProject.setCommandLineArguments( "-N" );
}
-// Properties configuration = continuumProject.getConfiguration();
-//
-// if ( StringUtils.isEmpty( configuration.getProperty( MavenTwoBuildExecutor.CONFIGURATION_GOALS ) ) )
-// {
-// configuration.setProperty( MavenTwoBuildExecutor.CONFIGURATION_GOALS, "clean:clean install" );
-// }
if ( StringUtils.isEmpty( continuumProject.getGoals() ) )
{
continuumProject.setGoals( "clean:clean install" );
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java Mon Jun 13 13:21:50 2005
@@ -61,7 +61,6 @@
ExecutionResult executionResult;
-// String executable = getConfiguration( project.getConfiguration(), CONFIGURATION_EXECUTABLE );
String executable = project.getExecutable();
if ( executable.charAt( 0 ) != '/' &&
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/network/NetCat.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/network/NetCat.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/network/NetCat.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/network/NetCat.java Mon Jun 13 13:21:50 2005
@@ -63,15 +63,11 @@
while ( ( n = contents.read( buffer ) ) != -1 )
{
-// for( int i = 0; i < n; i++)
-// System.err.print( (char)buffer[i] );
output.write( buffer, 0, n );
}
while ( ( n = input.read( buffer ) ) != -1 )
{
-// for( int i = 0; i < n; i++)
-// System.err.print( (char)buffer[i] );
result.write( buffer, 0, n );
}
}
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java Mon Jun 13 13:21:50 2005
@@ -23,7 +23,7 @@
/**
* @author Trygve Laugstøl
- * @version $Id: FormatterTool.java,v 1.2 2005/04/03 21:53:22 trygvis Exp $
+ * @version $Id$
*/
public class FormatterTool
{
@@ -55,10 +55,6 @@
{
return "Error";
}
-// else if ( state == ContinuumProjectState.BUILD_SIGNALED )
-// {
-// return "Build signaled";
-// }
else if ( state == ContinuumProjectState.BUILDING )
{
return "Building";
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStore.java Mon Jun 13 13:21:50 2005
@@ -31,7 +31,6 @@
import org.apache.maven.continuum.project.ContinuumJPoxStore;
import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.apache.maven.continuum.project.state.ContinuumProjectStateGuard;
import org.apache.maven.continuum.scm.CheckOutScmResult;
import org.apache.maven.continuum.scm.ScmFile;
import org.apache.maven.continuum.scm.UpdateScmResult;
@@ -59,9 +58,6 @@
/** @requirement */
private JdoFactory jdoFactory;
- /** @requirement */
- private ContinuumProjectStateGuard projectStateGuard;
-
private ContinuumJPoxStore store;
// ----------------------------------------------------------------------
@@ -100,42 +96,6 @@
return project.getId();
}
-// public String addProject( String name,
-// String scmUrl,
-// String nagEmailAddress,
-// String version,
-// String commandLineArguments,
-// String executorId,
-// String workingDirectory,
-// Properties configuration )
-// throws ContinuumStoreException
-// {
-// ContinuumProject project = new ContinuumProject();
-//
-// project.setName( name );
-// project.setScmUrl( scmUrl );
-// project.setNagEmailAddress( nagEmailAddress );
-// project.setVersion( version );
-// project.setCommandLineArguments( commandLineArguments );
-// project.setExecutorId( executorId );
-// project.setWorkingDirectory( workingDirectory );
-// project.setState( ContinuumProjectState.CHECKING_OUT );
-// project.setConfiguration( configuration );
-//
-// try
-// {
-// Object id = store.addContinuumProject( project );
-//
-// project = store.getContinuumProjectByJdoId( id, true );
-// }
-// catch ( Exception e )
-// {
-// throw new ContinuumStoreException( "Error while adding a project.", e );
-// }
-//
-// return project.getId();
-// }
-
public void removeProject( String projectId )
throws ContinuumStoreException
{
@@ -143,26 +103,17 @@
{
store.begin();
-// System.err.println( "**********************************" );
-// System.err.println( "**********************************" );
-// System.err.println( "**********************************" );
-
-// System.err.println( "getProject()" );
ContinuumProject project = store.getContinuumProject( projectId, false );
- projectStateGuard.assertDeletable( project );
-
// TODO: This whole section is dumb.
PersistenceManager pm = store.getThreadState().getPersistenceManager();
-// System.err.println( "project.getBuilds()" );
List builds = project.getBuilds();
for ( Iterator it = builds.iterator(); it.hasNext(); )
{
ContinuumBuild build = (ContinuumBuild) it.next();
-// System.err.println( "getBuildResult()" );
ContinuumBuildResult result = build.getBuildResult();
if ( result == null )
@@ -170,39 +121,20 @@
continue;
}
-// System.err.println( "result.getChangedFiles()" );
-// List changedFiles = result.getChangedFiles();
-
-// System.err.println( "changedFiles.clear()" );
-// changedFiles.clear();
-
-// System.err.println( "pm.deletePersistentAll( changedFiles )" );
-// pm.deletePersistentAll( changedFiles );
-
-// System.err.println( "result.setBuild( null )" );
result.setBuild( null );
-// System.err.println( "pm.deletePersistent( result )" );
pm.deletePersistent( result );
-
-// System.err.println( "build.setProject( null )" );
-// build.setProject( null );
}
for ( Iterator it = builds.iterator(); it.hasNext(); )
{
ContinuumBuild build = (ContinuumBuild) it.next();
-// System.err.println( "build.setProject( null )" );
-// build.setProject( null );
-
pm.deletePersistent( build );
}
-// System.err.println( "pm.deletePersistentAll( builds )" );
pm.deletePersistentAll( builds );
-// System.err.println( "store.deleteContinuumProject( projectId )" );
store.deleteContinuumProject( projectId );
store.commit();
@@ -226,8 +158,6 @@
ContinuumProject project = store.getContinuumProject( projectId, false );
- projectStateGuard.assertCanChangeWorkingDirectory( project );
-
project.setWorkingDirectory( workingDirectory );
store.commit();
@@ -254,8 +184,6 @@
ContinuumProject project = store.getContinuumProject( projectId, false );
- projectStateGuard.assertUpdatable( project );
-
project.setName( name );
project.setScmUrl( scmUrl );
project.setNagEmailAddress( nagEmailAddress );
@@ -272,29 +200,6 @@
}
}
-// public void updateProjectConfiguration( String projectId, Properties configuration )
-// throws ContinuumStoreException
-// {
-// try
-// {
-// store.begin();
-//
-// ContinuumProject project = store.getContinuumProject( projectId, false );
-//
-// projectStateGuard.assertUpdatable( project );
-//
-// project.setConfiguration( configuration );
-//
-// store.commit();
-// }
-// catch ( Exception e )
-// {
-// rollback( store );
-//
-// throw new ContinuumStoreException( "Error while updating project configuration.", e );
-// }
-// }
-
public Collection getAllProjects()
throws ContinuumStoreException
{
@@ -371,29 +276,6 @@
}
}
-// public ContinuumProject getProjectByBuild( String buildId )
-// throws ContinuumStoreException
-// {
-// try
-// {
-// store.begin();
-//
-// ContinuumBuild build = store.getContinuumBuild( buildId, false );
-//
-// Object id = JDOHelper.getObjectId( build.getProject() );
-//
-// store.commit();
-//
-// return store.getContinuumProjectByJdoId( id, true );
-// }
-// catch ( Exception e )
-// {
-// rollback( store );
-//
-// throw new ContinuumStoreException( "Error while loading project.", e );
-// }
-// }
-
public CheckOutScmResult getCheckOutScmResultForProject( String projectId )
throws ContinuumStoreException
{
@@ -447,8 +329,6 @@
ContinuumProject project = store.getContinuumProject( projectId, false );
- projectStateGuard.assertInState( project, ContinuumProjectState.BUILDING );
-
ContinuumBuild build = new ContinuumBuild();
build.setStartTime( System.currentTimeMillis() );
@@ -489,8 +369,6 @@
// a search for the project
ContinuumProject project = build.getProject();
- projectStateGuard.assertTransition( project, state );
-
project.setState( state );
build.setState( state );
@@ -501,17 +379,6 @@
build.setUpdateScmResult( scmResult );
-// store.commit();
-//
-// // ----------------------------------------------------------------------
-// // This double commit seems to be needed for some reason. Not having it
-// // seems to result in some foreign key constraint violation.
-// // ----------------------------------------------------------------------
-//
-// store.begin();
-//
-// build = store.getContinuumBuild( buildId, false );
-
build.setBuildResult( result );
store.commit();
@@ -551,25 +418,14 @@
Query q = pm.newQuery( ContinuumBuild.class );
q.declareParameters( "String projectId" );
q.setFilter( "this.project.id == projectId" );
-// q.setRange( 0, 1 );
q.setOrdering( "id asc" );
Collection builds = (Collection) q.execute( projectId );
-// List builds = store.getContinuumProject( projectId, false ).getBuilds();
-//
if ( builds.size() == 0 )
{
return null;
}
-//
-// for ( Iterator it = builds.iterator(); it.hasNext(); )
-// {
-// ContinuumBuild build = (ContinuumBuild) it.next();
-//
-// System.err.println( "build.id: " + build.getId() );
-// }
-//
-// ContinuumBuild build = (ContinuumBuild) builds.get( builds.size() - 1 );
+
ContinuumBuild build = (ContinuumBuild) builds.iterator().next();
build = (ContinuumBuild) store.getThreadState().getPersistenceManager().detachCopy( build );
@@ -708,8 +564,6 @@
state = ContinuumProjectState.ERROR;
}
- projectStateGuard.assertTransition( project, state );
-
project.setState( state );
project.setCheckOutScmResult( scmResult );
@@ -737,8 +591,6 @@
ContinuumProject project = store.getContinuumProject( projectId, false );
- projectStateGuard.assertTransition( project, ContinuumProjectState.UPDATING );
-
project.setState( ContinuumProjectState.UPDATING );
store.commit();
@@ -760,8 +612,6 @@
ContinuumProject project = store.getContinuumProject( projectId, false );
- projectStateGuard.assertTransition( project, ContinuumProjectState.BUILDING );
-
project.setState( ContinuumProjectState.BUILDING );
store.commit();
@@ -796,8 +646,6 @@
state = latestBuild.getState();
}
- projectStateGuard.assertTransition( project, state );
-
project.setState( state );
store.commit();
@@ -820,8 +668,6 @@
store.begin();
ContinuumProject project = store.getContinuumProject( projectId, false );
-
- projectStateGuard.assertInState( project, ContinuumProjectState.BUILDING );
ContinuumBuild build = new ContinuumBuild();
Modified: maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml Mon Jun 13 13:21:50 2005
@@ -125,15 +125,7 @@
org.codehaus.plexus.jdo.JdoFactory
-
- org.apache.maven.continuum.project.state.ContinuumProjectStateGuard
-
-
-
-
- org.apache.maven.continuum.project.state.ContinuumProjectStateGuard
- org.apache.maven.continuum.project.state.DefaultContinuumProjectStateGuard
Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java Mon Jun 13 13:21:50 2005
@@ -69,10 +69,6 @@
project.setGoals( "clean:clean jar:install" );
-// Properties expectedConfiguration = new Properties();
-//
-// expectedConfiguration.put( MavenOneBuildExecutor.CONFIGURATION_GOALS, "clean:clean jar:install" );
-
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
@@ -93,13 +89,6 @@
assertEquals( "1.1-SNAPSHOT", project.getVersion() );
-// Properties configuration = project.getConfiguration();
-//
-// assertNotNull( configuration );
-//
-// assertEquals( 1, configuration.size() );
-//
-// assertEquals( "clean:clean jar:install", configuration.getProperty( MavenOneBuildExecutor.CONFIGURATION_GOALS ) );
assertEquals( "clean:clean jar:install", project.getGoals() );
}
}
Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilderTest.java Mon Jun 13 13:21:50 2005
@@ -52,13 +52,6 @@
assertEquals( "1.1-SNAPSHOT", project.getVersion() );
-// Properties configuration = project.getConfiguration();
-//
-// assertNotNull( configuration );
-//
-// assertEquals( 1, configuration.size() );
-//
-// assertEquals( "clean:clean jar:install", configuration.getProperty( MavenOneBuildExecutor.CONFIGURATION_GOALS ) );
assertEquals( "clean:clean jar:install", project.getGoals() );
}
}
Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilderTest.java Mon Jun 13 13:21:50 2005
@@ -121,10 +121,6 @@
assertTrue( project.getScmUrl().startsWith( scmUrl ) );
-// assertEquals( 1, project.getConfiguration().size() );
-//
-// assertEquals( "clean:clean install",
-// project.getConfiguration().get( MavenTwoBuildExecutor.CONFIGURATION_GOALS ) );
assertEquals( "clean:clean install", project.getGoals() );
}
}
Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store/ModelloJPoxContinuumStoreTest.java Mon Jun 13 13:21:50 2005
@@ -385,38 +385,6 @@
project2 );
}
-// public void testUpdateProjectConfiguration()
-// throws Exception
-// {
-// ContinuumStore store = (ContinuumStore) lookup( ContinuumStore.ROLE );
-//
-// String projectId = addProject( "Update Test Project", "scm:update-project" );
-//
-// ContinuumProject project = store.getProject( projectId );
-//
-// assertEquals( 0, project.getConfiguration().size() );
-//
-// // ----------------------------------------------------------------------
-// //
-// // ----------------------------------------------------------------------
-//
-// Properties expected = new Properties();
-//
-// expected.put( "key", "value" );
-//
-// store.updateProjectConfiguration( projectId, expected );
-//
-// Properties actual = store.getProject( projectId ).getConfiguration();
-//
-// assertNotNull( "The configuration is null", actual );
-//
-// assertEquals( expected.size(), actual.size() );
-//
-// assertTrue( actual.containsKey( "key" ) );
-//
-// assertEquals( "value", actual.getProperty( "key" ) );
-// }
-
public void testRemoveProject()
throws Exception
{
@@ -727,12 +695,6 @@
// Public utility methods
// ----------------------------------------------------------------------
-// public static ContinuumProject makeStubProject( String name )
-// {
-// return makeStubProject( name,
-// "scm:local:src/test/repo" );
-// }
-
public static ContinuumProject makeStubProject( String name, String scmUrl )
{
return makeProject( name,
@@ -795,12 +757,6 @@
return projectId;
}
-// public static String addProject( ContinuumStore store, String name )
-// throws Exception
-// {
-// return addProject( store, makeStubProject( name ) );
-// }
-
public static String addProject( ContinuumStore store, String name, String scmUrl )
throws Exception
{
@@ -817,14 +773,6 @@
String workingDirectory )
throws Exception
{
-// String projectId = store.addProject( name,
-// scmUrl,
-// nagEmailAddress,
-// version,
-// commandLineArguments,
-// executorId,
-// workingDirectory,
-// configuration );
String projectId = store.addProject( makeProject( name,
scmUrl,
nagEmailAddress,
@@ -907,16 +855,5 @@
assertEquals( "project.executorId", builderId, actual.getExecutorId() );
assertEquals( "project.workingDirectory", workingDirectory, actual.getWorkingDirectory() );
-
-// for ( Iterator it = configuration.keySet().iterator(); it.hasNext(); )
-// {
-// String key = (String) it.next();
-//
-// String value = actual.getConfiguration().getProperty( key );
-//
-// assertNotNull( "Value for key '" + key + "' was null.", value );
-//
-// assertEquals( "The values for '" + key + "' doesn't match.", configuration.getProperty( key ), value );
-// }
}
}
Modified: maven/continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/project/ContinuumProjectState.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/project/ContinuumProjectState.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/project/ContinuumProjectState.java (original)
+++ maven/continuum/trunk/continuum-model/src/main/java/org/apache/maven/continuum/project/ContinuumProjectState.java Mon Jun 13 13:21:50 2005
@@ -20,7 +20,7 @@
/**
* @author Trygve Laugstøl
- * @version $Id: ContinuumProjectState.java,v 1.1.1.1 2005/03/29 20:42:02 trygvis Exp $
+ * @version $Id$
*/
public class ContinuumProjectState
implements Serializable
@@ -52,15 +52,6 @@
*/
// public final static ContinuumProjectState ERROR = new ContinuumProjectState( "error" );
public final static int ERROR = 4;
-
- /**
- * This state indicates that this project has been placed on the build queue.
- *
- * Continuum can be configured with a delay from the first build signal to
- * the actual build starts to make.
- */
-// public final static ContinuumProjectState BUILD_SIGNALED = new ContinuumProjectState( "signaled" );
-// public final static int BUILD_SIGNALED = 5;
/**
* This state indicates that a project is currently beeing build.
Modified: maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpc.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpc.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpc.java (original)
+++ maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/ContinuumXmlRpc.java Mon Jun 13 13:21:50 2005
@@ -37,9 +37,6 @@
Hashtable removeProject( String projectId );
-// Hashtable updateProjectConfiguration( String projectId,
-// Hashtable configuration );
-
Hashtable getProject( String projectId );
Hashtable getProjects();
Modified: maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java?rev=190504&r1=190503&r2=190504&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java (original)
+++ maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java Mon Jun 13 13:21:50 2005
@@ -81,31 +81,6 @@
}
}
-// public Hashtable updateProjectConfiguration( String projectId,
-// Hashtable configuration )
-// {
-// try
-// {
-// Properties configurationProperties = new Properties();
-//
-// for ( Iterator it = configuration.entrySet().iterator(); it.hasNext(); )
-// {
-// Map.Entry entry = (Map.Entry) it.next();
-//
-// configurationProperties.put( entry.getKey().toString(), entry.getValue().toString() );
-// }
-//
-// continuum.updateProjectConfiguration( projectId, configurationProperties );
-//
-// return makeHashtable();
-// }
-// catch ( Throwable e )
-// {
-// return handleException( "ContinuumXmlRpc.updateProjectConfiguration()",
-// "Project id: '" + projectId + "'.", e );
-// }
-// }
-
public Hashtable getProject( String projectId )
{
try
@@ -536,19 +511,6 @@
ContinuumProject project = (ContinuumProject) object;
Hashtable hashtable = xmlRpcHelper.objectToHashtable( project, excludedProperties );
-
-// Properties configuration = project.getConfiguration();
-//
-// Hashtable configurationHashtable = new Hashtable();
-//
-// for ( Iterator it = configuration.entrySet().iterator(); it.hasNext(); )
-// {
-// Map.Entry entry = (Map.Entry) it.next();
-//
-// configurationHashtable.put( entry.getKey().toString(), entry.getValue().toString() );
-// }
-//
-// hashtable.put( "configuration", configurationHashtable );
return hashtable;
}