You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by tr...@apache.org on 2005/05/11 20:07:50 UTC
svn commit: r169665 -
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven
/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus
/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/builder/manager
/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/builder/maven/m1
/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution
/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/manager
/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven
/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1
/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail
/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/maven
/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/store
/maven/continuum/trunk/continuum-model/src/main/resources
/maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc
Author: trygvis
Date: Wed May 11 11:07:47 2005
New Revision: 169665
URL: http://svn.apache.org/viewcvs?rev=169665&view=rev
Log:
Fixing CONTINUUM-126: ""Rename the ContinuumBuilder to ContinuumBuildExecutor".
Added:
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
- copied, changed from r169508, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/AbstractContinuumBuilder.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java
- copied, changed from r169508, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/ContinuumBuilder.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java
- copied, changed from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/ant/AntBuilder.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorManager.java
- copied, changed from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/manager/BuilderManager.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorNotFoundException.java
- copied, changed from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/manager/BuilderNotFoundException.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java
- copied, changed from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/manager/DefaultBuilderManager.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
- copied, changed from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m1/DefaultMavenOneMetadataHelper.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
- copied, changed from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m1/Maven1Builder.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java
- copied, changed from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m1/MavenOneMetadataHelper.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
- copied, changed from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m2/DefaultMavenBuilderHelper.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java
- copied, changed from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m2/MavenBuilderHelper.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
- copied, changed from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m2/MavenShellBuilder.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/DefaultShellCommandHelper.java
- copied, changed from r169508, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/DefaultShellCommandHelper.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ExecutionResult.java
- copied, changed from r169508, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/ExecutionResult.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
- copied, changed from r169508, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/ShellBuilder.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellCommandHelper.java
- copied, changed from r169508, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/ShellCommandHelper.java
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/manager/
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManagerTest.java
- copied, changed from r169492, maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/builder/manager/DefaultBuilderManagerTest.java
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java
- copied, changed from r169492, maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/builder/maven/m1/Maven1BuilderTest.java
Removed:
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/builder/manager/DefaultBuilderManagerTest.java
maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/builder/maven/m1/Maven1BuilderTest.java
Modified:
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/buildcontroller/DefaultBuildController.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.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/notification/mail/MailContinuumNotifierTest.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/store/ModelloJPoxContinuumStoreTest.java
maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo
maven/continuum/trunk/continuum-xmlrpc/src/main/java/org/apache/maven/continuum/xmlrpc/DefaultContinuumXmlRpc.java
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=169665&r1=169664&r2=169665&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 Wed May 11 11:07:47 2005
@@ -28,12 +28,6 @@
import java.util.List;
import java.util.Properties;
-import org.apache.maven.continuum.builder.ContinuumBuilder;
-import org.apache.maven.continuum.builder.ant.AntBuilder;
-import org.apache.maven.continuum.builder.manager.BuilderManager;
-import org.apache.maven.continuum.builder.maven.m1.Maven1Builder;
-import org.apache.maven.continuum.builder.maven.m2.MavenShellBuilder;
-import org.apache.maven.continuum.builder.shell.ShellBuilder;
import org.apache.maven.continuum.buildqueue.BuildProjectTask;
import org.apache.maven.continuum.project.AntProject;
import org.apache.maven.continuum.project.ContinuumBuild;
@@ -53,6 +47,12 @@
import org.apache.maven.continuum.scm.queue.CheckOutTask;
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.store.ContinuumStoreException;
+import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
+import org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor;
+import org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor;
+import org.apache.maven.continuum.execution.ant.AntBuildExecutor;
+import org.apache.maven.continuum.execution.shell.ShellBuildExecutor;
+import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -85,7 +85,7 @@
// that the database is properly initialized before starting the store.
/** @requirement */
- private BuilderManager builderManager;
+ private BuildExecutorManager buildExecutorManager;
/** @requirement */
private ContinuumProjectBuilderManager projectBuilderManager;
@@ -243,7 +243,7 @@
// stuff out
// ----------------------------------------------------------------------
- if ( !builderManager.hasBuilder( executorId ) )
+ if ( !buildExecutorManager.hasBuilder( executorId ) )
{
throw new ContinuumException( "No such executor with id '" + executorId + "'." );
}
@@ -461,12 +461,12 @@
{
Properties configuration = new Properties();
- configuration.setProperty( AntBuilder.CONFIGURATION_EXECUTABLE, project.getExecutable() );
+ configuration.setProperty( AntBuildExecutor.CONFIGURATION_EXECUTABLE, project.getExecutable() );
- configuration.setProperty( AntBuilder.CONFIGURATION_TARGETS, project.getTargets() );
+ configuration.setProperty( AntBuildExecutor.CONFIGURATION_TARGETS, project.getTargets() );
addProjectFromScm( project.getScmUrl(),
- AntBuilder.ID,
+ AntBuildExecutor.ID,
project.getName(),
project.getNagEmailAddress(),
project.getVersion(),
@@ -482,9 +482,9 @@
copyProject( p, ap );
- ap.setTargets( p.getConfiguration().getProperty( AntBuilder.CONFIGURATION_TARGETS ) );
+ ap.setTargets( p.getConfiguration().getProperty( AntBuildExecutor.CONFIGURATION_TARGETS ) );
- ap.setExecutable( p.getConfiguration().getProperty( AntBuilder.CONFIGURATION_EXECUTABLE ) );
+ ap.setExecutable( p.getConfiguration().getProperty( AntBuildExecutor.CONFIGURATION_EXECUTABLE ) );
return ap;
}
@@ -502,9 +502,9 @@
Properties configuration = new Properties();
- configuration.setProperty( AntBuilder.CONFIGURATION_EXECUTABLE, project.getExecutable() );
+ configuration.setProperty( AntBuildExecutor.CONFIGURATION_EXECUTABLE, project.getExecutable() );
- configuration.setProperty( AntBuilder.CONFIGURATION_TARGETS, project.getTargets() );
+ configuration.setProperty( AntBuildExecutor.CONFIGURATION_TARGETS, project.getTargets() );
updateProjectConfiguration( project.getId(), configuration );
}
@@ -514,10 +514,10 @@
{
Properties configuration = new Properties();
- configuration.setProperty( Maven1Builder.CONFIGURATION_GOALS, project.getGoals() );
+ configuration.setProperty( MavenOneBuildExecutor.CONFIGURATION_GOALS, project.getGoals() );
addProjectFromScm( project.getScmUrl(),
- Maven1Builder.ID,
+ MavenOneBuildExecutor.ID,
project.getName(),
project.getNagEmailAddress(),
project.getVersion(),
@@ -533,7 +533,7 @@
copyProject( p, mp );
- mp.setGoals( p.getConfiguration().getProperty( Maven1Builder.CONFIGURATION_GOALS ) );
+ mp.setGoals( p.getConfiguration().getProperty( MavenOneBuildExecutor.CONFIGURATION_GOALS ) );
return mp;
}
@@ -545,7 +545,7 @@
Properties configuration = new Properties();
- configuration.setProperty( Maven1Builder.CONFIGURATION_GOALS, project.getGoals() );
+ configuration.setProperty( MavenOneBuildExecutor.CONFIGURATION_GOALS, project.getGoals() );
updateProjectConfiguration( project.getId(), configuration );
}
@@ -555,10 +555,10 @@
{
Properties configuration = new Properties();
- configuration.setProperty( MavenShellBuilder.CONFIGURATION_GOALS, project.getGoals() );
+ configuration.setProperty( MavenTwoBuildExecutor.CONFIGURATION_GOALS, project.getGoals() );
addProjectFromScm( project.getScmUrl(),
- MavenShellBuilder.ID,
+ MavenTwoBuildExecutor.ID,
project.getName(),
project.getNagEmailAddress(),
project.getVersion(),
@@ -574,7 +574,7 @@
copyProject( p, mp );
- mp.setGoals( p.getConfiguration().getProperty( MavenShellBuilder.CONFIGURATION_GOALS ) );
+ mp.setGoals( p.getConfiguration().getProperty( MavenTwoBuildExecutor.CONFIGURATION_GOALS ) );
return mp;
}
@@ -586,7 +586,7 @@
Properties configuration = new Properties();
- configuration.setProperty( MavenShellBuilder.CONFIGURATION_GOALS, project.getGoals() );
+ configuration.setProperty( MavenTwoBuildExecutor.CONFIGURATION_GOALS, project.getGoals() );
updateProjectConfiguration( project.getId(), configuration );
}
@@ -596,15 +596,15 @@
{
Properties configuration = new Properties();
- configuration.setProperty( ShellBuilder.CONFIGURATION_EXECUTABLE, project.getExecutable() );
+ configuration.setProperty( ShellBuildExecutor.CONFIGURATION_EXECUTABLE, project.getExecutable() );
if ( project.getArguments() != null )
{
- configuration.setProperty( ShellBuilder.CONFIGURATION_ARGUMENTS, project.getArguments() );
+ configuration.setProperty( ShellBuildExecutor.CONFIGURATION_ARGUMENTS, project.getArguments() );
}
addProjectFromScm( project.getScmUrl(),
- ShellBuilder.ID,
+ ShellBuildExecutor.ID,
project.getName(),
project.getNagEmailAddress(),
project.getVersion(),
@@ -620,9 +620,9 @@
copyProject( p, sp );
- sp.setExecutable( p.getConfiguration().getProperty( ShellBuilder.CONFIGURATION_EXECUTABLE ) );
+ sp.setExecutable( p.getConfiguration().getProperty( ShellBuildExecutor.CONFIGURATION_EXECUTABLE ) );
- sp.setArguments( p.getConfiguration().getProperty( ShellBuilder.CONFIGURATION_ARGUMENTS ) );
+ sp.setArguments( p.getConfiguration().getProperty( ShellBuildExecutor.CONFIGURATION_ARGUMENTS ) );
return sp;
}
@@ -634,11 +634,11 @@
Properties configuration = new Properties();
- configuration.setProperty( ShellBuilder.CONFIGURATION_EXECUTABLE, project.getExecutable() );
+ configuration.setProperty( ShellBuildExecutor.CONFIGURATION_EXECUTABLE, project.getExecutable() );
if ( project.getArguments() != null )
{
- configuration.setProperty( ShellBuilder.CONFIGURATION_ARGUMENTS, project.getArguments() );
+ configuration.setProperty( ShellBuildExecutor.CONFIGURATION_ARGUMENTS, project.getArguments() );
}
updateProjectConfiguration( project.getId(), configuration );
@@ -800,7 +800,7 @@
// Make a new descriptor
// ----------------------------------------------------------------------
- ContinuumBuilder builder = builderManager.getBuilder( project.getExecutorId() );
+ ContinuumBuildExecutor builder = buildExecutorManager.getBuilder( project.getExecutorId() );
builder.updateProjectFromCheckOut( new File( project.getWorkingDirectory() ), project );
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=169665&r1=169664&r2=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Wed May 11 11:07:47 2005
@@ -16,13 +16,12 @@
* limitations under the License.
*/
-import java.io.File;
import java.util.Collection;
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.builder.ContinuumBuilder;
-import org.apache.maven.continuum.builder.manager.BuilderManager;
+import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
+import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
import org.apache.maven.continuum.project.ContinuumBuild;
import org.apache.maven.continuum.project.ContinuumBuildResult;
@@ -45,7 +44,7 @@
implements BuildController
{
/** @requirement */
- private BuilderManager builderManager;
+ private BuildExecutorManager buildExecutorManager;
/** @requirement */
private ContinuumStore store;
@@ -67,7 +66,7 @@
{
ContinuumProject project;
- ContinuumBuilder builder;
+ ContinuumBuildExecutor builder;
boolean forced;
@@ -112,7 +111,7 @@
try
{
- context.builder = builderManager.getBuilder( context.project.getExecutorId() );
+ context.builder = buildExecutorManager.getBuilder( context.project.getExecutorId() );
}
catch ( ContinuumException e )
{
@@ -172,8 +171,6 @@
{
getLogger().error( "Internal error while building the project.", ex );
}
-
- return;
}
finally
{
@@ -221,16 +218,11 @@
// before updating the project itself. This will make it possible to migrate
// a project from one SCM to another.
- ContinuumBuilder builder = context.builder;
-
ContinuumProject project = context.project;
- File workingDirectory = new File( project.getWorkingDirectory() );
-
try
{
continuum.updateProjectFromScm( project.getId() );
-// builder.updateProjectFromCheckOut( workingDirectory, project );
}
catch ( ContinuumException e )
{
@@ -240,16 +232,6 @@
return false;
}
-//
-// String projectId = project.getId();
-//
-// store.updateProject( projectId,
-// project.getName(),
-// project.getScmUrl(),
-// project.getNagEmailAddress(),
-// project.getVersion() );
-//
-// store.updateProjectConfiguration( projectId, project.getConfiguration() );
return true;
}
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java (from r169508, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/AbstractContinuumBuilder.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/AbstractContinuumBuilder.java&r1=169508&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/AbstractContinuumBuilder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder;
+package org.apache.maven.continuum.execution;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -32,9 +32,9 @@
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id: AbstractContinuumBuilder.java,v 1.1.1.1 2005/03/29 20:42:00 trygvis Exp $
*/
-public abstract class AbstractContinuumBuilder
+public abstract class AbstractBuildExecutor
extends AbstractLogEnabled
- implements ContinuumBuilder
+ implements ContinuumBuildExecutor
{
protected String getConfigurationString( Properties configuration, String property )
throws ContinuumException
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java (from r169508, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/ContinuumBuilder.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/ContinuumBuilder.java&r1=169508&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/ContinuumBuilder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ContinuumBuildExecutor.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder;
+package org.apache.maven.continuum.execution;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -26,9 +26,9 @@
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id: ContinuumBuilder.java,v 1.1.1.1 2005/03/29 20:42:00 trygvis Exp $
*/
-public interface ContinuumBuilder
+public interface ContinuumBuildExecutor
{
- String ROLE = ContinuumBuilder.class.getName();
+ String ROLE = ContinuumBuildExecutor.class.getName();
ContinuumBuildResult build( ContinuumProject project )
throws ContinuumException;
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java (from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/ant/AntBuilder.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/ant/AntBuilder.java&r1=169505&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/ant/AntBuilder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.ant;
+package org.apache.maven.continuum.execution.ant;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -20,10 +20,10 @@
import java.util.Properties;
import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.builder.AbstractContinuumBuilder;
-import org.apache.maven.continuum.builder.ContinuumBuilder;
-import org.apache.maven.continuum.builder.shell.ExecutionResult;
-import org.apache.maven.continuum.builder.shell.ShellCommandHelper;
+import org.apache.maven.continuum.execution.AbstractBuildExecutor;
+import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
+import org.apache.maven.continuum.execution.shell.ShellCommandHelper;
+import org.apache.maven.continuum.execution.shell.ExecutionResult;
import org.apache.maven.continuum.project.ContinuumBuildResult;
import org.apache.maven.continuum.project.ContinuumProject;
@@ -31,9 +31,9 @@
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id: AntBuilder.java,v 1.3 2005/04/07 23:27:39 trygvis Exp $
*/
-public class AntBuilder
- extends AbstractContinuumBuilder
- implements ContinuumBuilder
+public class AntBuildExecutor
+ extends AbstractBuildExecutor
+ implements ContinuumBuildExecutor
{
public static final String CONFIGURATION_EXECUTABLE = "executable";
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorManager.java (from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/manager/BuilderManager.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorManager.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorManager.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/manager/BuilderManager.java&r1=169505&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/manager/BuilderManager.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorManager.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.manager;
+package org.apache.maven.continuum.execution.manager;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -17,17 +17,17 @@
*/
import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.builder.ContinuumBuilder;
+import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id: BuilderManager.java,v 1.1.1.1 2005/03/29 20:42:00 trygvis Exp $
*/
-public interface BuilderManager
+public interface BuildExecutorManager
{
- String ROLE = BuilderManager.class.getName();
+ String ROLE = BuildExecutorManager.class.getName();
- ContinuumBuilder getBuilder( String builderType )
+ ContinuumBuildExecutor getBuilder( String builderType )
throws ContinuumException;
boolean hasBuilder( String builderType );
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorNotFoundException.java (from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/manager/BuilderNotFoundException.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorNotFoundException.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorNotFoundException.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/manager/BuilderNotFoundException.java&r1=169505&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/manager/BuilderNotFoundException.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorNotFoundException.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.manager;
+package org.apache.maven.continuum.execution.manager;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -20,10 +20,10 @@
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id: BuilderNotFoundException.java,v 1.1.1.1 2005/03/29 20:42:00 trygvis Exp $
*/
-public class BuilderNotFoundException
+public class BuildExecutorNotFoundException
extends Exception
{
- public BuilderNotFoundException( String message )
+ public BuildExecutorNotFoundException( String message )
{
super( message );
}
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java (from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/manager/DefaultBuilderManager.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/manager/DefaultBuilderManager.java&r1=169505&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/manager/DefaultBuilderManager.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.manager;
+package org.apache.maven.continuum.execution.manager;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -21,7 +21,7 @@
import java.util.Map;
import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.builder.ContinuumBuilder;
+import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
@@ -30,11 +30,11 @@
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id: DefaultBuilderManager.java,v 1.1.1.1 2005/03/29 20:42:00 trygvis Exp $
*/
-public class DefaultBuilderManager
+public class DefaultBuildExecutorManager
extends AbstractLogEnabled
- implements BuilderManager, Initializable
+ implements BuildExecutorManager, Initializable
{
- private Map builders;
+ private Map executors;
// ----------------------------------------------------------------------
// Component Lifecycle
@@ -43,12 +43,12 @@
public void initialize()
throws Exception
{
- if ( builders == null )
+ if ( executors == null )
{
- builders = new HashMap();
+ executors = new HashMap();
}
- if ( builders.size() == 0 )
+ if ( executors.size() == 0 )
{
getLogger().warn( "No builders defined." );
}
@@ -56,7 +56,7 @@
{
getLogger().info( "Builders:" );
- for ( Iterator it = builders.keySet().iterator(); it.hasNext(); )
+ for ( Iterator it = executors.keySet().iterator(); it.hasNext(); )
{
getLogger().info( " " + it.next().toString() );
}
@@ -67,10 +67,10 @@
// BuilderManager Implementation
// ----------------------------------------------------------------------
- public ContinuumBuilder getBuilder( String builderType )
+ public ContinuumBuildExecutor getBuilder( String builderType )
throws ContinuumException
{
- ContinuumBuilder builder = (ContinuumBuilder) builders.get( builderType );
+ ContinuumBuildExecutor builder = (ContinuumBuildExecutor) executors.get( builderType );
if ( builder == null )
{
@@ -82,6 +82,6 @@
public boolean hasBuilder( String builderType )
{
- return builders.containsKey( builderType );
+ return executors.containsKey( builderType );
}
}
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java (from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/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?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m1/DefaultMavenOneMetadataHelper.java&r1=169505&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m1/DefaultMavenOneMetadataHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.maven.m1;
+package org.apache.maven.continuum.execution.maven.m1;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -131,9 +131,9 @@
// Goals
Properties configuration = new Properties();
- if ( !configuration.containsKey( Maven1Builder.CONFIGURATION_GOALS ) )
+ if ( !configuration.containsKey( MavenOneBuildExecutor.CONFIGURATION_GOALS ) )
{
- configuration.setProperty( Maven1Builder.CONFIGURATION_GOALS, "clean:clean, jar:install" );
+ configuration.setProperty( MavenOneBuildExecutor.CONFIGURATION_GOALS, "clean:clean, jar:install" );
}
// ----------------------------------------------------------------------
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java (from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m1/Maven1Builder.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m1/Maven1Builder.java&r1=169505&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m1/Maven1Builder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.maven.m1;
+package org.apache.maven.continuum.execution.maven.m1;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -20,10 +20,10 @@
import java.util.Properties;
import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.builder.AbstractContinuumBuilder;
-import org.apache.maven.continuum.builder.ContinuumBuilder;
-import org.apache.maven.continuum.builder.shell.ExecutionResult;
-import org.apache.maven.continuum.builder.shell.ShellCommandHelper;
+import org.apache.maven.continuum.execution.AbstractBuildExecutor;
+import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
+import org.apache.maven.continuum.execution.shell.ShellCommandHelper;
+import org.apache.maven.continuum.execution.shell.ExecutionResult;
import org.apache.maven.continuum.project.ContinuumBuildResult;
import org.apache.maven.continuum.project.ContinuumProject;
@@ -31,9 +31,9 @@
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id: Maven1Builder.java,v 1.2 2005/04/03 21:27:17 trygvis Exp $
*/
-public class Maven1Builder
- extends AbstractContinuumBuilder
- implements ContinuumBuilder
+public class MavenOneBuildExecutor
+ extends AbstractBuildExecutor
+ implements ContinuumBuildExecutor
{
public final static String CONFIGURATION_GOALS = "goals";
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java (from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m1/MavenOneMetadataHelper.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m1/MavenOneMetadataHelper.java&r1=169505&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m1/MavenOneMetadataHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.maven.m1;
+package org.apache.maven.continuum.execution.maven.m1;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/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?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m2/DefaultMavenBuilderHelper.java&r1=169505&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.maven.m2;
+package org.apache.maven.continuum.execution.maven.m2;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -113,9 +113,9 @@
Properties configuration = project.getConfiguration();
- if ( !configuration.containsKey( MavenShellBuilder.CONFIGURATION_GOALS ) )
+ if ( !configuration.containsKey( MavenTwoBuildExecutor.CONFIGURATION_GOALS ) )
{
- configuration.setProperty( MavenShellBuilder.CONFIGURATION_GOALS, "clean:clean, install" );
+ configuration.setProperty( MavenTwoBuildExecutor.CONFIGURATION_GOALS, "clean:clean, install" );
}
}
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java (from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m2/MavenBuilderHelper.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m2/MavenBuilderHelper.java&r1=169505&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m2/MavenBuilderHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.maven.m2;
+package org.apache.maven.continuum.execution.maven.m2;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java (from r169505, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m2/MavenShellBuilder.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m2/MavenShellBuilder.java&r1=169505&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/maven/m2/MavenShellBuilder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.maven.m2;
+package org.apache.maven.continuum.execution.maven.m2;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -19,10 +19,10 @@
import java.io.File;
import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.builder.AbstractContinuumBuilder;
-import org.apache.maven.continuum.builder.ContinuumBuilder;
-import org.apache.maven.continuum.builder.shell.ExecutionResult;
-import org.apache.maven.continuum.builder.shell.ShellCommandHelper;
+import org.apache.maven.continuum.execution.AbstractBuildExecutor;
+import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
+import org.apache.maven.continuum.execution.shell.ShellCommandHelper;
+import org.apache.maven.continuum.execution.shell.ExecutionResult;
import org.apache.maven.continuum.project.ContinuumBuildResult;
import org.apache.maven.continuum.project.ContinuumProject;
@@ -30,9 +30,9 @@
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id: MavenShellBuilder.java,v 1.2 2005/04/07 23:27:39 trygvis Exp $
*/
-public class MavenShellBuilder
- extends AbstractContinuumBuilder
- implements ContinuumBuilder
+public class MavenTwoBuildExecutor
+ extends AbstractBuildExecutor
+ implements ContinuumBuildExecutor
{
public final static String CONFIGURATION_GOALS = "goals";
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/DefaultShellCommandHelper.java (from r169508, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/DefaultShellCommandHelper.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/DefaultShellCommandHelper.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/DefaultShellCommandHelper.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/DefaultShellCommandHelper.java&r1=169508&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/DefaultShellCommandHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/DefaultShellCommandHelper.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.shell;
+package org.apache.maven.continuum.execution.shell;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ExecutionResult.java (from r169508, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/ExecutionResult.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ExecutionResult.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ExecutionResult.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/ExecutionResult.java&r1=169508&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/ExecutionResult.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ExecutionResult.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.shell;
+package org.apache.maven.continuum.execution.shell;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java (from r169508, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/ShellBuilder.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/ShellBuilder.java&r1=169508&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/ShellBuilder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.shell;
+package org.apache.maven.continuum.execution.shell;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -19,7 +19,8 @@
import java.io.File;
import org.apache.maven.continuum.ContinuumException;
-import org.apache.maven.continuum.builder.AbstractContinuumBuilder;
+import org.apache.maven.continuum.execution.AbstractBuildExecutor;
+import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.apache.maven.continuum.project.ContinuumBuildResult;
import org.apache.maven.continuum.project.ContinuumProject;
@@ -29,8 +30,9 @@
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id: ShellBuilder.java,v 1.2 2005/04/07 23:27:40 trygvis Exp $
*/
-public class ShellBuilder
- extends AbstractContinuumBuilder
+public class ShellBuildExecutor
+ extends AbstractBuildExecutor
+ implements ContinuumBuildExecutor
{
public static final String CONFIGURATION_EXECUTABLE = "executable";
@@ -77,8 +79,8 @@
String[] arguments = getArguments( project );
- if ( !executable.startsWith( "/" ) &&
- !executable.startsWith( "\\" ) &&
+ if ( executable.charAt( 0 ) != '/' &&
+ executable.charAt( 0 ) != '\\' &&
prependWorkingDirectoryIfMissing() )
{
executable = workingDirectory + File.separator + executable;
Copied: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellCommandHelper.java (from r169508, maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/ShellCommandHelper.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellCommandHelper.java?p2=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellCommandHelper.java&p1=maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/ShellCommandHelper.java&r1=169508&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/builder/shell/ShellCommandHelper.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellCommandHelper.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.shell;
+package org.apache.maven.continuum.execution.shell;
/*
* Copyright 2004-2005 The Apache Software Foundation.
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java?rev=169665&r1=169664&r2=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java Wed May 11 11:07:47 2005
@@ -19,13 +19,13 @@
import java.io.File;
import java.net.URL;
-import org.apache.maven.continuum.builder.AbstractContinuumBuilder;
-import org.apache.maven.continuum.builder.maven.m1.Maven1Builder;
-import org.apache.maven.continuum.builder.maven.m1.MavenOneMetadataHelper;
import org.apache.maven.continuum.project.MavenOneProject;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilderException;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
+import org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelper;
+import org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor;
+import org.apache.maven.continuum.execution.AbstractBuildExecutor;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -53,13 +53,13 @@
try
{
- File pomFile = AbstractContinuumBuilder.createMetadataFile( url );
+ File pomFile = AbstractBuildExecutor.createMetadataFile( url );
MavenOneProject project = new MavenOneProject();
metadataHelper.mapMetadata( pomFile, project );
- project.setExecutorId( Maven1Builder.ID );
+ project.setExecutorId( MavenOneBuildExecutor.ID );
result.addProject( project );
}
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=169665&r1=169664&r2=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Wed May 11 11:07:47 2005
@@ -19,13 +19,13 @@
import java.io.File;
import java.net.URL;
-import org.apache.maven.continuum.builder.AbstractContinuumBuilder;
-import org.apache.maven.continuum.builder.maven.m2.MavenBuilderHelper;
-import org.apache.maven.continuum.builder.maven.m2.MavenShellBuilder;
-import org.apache.maven.continuum.project.MavenTwoProject;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilderException;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
+import org.apache.maven.continuum.project.MavenTwoProject;
+import org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper;
+import org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor;
+import org.apache.maven.continuum.execution.AbstractBuildExecutor;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -59,7 +59,7 @@
try
{
- File file = AbstractContinuumBuilder.createMetadataFile( url );
+ File file = AbstractBuildExecutor.createMetadataFile( url );
builderHelper.mapMetadataToProject( file, project );
}
@@ -68,7 +68,7 @@
throw new ContinuumProjectBuilderException( "Cannot create continuum project.", e );
}
- project.setExecutorId( MavenShellBuilder.ID );
+ project.setExecutorId( MavenTwoBuildExecutor.ID );
result.addProject( project );
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=169665&r1=169664&r2=169665&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 Wed May 11 11:07:47 2005
@@ -5,7 +5,7 @@
<implementation>org.apache.maven.continuum.DefaultContinuum</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.continuum.builder.manager.BuilderManager</role>
+ <role>org.apache.maven.continuum.execution.manager.BuildExecutorManager</role>
</requirement>
<requirement>
<role>org.apache.maven.continuum.project.builder.manager.ContinuumProjectBuilderManager</role>
@@ -34,12 +34,12 @@
</component>
<component>
- <role>org.apache.maven.continuum.builder.manager.BuilderManager</role>
- <implementation>org.apache.maven.continuum.builder.manager.DefaultBuilderManager</implementation>
+ <role>org.apache.maven.continuum.execution.manager.BuildExecutorManager</role>
+ <implementation>org.apache.maven.continuum.execution.manager.DefaultBuildExecutorManager</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.continuum.builder.ContinuumBuilder</role>
- <field-name>builders</field-name>
+ <role>org.apache.maven.continuum.execution.ContinuumBuildExecutor</role>
+ <field-name>executors</field-name>
</requirement>
</requirements>
</component>
@@ -60,7 +60,7 @@
<implementation>org.apache.maven.continuum.buildcontroller.DefaultBuildController</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.continuum.builder.manager.BuilderManager</role>
+ <role>org.apache.maven.continuum.execution.manager.BuildExecutorManager</role>
</requirement>
<requirement>
<role>org.apache.maven.continuum.store.ContinuumStore</role>
@@ -171,30 +171,30 @@
<!--
|
- | Builders
+ | Executorss
|
|-->
<component>
- <role>org.apache.maven.continuum.builder.ContinuumBuilder</role>
+ <role>org.apache.maven.continuum.execution.ContinuumBuildExecutor</role>
<role-hint>maven2</role-hint>
- <implementation>org.apache.maven.continuum.builder.maven.m2.MavenShellBuilder</implementation>
+ <implementation>org.apache.maven.continuum.execution.maven.m2.MavenTwoBuildExecutor</implementation>
<configuration>
<executable>m2</executable>
<arguments>-N</arguments>
</configuration>
<requirements>
<requirement>
- <role>org.apache.maven.continuum.builder.shell.ShellCommandHelper</role>
+ <role>org.apache.maven.continuum.execution.shell.ShellCommandHelper</role>
</requirement>
<requirement>
- <role>org.apache.maven.continuum.builder.maven.m2.MavenBuilderHelper</role>
+ <role>org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper</role>
</requirement>
</requirements>
</component>
<component>
- <role>org.apache.maven.continuum.builder.maven.m2.MavenBuilderHelper</role>
- <implementation>org.apache.maven.continuum.builder.maven.m2.DefaultMavenBuilderHelper</implementation>
+ <role>org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper</role>
+ <implementation>org.apache.maven.continuum.execution.maven.m2.DefaultMavenBuilderHelper</implementation>
<requirements>
<requirement>
<role>org.apache.maven.project.MavenProjectBuilder</role>
@@ -224,50 +224,50 @@
</component>
<component>
- <role>org.apache.maven.continuum.builder.ContinuumBuilder</role>
+ <role>org.apache.maven.continuum.execution.ContinuumBuildExecutor</role>
<role-hint>maven-1</role-hint>
- <implementation>org.apache.maven.continuum.builder.maven.m1.Maven1Builder</implementation>
+ <implementation>org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor</implementation>
<configuration>
<maven-command>maven</maven-command>
</configuration>
<requirements>
<requirement>
- <role>org.apache.maven.continuum.builder.shell.ShellCommandHelper</role>
+ <role>org.apache.maven.continuum.execution.shell.ShellCommandHelper</role>
</requirement>
<requirement>
- <role>org.apache.maven.continuum.builder.maven.m1.MavenOneMetadataHelper</role>
+ <role>org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelper</role>
</requirement>
</requirements>
</component>
<component>
- <role>org.apache.maven.continuum.builder.maven.m1.MavenOneMetadataHelper</role>
- <implementation>org.apache.maven.continuum.builder.maven.m1.DefaultMavenOneMetadataHelper</implementation>
+ <role>org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelper</role>
+ <implementation>org.apache.maven.continuum.execution.maven.m1.DefaultMavenOneMetadataHelper</implementation>
</component>
<component>
- <role>org.apache.maven.continuum.builder.shell.ShellCommandHelper</role>
- <implementation>org.apache.maven.continuum.builder.shell.DefaultShellCommandHelper</implementation>
+ <role>org.apache.maven.continuum.execution.shell.ShellCommandHelper</role>
+ <implementation>org.apache.maven.continuum.execution.shell.DefaultShellCommandHelper</implementation>
</component>
<component>
- <role>org.apache.maven.continuum.builder.ContinuumBuilder</role>
+ <role>org.apache.maven.continuum.execution.ContinuumBuildExecutor</role>
<role-hint>ant</role-hint>
- <implementation>org.apache.maven.continuum.builder.ant.AntBuilder</implementation>
+ <implementation>org.apache.maven.continuum.execution.ant.AntBuildExecutor</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.continuum.builder.shell.ShellCommandHelper</role>
+ <role>org.apache.maven.continuum.execution.shell.ShellCommandHelper</role>
</requirement>
</requirements>
</component>
<component>
- <role>org.apache.maven.continuum.builder.ContinuumBuilder</role>
+ <role>org.apache.maven.continuum.execution.ContinuumBuildExecutor</role>
<role-hint>shell</role-hint>
- <implementation>org.apache.maven.continuum.builder.shell.ShellBuilder</implementation>
+ <implementation>org.apache.maven.continuum.execution.shell.ShellBuildExecutor</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.continuum.builder.shell.ShellCommandHelper</role>
+ <role>org.apache.maven.continuum.execution.shell.ShellCommandHelper</role>
</requirement>
</requirements>
</component>
@@ -284,7 +284,7 @@
<implementation>org.apache.maven.continuum.project.builder.maven.MavenOneContinuumProjectBuilder</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.continuum.builder.maven.m1.MavenOneMetadataHelper</role>
+ <role>org.apache.maven.continuum.execution.maven.m1.MavenOneMetadataHelper</role>
</requirement>
</requirements>
</component>
@@ -295,7 +295,7 @@
<implementation>org.apache.maven.continuum.project.builder.maven.MavenTwoContinuumProjectBuilder</implementation>
<requirements>
<requirement>
- <role>org.apache.maven.continuum.builder.maven.m2.MavenBuilderHelper</role>
+ <role>org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper</role>
</requirement>
</requirements>
</component>
Copied: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManagerTest.java (from r169492, maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/builder/manager/DefaultBuilderManagerTest.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManagerTest.java?p2=maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManagerTest.java&p1=maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/builder/manager/DefaultBuilderManagerTest.java&r1=169492&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/builder/manager/DefaultBuilderManagerTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManagerTest.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.manager;
+package org.apache.maven.continuum.execution.manager;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -16,18 +16,20 @@
* limitations under the License.
*/
+import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
+
import org.codehaus.plexus.PlexusTestCase;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id:$
*/
-public class DefaultBuilderManagerTest
+public class DefaultBuildExecutorManagerTest
extends PlexusTestCase
{
public void testBasic()
throws Exception
{
- lookup( BuilderManager.ROLE );
+ lookup( BuildExecutorManager.ROLE );
}
}
Copied: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java (from r169492, maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/builder/maven/m1/Maven1BuilderTest.java)
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java?p2=maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java&p1=maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/builder/maven/m1/Maven1BuilderTest.java&r1=169492&r2=169665&rev=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/builder/maven/m1/Maven1BuilderTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutorTest.java Wed May 11 11:07:47 2005
@@ -1,4 +1,4 @@
-package org.apache.maven.continuum.builder.maven.m1;
+package org.apache.maven.continuum.execution.maven.m1;
/*
* Copyright 2004-2005 The Apache Software Foundation.
@@ -19,7 +19,7 @@
import java.io.File;
import java.util.Properties;
-import org.apache.maven.continuum.builder.manager.BuilderManager;
+import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
import org.apache.maven.continuum.project.ContinuumProject;
import org.codehaus.plexus.PlexusTestCase;
@@ -29,15 +29,15 @@
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id: Maven1BuilderTest.java,v 1.3 2005/04/06 13:57:20 trygvis Exp $
*/
-public class Maven1BuilderTest
+public class MavenOneBuildExecutorTest
extends PlexusTestCase
{
public void testUpdatingAProjectFromScmWithAExistingProjectAndAEmptyMaven1Pom()
throws Exception
{
- BuilderManager builderManager = (BuilderManager) lookup( BuilderManager.ROLE );
+ BuildExecutorManager builderManager = (BuildExecutorManager) lookup( BuildExecutorManager.ROLE );
- Maven1Builder builder = (Maven1Builder) builderManager.getBuilder( Maven1Builder.ID );
+ MavenOneBuildExecutor executor = (MavenOneBuildExecutor) builderManager.getBuilder( MavenOneBuildExecutor.ID );
// ----------------------------------------------------------------------
// Make a checkout
@@ -70,13 +70,13 @@
Properties expectedConfiguration = new Properties();
- expectedConfiguration.put( Maven1Builder.CONFIGURATION_GOALS, "clean:clean, jar:install" );
+ expectedConfiguration.put( MavenOneBuildExecutor.CONFIGURATION_GOALS, "clean:clean, jar:install" );
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
- builder.updateProjectFromCheckOut( checkOut, project );
+ executor.updateProjectFromCheckOut( checkOut, project );
// ----------------------------------------------------------------------
//
@@ -98,6 +98,6 @@
assertEquals( 1, configuration.size() );
- assertEquals( "clean:clean, jar:install", configuration.getProperty( Maven1Builder.CONFIGURATION_GOALS ) );
+ assertEquals( "clean:clean, jar:install", configuration.getProperty( MavenOneBuildExecutor.CONFIGURATION_GOALS ) );
}
}
Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java?rev=169665&r1=169664&r2=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java (original)
+++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.java Wed May 11 11:07:47 2005
@@ -22,12 +22,12 @@
import java.util.Map;
import java.util.Set;
-import org.apache.maven.continuum.builder.maven.m2.MavenShellBuilder;
-import org.apache.maven.continuum.builder.shell.ShellBuildResult;
import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
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.execution.maven.m2.MavenTwoBuildExecutor;
+import org.apache.maven.continuum.execution.shell.ShellBuildResult;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.mailsender.MailMessage;
@@ -69,7 +69,7 @@
project.setName( "Test Project" );
- project.setExecutorId( MavenShellBuilder.ID );
+ project.setExecutorId( MavenTwoBuildExecutor.ID );
context.put( ContinuumNotificationDispatcher.CONTEXT_PROJECT, project );
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=169665&r1=169664&r2=169665&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 Wed May 11 11:07:47 2005
@@ -18,10 +18,10 @@
import java.util.Properties;
-import org.apache.maven.continuum.builder.maven.m1.Maven1Builder;
import org.apache.maven.continuum.project.ContinuumProject;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
+import org.apache.maven.continuum.execution.maven.m1.MavenOneBuildExecutor;
import org.codehaus.plexus.PlexusTestCase;
@@ -61,6 +61,6 @@
assertEquals( 1, configuration.size() );
- assertEquals( "clean:clean, jar:install", configuration.getProperty( Maven1Builder.CONFIGURATION_GOALS ) );
+ assertEquals( "clean:clean, jar:install", configuration.getProperty( MavenOneBuildExecutor.CONFIGURATION_GOALS ) );
}
}
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=169665&r1=169664&r2=169665&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 Wed May 11 11:07:47 2005
@@ -24,7 +24,6 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.continuum.builder.shell.ShellBuildResult;
import org.apache.maven.continuum.project.ContinuumBuild;
import org.apache.maven.continuum.project.ContinuumBuildResult;
import org.apache.maven.continuum.project.ContinuumJPoxStore;
@@ -33,6 +32,7 @@
import org.apache.maven.continuum.scm.CheckOutScmResult;
import org.apache.maven.continuum.scm.ScmFile;
import org.apache.maven.continuum.scm.UpdateScmResult;
+import org.apache.maven.continuum.execution.shell.ShellBuildResult;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.jdo.JdoFactory;
Modified: maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo?rev=169665&r1=169664&r2=169665&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo (original)
+++ maven/continuum/trunk/continuum-model/src/main/resources/continuum.mdo Wed May 11 11:07:47 2005
@@ -269,7 +269,7 @@
<class>
<name>ShellBuildResult</name>
- <packageName>org.apache.maven.continuum.builder.shell</packageName>
+ <packageName>org.apache.maven.continuum.execution.shell</packageName>
<superClass>ContinuumBuildResult</superClass>
<version>1.0.0</version>
<fields>
@@ -293,7 +293,7 @@
<class>
<name>Maven1BuildResult</name>
- <packageName>org.apache.maven.continuum.builder.maven.m1</packageName>
+ <packageName>org.apache.maven.continuum.execution.maven.m1</packageName>
<superClass>ContinuumBuildResult</superClass>
<version>1.0.0</version>
<fields>
@@ -317,7 +317,7 @@
<class>
<name>MavenTwoBuildResult</name>
- <packageName>org.apache.maven.continuum.builder.maven.m2</packageName>
+ <packageName>org.apache.maven.continuum.execution.maven.m2</packageName>
<superClass>ContinuumBuildResult</superClass>
<version>1.0.0</version>
<fields>
@@ -341,7 +341,7 @@
<class>
<name>AntBuildResult</name>
- <packageName>org.apache.maven.continuum.builder.ant</packageName>
+ <packageName>org.apache.maven.continuum.execution.ant</packageName>
<superClass>ContinuumBuildResult</superClass>
<version>1.0.0</version>
<fields>
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=169665&r1=169664&r2=169665&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 Wed May 11 11:07:47 2005
@@ -26,8 +26,8 @@
import java.util.Vector;
import org.apache.maven.continuum.Continuum;
-import org.apache.maven.continuum.builder.ant.AntBuilder;
-import org.apache.maven.continuum.builder.shell.ShellBuilder;
+import org.apache.maven.continuum.execution.ant.AntBuildExecutor;
+import org.apache.maven.continuum.execution.shell.ShellBuildExecutor;
import org.apache.maven.continuum.project.ContinuumBuild;
import org.apache.maven.continuum.project.ContinuumBuildResult;
import org.apache.maven.continuum.project.ContinuumProject;
@@ -99,7 +99,7 @@
String version,
Hashtable configuration )
{
- return addProjectFromScm( scmUrl, AntBuilder.ID, projectName, nagEmailAddress, version, configuration );
+ return addProjectFromScm( scmUrl, AntBuildExecutor.ID, projectName, nagEmailAddress, version, configuration );
}
// ----------------------------------------------------------------------
@@ -112,7 +112,7 @@
String version,
Hashtable configuration )
{
- return addProjectFromScm( scmUrl, ShellBuilder.ID, projectName, nagEmailAddress, version, configuration );
+ return addProjectFromScm( scmUrl, ShellBuildExecutor.ID, projectName, nagEmailAddress, version, configuration );
}
// ----------------------------------------------------------------------