You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2009/01/11 10:52:35 UTC
svn commit: r733441 [3/8] - in
/continuum/branches/continuum-distributed-builds: ./
continuum-api/src/main/java/org/apache/continuum/configuration/
continuum-api/src/main/java/org/apache/continuum/dao/
continuum-api/src/main/java/org/apache/continuum/t...
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Sun Jan 11 01:52:08 2009
@@ -45,8 +45,9 @@
import org.apache.maven.scm.repository.ScmRepositoryException;
import org.codehaus.plexus.action.ActionManager;
import org.codehaus.plexus.action.ActionNotFoundException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Iterator;
@@ -59,9 +60,10 @@
* @plexus.component role="org.apache.maven.continuum.buildcontroller.BuildController" role-hint="default"
*/
public class DefaultBuildController
- extends AbstractLogEnabled
implements BuildController
{
+ private Logger log = LoggerFactory.getLogger( DefaultBuildController.class );
+
/**
* @plexus.requirement
*/
@@ -120,17 +122,17 @@
public void build( int projectId, int buildDefinitionId, int trigger )
throws TaskExecutionException
{
- getLogger().info( "Initializing build" );
+ log.info( "Initializing build" );
BuildContext context = initializeBuildContext( projectId, buildDefinitionId, trigger );
// ignore this if AlwaysBuild ?
if ( !checkScmResult( context ) )
{
- getLogger().info( "Error updating from SCM, not building" );
+ log.info( "Error updating from SCM, not building" );
return;
}
- getLogger().info( "Starting build of " + context.getProject().getName() );
+ log.info( "Starting build of " + context.getProject().getName() );
startBuild( context );
try
@@ -153,7 +155,7 @@
updateBuildResult( context, ContinuumUtils.throwableToString( e ) );
//just log the error but don't stop the build from progressing in order not to suppress any build result messages there
- getLogger().error( "Error executing action update-project-from-working-directory '", e );
+ log.error( "Error executing action update-project-from-working-directory '", e );
}
performAction( "execute-builder", context );
@@ -390,7 +392,7 @@
try
{
- getLogger().info( "Performing action " + actionName );
+ log.info( "Performing action " + actionName );
actionManager.lookup( actionName ).execute( context.getActionContext() );
return;
}
@@ -429,7 +431,7 @@
}
catch ( TaskExecutionException e )
{
- getLogger().error( "Error updating build result after receiving the following exception: ", exception );
+ log.error( "Error updating build result after receiving the following exception: ", exception );
throw e;
}
@@ -442,17 +444,17 @@
BuildDefinition buildDefinition = context.getBuildDefinition();
if ( buildDefinition.isBuildFresh() )
{
- getLogger().info( "FreshBuild configured, building" );
+ log.info( "FreshBuild configured, building" );
return true;
}
if ( buildDefinition.isAlwaysBuild() )
{
- getLogger().info( "AlwaysBuild configured, building" );
+ log.info( "AlwaysBuild configured, building" );
return true;
}
if ( context.getOldBuildResult() == null )
{
- getLogger().info( "The project was never be built with the current build definition, building" );
+ log.info( "The project was never be built with the current build definition, building" );
return true;
}
@@ -462,13 +464,13 @@
if ( project.getOldState() == ContinuumProjectState.ERROR ||
context.getOldBuildResult().getState() == ContinuumProjectState.ERROR )
{
- getLogger().info( "Latest state was 'ERROR', building" );
+ log.info( "Latest state was 'ERROR', building" );
return true;
}
if ( context.getTrigger() == ContinuumProjectState.TRIGGER_FORCED )
{
- getLogger().info( "The project build is forced, building" );
+ log.info( "The project build is forced, building" );
return true;
}
@@ -488,12 +490,12 @@
{
if ( !context.getScmResult().getChanges().isEmpty() )
{
- getLogger().info(
+ log.info(
"The project was not built because all changes are unknown (maybe local modifications or ignored files not defined in your SCM tool." );
}
else
{
- getLogger().info(
+ log.info(
"The project was not built because no changes were detected in sources since the last build." );
}
}
@@ -501,7 +503,7 @@
// Check dependencies changes
if ( context.getModifiedDependencies() != null && !context.getModifiedDependencies().isEmpty() )
{
- getLogger().info( "Found dependencies changes, building" );
+ log.info( "Found dependencies changes, building" );
shouldBuild = true;
}
}
@@ -526,7 +528,7 @@
if ( shouldBuild )
{
- getLogger().info( "Changes found in the current project, building" );
+ log.info( "Changes found in the current project, building" );
}
else
{
@@ -542,7 +544,7 @@
{
throw new TaskExecutionException( "Error storing project", e );
}
- getLogger().info( "No changes in the current project, not building" );
+ log.info( "No changes in the current project, not building" );
}
@@ -628,19 +630,19 @@
context.getOldBuildResult().getEndTime() );
if ( buildResults != null && !buildResults.isEmpty() )
{
- getLogger().debug( "Dependency changed: " + dep.getGroupId() + ":" + dep.getArtifactId() + ":" +
+ log.debug( "Dependency changed: " + dep.getGroupId() + ":" + dep.getArtifactId() + ":" +
dep.getVersion() );
modifiedDependencies.add( dep );
}
else
{
- getLogger().debug( "Dependency not changed: " + dep.getGroupId() + ":" + dep.getArtifactId() +
+ log.debug( "Dependency not changed: " + dep.getGroupId() + ":" + dep.getArtifactId() +
":" + dep.getVersion() );
}
}
else
{
- getLogger().debug( "Skip non Continuum project: " + dep.getGroupId() + ":" + dep.getArtifactId() +
+ log.debug( "Skip non Continuum project: " + dep.getGroupId() + ":" + dep.getArtifactId() +
":" + dep.getVersion() );
}
}
@@ -650,7 +652,7 @@
}
catch ( ContinuumStoreException e )
{
- getLogger().warn( "Can't get the project dependencies", e );
+ log.warn( "Can't get the project dependencies", e );
}
}
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java Sun Jan 11 01:52:08 2009
@@ -33,9 +33,10 @@
import org.apache.maven.continuum.model.project.Schedule;
import org.apache.maven.continuum.store.ContinuumObjectNotFoundException;
import org.apache.maven.continuum.store.ContinuumStoreException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Iterator;
@@ -49,9 +50,10 @@
* @since 15 sept. 07
*/
public class DefaultBuildDefinitionService
- extends AbstractLogEnabled
implements BuildDefinitionService, Initializable
{
+ private Logger log = LoggerFactory.getLogger( DefaultBuildDefinitionService.class );
+
/**
* @plexus.configuration default-value=""
*/
@@ -272,7 +274,7 @@
{
return template;
}
- getLogger().info( "create default AntBuildDefinitionTemplate" );
+ log.info( "create default AntBuildDefinitionTemplate" );
template = new BuildDefinitionTemplate();
template.setContinuumDefault( true );
template.setName( "Default Ant Template" );
@@ -307,10 +309,10 @@
getContinuumDefaultWithType( ContinuumBuildExecutorConstants.MAVEN_ONE_BUILD_EXECUTOR );
if ( template != null )
{
- getLogger().debug( "found default maven template " + template.getType() );
+ log.debug( "found default maven template " + template.getType() );
return template;
}
- getLogger().info( "create default MavenOneBuildDefinitionTemplate" );
+ log.info( "create default MavenOneBuildDefinitionTemplate" );
template = new BuildDefinitionTemplate();
template.setContinuumDefault( true );
template.setName( "Default Maven 1 Template" );
@@ -348,7 +350,7 @@
{
return template;
}
- getLogger().info( "create default MavenTwoBuildDefinitionTemplate" );
+ log.info( "create default MavenTwoBuildDefinitionTemplate" );
template = new BuildDefinitionTemplate();
template.setContinuumDefault( true );
template.setName( "Default Maven 2 Template" );
@@ -386,7 +388,7 @@
{
return template;
}
- getLogger().info( "create default ShellBuildDefinitionTemplate" );
+ log.info( "create default ShellBuildDefinitionTemplate" );
template = new BuildDefinitionTemplate();
template.setContinuumDefault( true );
template.setName( "Default Shell Template" );
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java
------------------------------------------------------------------------------
--- svn:eol-style (original)
+++ svn:eol-style Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-LF
+native
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java
('svn:executable' removed)
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
+Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java Sun Jan 11 01:52:08 2009
@@ -21,7 +21,6 @@
import org.apache.continuum.taskqueue.BuildProjectTask;
import org.apache.maven.continuum.project.ContinuumProjectState;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.taskqueue.TaskViabilityEvaluator;
import java.util.ArrayList;
@@ -36,7 +35,6 @@
* @version $Id$
*/
public class BuildProjectTaskViabilityEvaluator
- extends AbstractLogEnabled
implements TaskViabilityEvaluator
{
/**
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddAssignableRolesAction.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectGroupAction.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CleanWorkingDirectoryAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CleanWorkingDirectoryAction.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CleanWorkingDirectoryAction.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CleanWorkingDirectoryAction.java Sun Jan 11 01:52:08 2009
@@ -30,7 +30,7 @@
/**
* @author Jesse McConnell <jm...@apache.org>
- * @version $Id:$
+ * @version $Id$
* @plexus.component role="org.codehaus.plexus.action.Action"
* role-hint="clean-working-directory"
*/
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CleanWorkingDirectoryAction.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateBuildProjectTaskAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateBuildProjectTaskAction.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateBuildProjectTaskAction.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateBuildProjectTaskAction.java Sun Jan 11 01:52:08 2009
@@ -37,6 +37,7 @@
/**
* @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
+ * @version $Id$
* @plexus.component role="org.codehaus.plexus.action.Action" role-hint="create-build-project-task"
*/
public class CreateBuildProjectTaskAction
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateBuildProjectTaskAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateBuildProjectTaskAction.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java Sun Jan 11 01:52:08 2009
@@ -101,11 +101,18 @@
try
{
+ BuildDefinitionTemplate buildDefinitionTemplate = getBuildDefinitionTemplate( context );
+ if ( buildDefinitionTemplate == null )
+ {
+ buildDefinitionTemplate = projectBuilder.getDefaultBuildDefinitionTemplate();
+ }
if ( !curl.startsWith( "http" ) )
{
url = new URL( curl );
- result = projectBuilder.buildProjectsFromMetadata( url, null, null );
+ result = projectBuilder.buildProjectsFromMetadata( url, null, null, loadRecursiveProjects,
+ buildDefinitionTemplate );
+
}
else
{
@@ -141,11 +148,7 @@
if ( urlValidator.isValid( curl ) )
{
- BuildDefinitionTemplate buildDefinitionTemplate = getBuildDefinitionTemplate( context );
- if ( buildDefinitionTemplate == null )
- {
- buildDefinitionTemplate = projectBuilder.getDefaultBuildDefinitionTemplate();
- }
+
result = projectBuilder.buildProjectsFromMetadata( url, username, password, loadRecursiveProjects,
buildDefinitionTemplate );
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/DeployArtifactContinuumAction.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectAction.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectGroupAction.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectGroupAction.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java Sun Jan 11 01:52:08 2009
@@ -31,7 +31,6 @@
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.utils.WorkingDirectoryService;
import org.codehaus.plexus.commandline.ExecutableResolver;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.util.StringUtils;
@@ -51,11 +50,9 @@
* @version $Id$
*/
public abstract class AbstractBuildExecutor
- extends AbstractLogEnabled
implements ContinuumBuildExecutor, Initializable
{
-
- protected Logger logger = LoggerFactory.getLogger( getClass() );
+ protected Logger log = LoggerFactory.getLogger( getClass() );
private static final String SUDO_EXECUTABLE = "sudo";
@@ -157,7 +154,7 @@
{
if ( StringUtils.isEmpty( defaultExecutable ) )
{
- getLogger().warn( "The default executable for build executor '" + id + "' is not set. " +
+ log.warn( "The default executable for build executor '" + id + "' is not set. " +
"This will cause a problem unless the project has a executable configured." );
}
else
@@ -166,12 +163,12 @@
if ( resolvedExecutable == null )
{
- getLogger().warn(
+ log.warn(
"Could not find the executable '" + defaultExecutable + "' in the " + "path '" + path + "'." );
}
else
{
- getLogger().info( "Resolved the executable '" + defaultExecutable + "' to " + "'" +
+ log.info( "Resolved the executable '" + defaultExecutable + "' to " + "'" +
resolvedExecutable.getAbsolutePath() + "'." );
}
}
@@ -216,11 +213,11 @@
if ( e == null )
{
- getLogger().warn( "Could not find the executable '" + executable + "' in this path: " );
+ log.warn( "Could not find the executable '" + executable + "' in this path: " );
for ( String element : path )
{
- getLogger().warn( element );
+ log.warn( element );
}
actualExecutable = defaultExecutable;
@@ -283,7 +280,7 @@
arguments, output, project.getId(),
environments );
- getLogger().info( "Exit code: " + result.getExitCode() );
+ log.info( "Exit code: " + result.getExitCode() );
return new ContinuumBuildExecutionResult( output, result.getExitCode() );
}
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java Sun Jan 11 01:52:08 2009
@@ -21,8 +21,9 @@
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Iterator;
@@ -35,9 +36,10 @@
* role-hint"default"
*/
public class DefaultBuildExecutorManager
- extends AbstractLogEnabled
implements BuildExecutorManager, Initializable
{
+ private Logger log = LoggerFactory.getLogger( DefaultBuildExecutorManager.class );
+
/**
* @plexus.requirement role="org.apache.maven.continuum.execution.ContinuumBuildExecutor"
*/
@@ -56,15 +58,15 @@
if ( executors.size() == 0 )
{
- getLogger().warn( "No build executors defined." );
+ log.warn( "No build executors defined." );
}
else
{
- getLogger().info( "Build executors:" );
+ log.info( "Build executors:" );
for ( Iterator it = executors.keySet().iterator(); it.hasNext(); )
{
- getLogger().info( " " + it.next().toString() );
+ log.info( " " + it.next().toString() );
}
}
}
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java Sun Jan 11 01:52:08 2009
@@ -25,11 +25,12 @@
import org.apache.maven.continuum.model.project.ProjectNotifier;
import org.apache.maven.continuum.notification.AbstractContinuumNotifier;
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileNotFoundException;
@@ -46,9 +47,10 @@
* role-hint="default"
*/
public class DefaultMavenOneMetadataHelper
- extends AbstractLogEnabled
implements MavenOneMetadataHelper
{
+ private Logger log = LoggerFactory.getLogger( DefaultMavenOneMetadataHelper.class );
+
// ----------------------------------------------------------------------
// MavenOneMetadataHelper Implementation
// ----------------------------------------------------------------------
@@ -75,7 +77,7 @@
{
result.addError( ContinuumProjectBuildingResult.ERROR_XML_PARSE );
- getLogger().info( "Error while reading maven POM (" + e.getMessage() + ").", e );
+ log.info( "Error while reading maven POM (" + e.getMessage() + ").", e );
return;
}
@@ -83,7 +85,7 @@
{
result.addError( ContinuumProjectBuildingResult.ERROR_POM_NOT_FOUND );
- getLogger().info( "Error while reading maven POM (" + e.getMessage() + ").", e );
+ log.info( "Error while reading maven POM (" + e.getMessage() + ").", e );
return;
}
@@ -91,7 +93,7 @@
{
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
- getLogger().info( "Error while reading maven POM (" + e.getMessage() + ").", e );
+ log.info( "Error while reading maven POM (" + e.getMessage() + ").", e );
return;
}
@@ -108,7 +110,7 @@
{
result.addError( ContinuumProjectBuildingResult.ERROR_EXTEND );
- getLogger().info( "Cannot use a POM with an 'extend' element." );
+ log.info( "Cannot use a POM with an 'extend' element." );
return;
}
@@ -137,7 +139,7 @@
{
result.addError( ContinuumProjectBuildingResult.ERROR_MISSING_GROUPID );
- getLogger().info( "Missing 'groupId' element in the POM." );
+ log.info( "Missing 'groupId' element in the POM." );
// Do not throw an exception or return here, gather up as many results as possible first.
}
@@ -148,7 +150,7 @@
{
result.addError( ContinuumProjectBuildingResult.ERROR_MISSING_ARTIFACTID );
- getLogger().info( "Missing 'artifactId' element in the POM." );
+ log.info( "Missing 'artifactId' element in the POM." );
// Do not throw an exception or return here, gather up as many results as possible first.
}
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Sun Jan 11 01:52:08 2009
@@ -59,13 +59,14 @@
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
@@ -81,9 +82,10 @@
* @plexus.component role="org.apache.maven.continuum.execution.maven.m2.MavenBuilderHelper" role-hint="default"
*/
public class DefaultMavenBuilderHelper
- extends AbstractLogEnabled
implements MavenBuilderHelper, Contextualizable, Initializable
{
+ private Logger log = LoggerFactory.getLogger( DefaultMavenBuilderHelper.class );
+
/**
* @plexus.requirement
*/
@@ -373,7 +375,7 @@
Settings settings = getSettings();
- if ( getLogger().isDebugEnabled() )
+ if ( log.isDebugEnabled() )
{
writeSettings( settings );
}
@@ -382,7 +384,7 @@
project = projectBuilder.build( file, getLocalRepository(), profileManager, false );
- if ( getLogger().isDebugEnabled() )
+ if ( log.isDebugEnabled() )
{
writePom( project );
writeActiveProfileStatement( project );
@@ -434,7 +436,7 @@
file.delete();
- getLogger().error( msg );
+ log.error( msg );
return null;
}
@@ -447,7 +449,7 @@
file.delete();
- getLogger().error( msg );
+ log.error( msg );
return null;
}
@@ -463,7 +465,7 @@
{
result.addError( ContinuumProjectBuildingResult.ERROR_MISSING_SCM, getProjectName( project ) );
- getLogger().error( "Missing 'scm' element in the " + getProjectName( project ) + " POM." );
+ log.error( "Missing 'scm' element in the " + getProjectName( project ) + " POM." );
return null;
}
@@ -474,7 +476,7 @@
{
result.addError( ContinuumProjectBuildingResult.ERROR_MISSING_SCM_CONNECTION, getProjectName( project ) );
- getLogger().error(
+ log.error(
"Missing 'connection' element in the 'scm' element in the " + getProjectName( project ) + " POM." );
return null;
@@ -629,11 +631,11 @@
message.append( "\n************************************************************************************" );
message.append( "\n\n" );
- getLogger().debug( message.toString() );
+ log.debug( message.toString() );
}
catch ( IOException e )
{
- getLogger().warn( "Cannot serialize Settings to XML.", e );
+ log.warn( "Cannot serialize Settings to XML.", e );
}
}
@@ -659,11 +661,11 @@
message.append( "\n************************************************************************************" );
message.append( "\n\n" );
- getLogger().debug( message.toString() );
+ log.debug( message.toString() );
}
catch ( IOException e )
{
- getLogger().warn( "Cannot serialize POM to XML.", e );
+ log.warn( "Cannot serialize POM to XML.", e );
}
}
@@ -699,7 +701,7 @@
message.append( "\n************************************************************************************" );
message.append( "\n\n" );
- getLogger().debug( message.toString() );
+ log.debug( message.toString() );
}
/**
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java Sun Jan 11 01:52:08 2009
@@ -53,8 +53,6 @@
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
@@ -64,7 +62,6 @@
extends AbstractBuildExecutor
implements ContinuumBuildExecutor
{
-
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
@@ -351,7 +348,7 @@
}
catch ( ConfigurationException e )
{
- getLogger().info( "error on surefire backup directory creation skip backup " + e.getMessage(), e );
+ log.info( "error on surefire backup directory creation skip backup " + e.getMessage(), e );
}
backupTestFiles( getWorkingDirectory( project ), backupDirectory );
}
@@ -367,7 +364,7 @@
String[] testResultFiles = scanner.getIncludedFiles();
if ( testResultFiles.length > 0 )
{
- getLogger().info( "Backup surefire files." );
+ log.info( "Backup surefire files." );
}
for ( String testResultFile : testResultFiles )
{
@@ -381,7 +378,7 @@
}
catch ( IOException e )
{
- getLogger().info( "failed to backup unit report file " + xmlFile.getPath() );
+ log.info( "failed to backup unit report file " + xmlFile.getPath() );
}
}
}
@@ -404,9 +401,9 @@
}
if ( isRecursive && changes != null && !changes.isEmpty() )
{
- if ( logger.isInfoEnabled() )
+ if ( log.isInfoEnabled() )
{
- logger.info( "recursive build and changes found --> building" );
+ log.info( "recursive build and changes found --> building" );
}
return true;
}
@@ -416,15 +413,15 @@
//CONTINUUM-1815: additional check for projects recently released
if ( !continuumProject.getVersion().equals( project.getVersion() ) )
{
- logger.info( "Found changes in project's version ( maybe project was recently released ), building" );
+ log.info( "Found changes in project's version ( maybe project was recently released ), building" );
return true;
}
if ( changes.isEmpty() )
{
- if ( logger.isInfoEnabled() )
+ if ( log.isInfoEnabled() )
{
- logger.info( "Found no changes, not building" );
+ log.info( "Found no changes, not building" );
}
return false;
}
@@ -442,27 +439,27 @@
while ( i <= files.size() - 1 )
{
ChangeFile file = files.get( i );
- if ( logger.isDebugEnabled() )
+ if ( log.isDebugEnabled() )
{
- logger.debug( "changeFile.name " + file.getName() );
- logger.debug( "check in modules " + modules );
+ log.debug( "changeFile.name " + file.getName() );
+ log.debug( "check in modules " + modules );
}
boolean found = false;
for ( String module : modules )
{
if ( file.getName().indexOf( module ) >= 0 )
{
- if ( logger.isDebugEnabled() )
+ if ( log.isDebugEnabled() )
{
- logger.debug( "changeFile.name " + file.getName() + " removed because in a module" );
+ log.debug( "changeFile.name " + file.getName() + " removed because in a module" );
}
files.remove( file );
found = true;
break;
}
- if (logger.isDebugEnabled())
+ if (log.isDebugEnabled())
{
- logger.debug( "no remving file " + file.getName() + " not in module " + module );
+ log.debug( "no remving file " + file.getName() + " not in module " + module );
}
}
if ( !found )
@@ -475,12 +472,12 @@
if ( !shouldBuild )
{
- logger.info( "Changes are only in sub-modules." );
+ log.info( "Changes are only in sub-modules." );
}
- if ( logger.isDebugEnabled() )
+ if ( log.isDebugEnabled() )
{
- logger.debug( "shoulbuild = " + shouldBuild );
+ log.debug( "shoulbuild = " + shouldBuild );
}
return shouldBuild;
}
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/SettingsConfigurationException.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Jan 11 01:52:08 2009
@@ -1 +1 @@
-"Author Date Id Revision"
+Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java Sun Jan 11 01:52:08 2009
@@ -34,9 +34,10 @@
import org.apache.maven.continuum.store.ContinuumStoreException;
import org.apache.maven.settings.MavenSettingsBuilder;
import org.apache.maven.settings.Settings;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.jpox.SchemaTool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
@@ -48,9 +49,10 @@
* role-hint="default"
*/
public class DefaultContinuumInitializer
- extends AbstractLogEnabled
implements ContinuumInitializer
{
+ private Logger log = LoggerFactory.getLogger( DefaultContinuumInitializer.class );
+
// ----------------------------------------------------------------------
// Requirements
// ----------------------------------------------------------------------
@@ -92,11 +94,11 @@
public void initialize()
throws ContinuumInitializationException
{
- getLogger().info( "Continuum initializer running ..." );
+ log.info( "Continuum initializer running ..." );
- if ( getLogger().isDebugEnabled() )
+ if ( log.isDebugEnabled() )
{
- getLogger().debug( "Dumping JPOX/JDO Schema Details ..." );
+ log.debug( "Dumping JPOX/JDO Schema Details ..." );
try
{
SchemaTool.outputDBInfo( null, true );
@@ -104,7 +106,7 @@
}
catch ( Exception e )
{
- getLogger().debug( "Error while dumping the database schema", e );
+ log.debug( "Error while dumping the database schema", e );
}
}
@@ -132,7 +134,7 @@
{
throw new ContinuumInitializationException( "Can't get default build definition", e );
}
- getLogger().info( "Continuum initializer end running ..." );
+ log.info( "Continuum initializer end running ..." );
}
@@ -143,12 +145,12 @@
try
{
group = projectGroupDao.getProjectGroupByGroupId( Continuum.DEFAULT_PROJECT_GROUP_GROUP_ID );
- getLogger().info( "Default Project Group exists" );
+ log.info( "Default Project Group exists" );
}
catch ( ContinuumObjectNotFoundException e )
{
- getLogger().info( "create Default Project Group" );
+ log.info( "create Default Project Group" );
group = new ProjectGroup();
@@ -180,7 +182,7 @@
if ( repository == null )
{
- getLogger().info( "create Default Local Repository" );
+ log.info( "create Default Local Repository" );
repository = new LocalRepository();
@@ -194,7 +196,7 @@
}
else if ( !repository.getLocation().equals( settings.getLocalRepository() ) )
{
- getLogger().info( "updating location of Default Local Repository" );
+ log.info( "updating location of Default Local Repository" );
repository.setLocation( settings.getLocalRepository() );
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilder.java Sun Jan 11 01:52:08 2009
@@ -41,12 +41,13 @@
import org.apache.http.params.HttpParams;
import org.apache.http.params.HttpProtocolParams;
import org.apache.http.util.EntityUtils;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileNotFoundException;
@@ -67,14 +68,13 @@
* @version $Id$
*/
public abstract class AbstractContinuumProjectBuilder
- extends AbstractLogEnabled
implements ContinuumProjectBuilder, Initializable
{
-
private static final String TMP_DIR = System.getProperty( "java.io.tmpdir" );
- private DefaultHttpClient httpClient;
+ protected Logger log = LoggerFactory.getLogger( AbstractContinuumProjectBuilder.class );
+ private DefaultHttpClient httpClient;
public void initialize()
throws InitializationException
@@ -94,8 +94,6 @@
ClientConnectionManager cm = new ThreadSafeClientConnManager( params, schemeRegistry );
httpClient = new DefaultHttpClient( cm, params );
-
-
}
protected File createMetadataFile( URL metadata, String username, String password,
@@ -107,7 +105,7 @@
{
url = hidePasswordInUrl( url );
}
- getLogger().info( "Downloading " + url );
+ log.info( "Downloading " + url );
InputStream is = null;
@@ -134,11 +132,11 @@
case 200:
break;
case 401:
- getLogger().error( "Error adding project: Unauthorized " + metadata, null );
+ log.error( "Error adding project: Unauthorized " + metadata );
result.addError( ContinuumProjectBuildingResult.ERROR_UNAUTHORIZED );
return null;
default:
- getLogger().warn( "skip non handled http return code " + res );
+ log.warn( "skip non handled http return code " + res );
}
is = IOUtils.toInputStream( EntityUtils.toString( httpResponse.getEntity(), EntityUtils
.getContentCharSet( httpResponse.getEntity() ) ) );
@@ -243,32 +241,32 @@
}
catch ( FileNotFoundException e )
{
- getLogger().info( "URL not found: " + metadata, e );
+ log.info( "URL not found: " + metadata, e );
result.addError( ContinuumProjectBuildingResult.ERROR_POM_NOT_FOUND );
}
catch ( MalformedURLException e )
{
- getLogger().info( "Malformed URL: " + metadata, e );
+ log.info( "Malformed URL: " + metadata, e );
result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
}
catch ( URISyntaxException e )
{
- getLogger().info( "Malformed URL: " + metadata, e );
+ log.info( "Malformed URL: " + metadata, e );
result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
}
catch ( UnknownHostException e )
{
- getLogger().info( "Unknown host: " + metadata, e );
+ log.info( "Unknown host: " + metadata, e );
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN_HOST );
}
catch ( IOException e )
{
- getLogger().warn( "Could not download the URL: " + metadata, e );
+ log.warn( "Could not download the URL: " + metadata, e );
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
}
catch ( HttpException e )
{
- getLogger().warn( "Could not download the URL: " + metadata, e );
+ log.warn( "Could not download the URL: " + metadata, e );
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
}
return null;
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasySSLSocketFactory.java
('svn:executable' removed)
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/EasyX509TrustManager.java
('svn:executable' removed)
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/manager/DefaultContinuumProjectBuilderManager.java Sun Jan 11 01:52:08 2009
@@ -20,7 +20,6 @@
*/
import org.apache.maven.continuum.project.builder.ContinuumProjectBuilder;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import java.util.Map;
@@ -31,7 +30,6 @@
* role-hint="default"
*/
public class DefaultContinuumProjectBuilderManager
- extends AbstractLogEnabled
implements ContinuumProjectBuilderManager
{
/**
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenOneContinuumProjectBuilder.java Sun Jan 11 01:52:08 2009
@@ -121,7 +121,7 @@
}
catch ( MavenOneMetadataHelperException e )
{
- getLogger().error( "Unknown error while processing metadata", e );
+ log.error( "Unknown error while processing metadata", e );
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
}
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/project/builder/maven/MavenTwoContinuumProjectBuilder.java Sun Jan 11 01:52:08 2009
@@ -27,6 +27,7 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import org.apache.continuum.dao.LocalRepositoryDao;
@@ -167,37 +168,37 @@
}
catch ( MalformedURLException e )
{
- getLogger().debug( "Error adding project: Malformed URL " + url, e );
+ log.debug( "Error adding project: Malformed URL " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
return;
}
catch ( URISyntaxException e )
{
- getLogger().debug( "Error adding project: Malformed URL " + url, e );
+ log.debug( "Error adding project: Malformed URL " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL );
return;
}
catch ( FileNotFoundException e )
{
- getLogger().debug( "Error adding project: File not found " + url, e );
+ log.debug( "Error adding project: File not found " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_POM_NOT_FOUND );
return;
}
catch ( ConnectException e )
{
- getLogger().debug( "Error adding project: Unable to connect " + url, e );
+ log.debug( "Error adding project: Unable to connect " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_CONNECT );
return;
}
catch ( IOException e )
{
- getLogger().info( "Error adding project: Unknown error downloading from " + url, e );
+ log.info( "Error adding project: Unknown error downloading from " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
return;
}
catch ( HttpException e )
{
- getLogger().info( "Error adding project: Unknown error downloading from " + url, e );
+ log.info( "Error adding project: Unknown error downloading from " + url, e );
result.addError( ContinuumProjectBuildingResult.ERROR_UNKNOWN );
return;
}
@@ -208,14 +209,14 @@
pomFile.delete();
}
}
- getLogger().debug( "groupPom " + groupPom );
+ log.debug( "groupPom " + groupPom );
if ( groupPom )
{
ProjectGroup projectGroup = buildProjectGroup( mavenProject, result );
// project groups have the top lvl build definition which is the default build defintion for the sub
// projects
- getLogger().debug( "projectGroup != null" + ( projectGroup != null ) );
+ log.debug( "projectGroup != null" + ( projectGroup != null ) );
if ( projectGroup != null )
{
List<BuildDefinition> buildDefinitions =
@@ -247,7 +248,7 @@
}
catch ( ContinuumStoreException e )
{
- getLogger().warn( "Can't get default schedule.", e );
+ log.warn( "Can't get default schedule.", e );
}
}
// jdo complains that Collections.singletonList(bd) is a second class object and fails.
@@ -284,7 +285,7 @@
if ( result.hasErrors() )
{
- getLogger().info(
+ log.info(
"Error adding project: Unknown error mapping project " + url + ": " + result.getErrorsAsString() );
return;
}
@@ -304,7 +305,6 @@
{
continuumProject.setScmTag( mavenProject.getScm().getTag() );
}
-
result.addProject( continuumProject, MavenTwoBuildExecutor.ID );
}
@@ -346,7 +346,7 @@
}
catch ( MalformedURLException e )
{
- getLogger().debug( "Error adding project module: Malformed URL " + urlString, e );
+ log.debug( "Error adding project module: Malformed URL " + urlString, e );
result.addError( ContinuumProjectBuildingResult.ERROR_MALFORMED_URL, urlString );
continue;
}
@@ -381,7 +381,7 @@
if ( StringUtils.isEmpty( buildDefinition.getArguments() ) )
{
// strange for a mvn build
- getLogger().info( "build definition has empty args" );
+ log.info( "build definition has empty args" );
}
else
{
@@ -445,7 +445,7 @@
}
catch ( ContinuumStoreException e )
{
- getLogger().warn( "Can't get default repository.", e );
+ log.warn( "Can't get default repository.", e );
}
return projectGroup;
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/CheckOutTaskExecutor.java Sun Jan 11 01:52:08 2009
@@ -25,10 +25,11 @@
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.store.ContinuumStoreException;
import org.codehaus.plexus.action.ActionManager;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.taskqueue.Task;
import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
@@ -40,9 +41,10 @@
* role-hint="check-out-project"
*/
public class CheckOutTaskExecutor
- extends AbstractLogEnabled
implements TaskExecutor
{
+ private Logger log = LoggerFactory.getLogger( CheckOutTaskExecutor.class );
+
/**
* @plexus.requirement
*/
@@ -72,7 +74,7 @@
}
catch ( ContinuumStoreException ex )
{
- getLogger().error( "Internal error while getting the project.", ex );
+ log.error( "Internal error while getting the project.", ex );
return;
}
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java Sun Jan 11 01:52:08 2009
@@ -1,5 +1,24 @@
package org.apache.maven.continuum.scm.queue;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -23,22 +42,25 @@
import org.apache.maven.continuum.utils.WorkingDirectoryService;
import org.codehaus.plexus.action.ActionManager;
import org.codehaus.plexus.action.ActionNotFoundException;
-import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.taskqueue.Task;
import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.dag.CycleDetectedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author <a href="mailto:ctan@apache.org">Maria Catherine Tan</a>
+ * @version $Id$
* @plexus.component role="org.codehaus.plexus.taskqueue.execution.TaskExecutor"
* role-hint="prepare-build-project"
*/
public class PrepareBuildProjectsTaskExecutor
- extends AbstractLogEnabled
implements TaskExecutor
{
+ private Logger log = LoggerFactory.getLogger( PrepareBuildProjectsTaskExecutor.class );
+
/**
* @plexus.requirement
*/
@@ -85,22 +107,22 @@
{
int buildDefinitionId = projectsBuildDefinitionsMap.get( projectId );
- getLogger().info( "Initializing prepare build" );
+ log.info( "Initializing prepare build" );
context = initializeContext( projectId, buildDefinitionId );
- getLogger().info( "Starting prepare build of project: " + AbstractContinuumAction.getProject( context ).getName() );
- startPrepareBuild( context );
-
if ( !checkProjectScmRoot( context ) )
{
break;
}
-
+
+ log.info( "Starting prepare build of project: " + AbstractContinuumAction.getProject( context ).getName() );
+ startPrepareBuild( context );
+
try
{
if ( AbstractContinuumAction.getBuildDefinition( context ).isBuildFresh() )
{
- getLogger().info( "Purging existing working copy" );
+ log.info( "Purging existing working copy" );
cleanWorkingDirectory( context );
}
@@ -109,10 +131,10 @@
// ContinuumScmResult should return a ContinuumScmResult from all
// methods, even in a case of failure.
// ----------------------------------------------------------------------
- getLogger().info( "Updating working dir" );
+ log.info( "Updating working dir" );
updateWorkingDirectory( context );
- getLogger().info( "Merging SCM results" );
+ log.info( "Merging SCM results" );
//CONTINUUM-1393
if ( !AbstractContinuumAction.getBuildDefinition( context ).isBuildFresh() )
{
@@ -121,14 +143,14 @@
}
finally
{
- getLogger().info( "Ending prepare build of project: " + AbstractContinuumAction.getProject( context).getName() );
+ log.info( "Ending prepare build of project: " + AbstractContinuumAction.getProject( context).getName() );
endProjectPrepareBuild( context );
}
}
}
finally
{
- getLogger().info( "Ending prepare build" );
+ log.info( "Ending prepare build" );
endPrepareBuild( context );
}
@@ -342,7 +364,7 @@
try
{
- getLogger().info( "Performing action " + actionName );
+ log.info( "Performing action " + actionName );
actionManager.lookup( actionName ).execute( context );
return;
}
@@ -436,7 +458,7 @@
try
{
- projectList = ProjectSorter.getSortedProjects( projects, getLogger() );
+ projectList = ProjectSorter.getSortedProjects( projects, log );
}
catch ( CycleDetectedException e )
{
@@ -462,7 +484,7 @@
}
catch ( ContinuumStoreException e )
{
- getLogger().error( "Error while creating build object", e );
+ log.error( "Error while creating build object", e );
throw new TaskExecutionException( "Error while creating build object", e );
}
shouldBuild = true;
@@ -477,17 +499,17 @@
context.put( AbstractContinuumAction.KEY_BUILD_DEFINITION_ID, buildDefinitionId );
context.put( AbstractContinuumAction.KEY_TRIGGER, trigger );
- getLogger().info( "Performing action create-build-project-task" );
+ log.info( "Performing action create-build-project-task" );
actionManager.lookup( "create-build-project-task" ).execute( context );
}
catch ( ActionNotFoundException e )
{
- getLogger().error( "Error looking up action 'build-project'" );
+ log.error( "Error looking up action 'build-project'" );
throw new TaskExecutionException( "Error looking up action 'build-project'", e );
}
catch ( Exception e )
{
- getLogger().error( e.getMessage(), e );
+ log.error( e.getMessage(), e );
throw new TaskExecutionException( "Error executing action 'build-project'", e );
}
}
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/scm/queue/PrepareBuildProjectsTaskExecutor.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/main/java/org/apache/maven/continuum/utils/ProjectSorter.java Sun Jan 11 01:52:08 2009
@@ -21,10 +21,10 @@
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectDependency;
-import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.codehaus.plexus.util.dag.DAG;
import org.codehaus.plexus.util.dag.TopologicalSorter;
+import org.slf4j.Logger;
import java.util.ArrayList;
import java.util.Collection;
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/test/java/org/apache/maven/continuum/DefaultContinuumTest.java Sun Jan 11 01:52:08 2009
@@ -90,7 +90,9 @@
//assertTrue( validator.validate( fileUrl ) );
- ContinuumProjectBuildingResult result = continuum.addMavenTwoProject( fileUrl );
+ ContinuumProjectBuildingResult result = continuum.addMavenTwoProject( rootPom.toURI().toURL()
+ .toExternalForm(), -1, true,
+ false, true, -1 );
assertNotNull( result );
@@ -473,8 +475,9 @@
assertEquals( 0 , continuum.getAllContinuumReleaseResults().size() );
assertFalse( logFile.exists() );
assertEquals( defaultProjectGroup, continuum.getProjectGroupByGroupId( Continuum.DEFAULT_PROJECT_GROUP_GROUP_ID ) );
+
}
-
+
private Continuum getContinuum()
throws Exception
{
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/test/java/org/apache/maven/continuum/execution/ContinuumBuildExecutorTest.java Sun Jan 11 01:52:08 2009
@@ -79,7 +79,7 @@
executor.setChrootJailDirectory( chrootJailFile );
executor.setShellCommandHelper( helper );
executor.setWorkingDirectoryService( directoryService );
- executor.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "" ) );
+ //executor.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "" ) );
final Project project = new Project();
project.setId( 7 );
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/test/java/org/apache/maven/continuum/project/builder/AbstractContinuumProjectBuilderTest.java Sun Jan 11 01:52:08 2009
@@ -44,7 +44,7 @@
{
super.setUp();
builder = new ContinuumProjectBuilder();
- builder.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "" ) );
+ //builder.enableLogging( new ConsoleLogger( Logger.LEVEL_DEBUG, "" ) );
}
/**
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/org/apache/maven/continuum/DefaultContinuumTest.xml Sun Jan 11 01:52:08 2009
@@ -131,10 +131,6 @@
<role-hint>memory</role-hint>
<field-name>rbacManager</field-name>
</requirement>
- <requirement>
- <role>org.codehaus.plexus.PlexusContainer</role>
- <field-name>container</field-name>
- </requirement>
</requirements>
</component>
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.xml Sun Jan 11 01:52:08 2009
@@ -64,5 +64,10 @@
</configuration>
</component>
+ <component>
+ <role>org.apache.maven.continuum.utils.ContinuumUrlValidator</role>
+ <role-hint>continuumUrl</role-hint>
+ <implementation>org.apache.maven.continuum.utils.ContinuumUrlValidator</implementation>
+ </component>
</components>
</plexus>
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/org/apache/maven/continuum/notification/mail/MailContinuumNotifierTest.xml Sun Jan 11 01:52:08 2009
@@ -85,5 +85,11 @@
</properties>
</configuration>
</component>
+
+ <component>
+ <role>org.apache.maven.continuum.utils.ContinuumUrlValidator</role>
+ <role-hint>continuumUrl</role-hint>
+ <implementation>org.apache.maven.continuum.utils.ContinuumUrlValidator</implementation>
+ </component>
</components>
</plexus>
Modified: continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-core/src/test/resources/projects/continuum/continuum-core/pom.xml Sun Jan 11 01:52:08 2009
@@ -17,7 +17,7 @@
~ under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>continuum-parent</artifactId>
Modified: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementException.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementException.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementException.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementException.java Sun Jan 11 01:52:08 2009
@@ -21,6 +21,7 @@
/**
* Exception wrapper for application errors that can't be recovered from.
+ * @version $Id$
*/
public class DataManagementException
extends RuntimeException
Propchange: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementTool.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementTool.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementTool.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementTool.java Sun Jan 11 01:52:08 2009
@@ -24,6 +24,7 @@
/**
* Delegate to the correct data management tool.
+ * @version $Id$
*/
public interface DataManagementTool
{
Propchange: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DataManagementTool.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseFactoryConfigurator.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseFactoryConfigurator.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseFactoryConfigurator.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseFactoryConfigurator.java Sun Jan 11 01:52:08 2009
@@ -19,6 +19,10 @@
* under the License.
*/
+/**
+ *
+ * @version $Id$
+ */
public interface DatabaseFactoryConfigurator
{
void configure( DatabaseParams params );
Propchange: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseFactoryConfigurator.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseParams.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseParams.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseParams.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseParams.java Sun Jan 11 01:52:08 2009
@@ -23,6 +23,7 @@
/**
* Bean for storing database parameters.
+ * @version $Id$
*/
public class DatabaseParams
{
Propchange: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-api/src/main/java/org/apache/maven/continuum/management/DatabaseParams.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DataManagementCli.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DatabaseFormat.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DatabaseFormat.java?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DatabaseFormat.java (original)
+++ continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DatabaseFormat.java Sun Jan 11 01:52:08 2009
@@ -21,6 +21,7 @@
/**
* Enumeration of known database formats.
+ * @version $Id$
*/
public enum DatabaseFormat
{
Propchange: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/src/main/java/org/apache/maven/continuum/management/DatabaseFormat.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml?rev=733441&r1=733440&r2=733441&view=diff
==============================================================================
--- continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml (original)
+++ continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml Sun Jan 11 01:52:08 2009
@@ -16,7 +16,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
+ <!-- $Id$ -->
<plexus>
<components>
<component>
Propchange: continuum/branches/continuum-distributed-builds/continuum-data-management/data-management-cli/src/main/resources/META-INF/plexus/plexus.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision