You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2012/08/13 06:29:28 UTC
svn commit: r1372260 [12/30] - in /continuum/trunk: ./ continuum-api/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/executor/
continuum-api/src/main/java/org/a...
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadataAction.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,6 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.List;
-import java.util.Map;
-
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.execution.maven.m2.SettingsConfigurationException;
import org.apache.maven.continuum.model.project.BuildDefinitionTemplate;
@@ -43,6 +36,13 @@ import org.apache.maven.settings.Setting
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+
/**
* Resolve the project url being passed in and gather authentication information
* if the url is so configured, then create the projects
@@ -63,13 +63,13 @@ public class CreateProjectsFromMetadataA
{
/**
* Metadata url for adding projects.
- */
+ */
private static final String KEY_URL = "url";
-
- private static final String KEY_PROJECT_BUILDER_ID = "builderId";
-
- private static final String KEY_PROJECT_BUILDING_RESULT = "projectBuildingResult";
-
+
+ private static final String KEY_PROJECT_BUILDER_ID = "builderId";
+
+ private static final String KEY_PROJECT_BUILDING_RESULT = "projectBuildingResult";
+
private static final String KEY_LOAD_RECURSIVE_PROJECTS = "loadRecursiveProjects";
public static final String KEY_CHECKOUT_PROJECTS_IN_SINGLE_DIRECTORY = "checkoutProjectsInSingleDirectory";
@@ -93,13 +93,13 @@ public class CreateProjectsFromMetadataA
throws ContinuumException, ContinuumProjectBuilderManagerException, ContinuumProjectBuilderException
{
String projectBuilderId = getProjectBuilderId( context );
-
+
boolean loadRecursiveProjects = isLoadRecursiveProject( context );
-
+
boolean checkoutProjectsInSingleDirectory = getBoolean( context, KEY_CHECKOUT_PROJECTS_IN_SINGLE_DIRECTORY );
String curl = getUrl( context );
-
+
URL url;
ContinuumProjectBuilder projectBuilder = projectBuilderManager.getProjectBuilder( projectBuilderId );
@@ -118,7 +118,8 @@ public class CreateProjectsFromMetadataA
url = new URL( curl );
result = projectBuilder.buildProjectsFromMetadata( url, null, null, loadRecursiveProjects,
- buildDefinitionTemplate, checkoutProjectsInSingleDirectory );
+ buildDefinitionTemplate,
+ checkoutProjectsInSingleDirectory );
}
else
@@ -157,7 +158,8 @@ public class CreateProjectsFromMetadataA
{
result = projectBuilder.buildProjectsFromMetadata( url, username, password, loadRecursiveProjects,
- buildDefinitionTemplate, checkoutProjectsInSingleDirectory );
+ buildDefinitionTemplate,
+ checkoutProjectsInSingleDirectory );
}
else
@@ -263,9 +265,8 @@ public class CreateProjectsFromMetadataA
int indexDiff = StringUtils.differenceAt( path1, path2 );
String commonPath = path1.substring( 0, indexDiff );
- if ( commonPath.lastIndexOf( '/' ) != commonPath.length() - 1 &&
- !( path1.contains( new String( commonPath + "/" ) ) ||
- path2.contains( new String( commonPath + "/" ) ) ) )
+ if ( commonPath.lastIndexOf( '/' ) != commonPath.length() - 1 && !( path1.contains( new String(
+ commonPath + "/" ) ) || path2.contains( new String( commonPath + "/" ) ) ) )
{
while ( commonPath.lastIndexOf( '/' ) != commonPath.length() - 1 )
{
@@ -306,7 +307,7 @@ public class CreateProjectsFromMetadataA
{
this.urlValidator = urlValidator;
}
-
+
public static String getUrl( Map<String, Object> context )
{
return getString( context, KEY_URL );
@@ -316,7 +317,7 @@ public class CreateProjectsFromMetadataA
{
context.put( KEY_URL, url );
}
-
+
public static String getProjectBuilderId( Map<String, Object> context )
{
return getString( context, KEY_PROJECT_BUILDER_ID );
@@ -336,7 +337,7 @@ public class CreateProjectsFromMetadataA
{
context.put( KEY_PROJECT_BUILDING_RESULT, result );
}
-
+
public static boolean isLoadRecursiveProject( Map<String, Object> context )
{
return getBoolean( context, KEY_LOAD_RECURSIVE_PROJECTS );
@@ -346,13 +347,14 @@ public class CreateProjectsFromMetadataA
{
context.put( KEY_LOAD_RECURSIVE_PROJECTS, loadRecursiveProject );
}
-
+
public static boolean isCheckoutProjectsInSingleDirectory( Map<String, Object> context )
{
return getBoolean( context, KEY_CHECKOUT_PROJECTS_IN_SINGLE_DIRECTORY );
}
-
- public static void setCheckoutProjectsInSingleDirectory( Map<String, Object> context, boolean checkoutProjectsInSingleDirectory )
+
+ public static void setCheckoutProjectsInSingleDirectory( Map<String, Object> context,
+ boolean checkoutProjectsInSingleDirectory )
{
context.put( KEY_CHECKOUT_PROJECTS_IN_SINGLE_DIRECTORY, checkoutProjectsInSingleDirectory );
}
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/DeployArtifactContinuumAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/DeployArtifactContinuumAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/DeployArtifactContinuumAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/DeployArtifactContinuumAction.java Mon Aug 13 04:29:09 2012
@@ -19,10 +19,6 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.model.repository.LocalRepository;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.deployer.ArtifactDeployer;
@@ -39,6 +35,10 @@ import org.apache.maven.continuum.model.
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.utils.WorkingDirectoryService;
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
/**
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
@@ -101,14 +101,16 @@ public class DeployArtifactContinuumActi
if ( project.getState() == ContinuumProjectState.OK )
{
BuildDefinition buildDefinition = getBuildDefinition( context );
-
+
String projectScmRootUrl = getProjectScmRootUrl( context, project.getScmUrl() );
-
+
List<Project> projectsWithCommonScmRoot = getListOfProjectsInGroupWithCommonScmRoot( context );
List<Artifact> artifacts = buildExecutor.getDeployableArtifacts( project,
- workingDirectoryService.getWorkingDirectory(
- project, projectScmRootUrl, projectsWithCommonScmRoot ), buildDefinition );
+ workingDirectoryService.getWorkingDirectory(
+ project, projectScmRootUrl,
+ projectsWithCommonScmRoot ),
+ buildDefinition );
LocalRepository repository = project.getProjectGroup().getLocalRepository();
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,6 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.io.File;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.dao.BuildResultDao;
import org.apache.continuum.dao.ProjectDao;
import org.apache.continuum.utils.ContinuumUtils;
@@ -41,6 +36,11 @@ import org.apache.maven.continuum.model.
import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
import org.apache.maven.continuum.project.ContinuumProjectState;
+import java.io.File;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -107,7 +107,7 @@ public class ExecuteBuilderContinuumActi
buildResult.setState( ContinuumProjectState.BUILDING );
buildResult.setTrigger( buildTrigger.getTrigger() );
-
+
buildResult.setUsername( buildTrigger.getTriggeredBy() );
buildResult.setScmResult( scmResult );
@@ -123,19 +123,18 @@ public class ExecuteBuilderContinuumActi
setCancelled( context, false );
buildResult = buildResultDao.getBuildResult( buildResult.getId() );
-
+
String projectScmRootUrl = getProjectScmRootUrl( context, project.getScmUrl() );
List<Project> projectsWithCommonScmRoot = getListOfProjectsInGroupWithCommonScmRoot( context );
-
+
try
{
notifier.runningGoals( project, buildDefinition, buildResult );
File buildOutputFile = configurationService.getBuildOutputFile( buildResult.getId(), project.getId() );
-
- ContinuumBuildExecutionResult result =
- buildExecutor.build( project, buildDefinition, buildOutputFile, projectsWithCommonScmRoot,
- projectScmRootUrl );
+
+ ContinuumBuildExecutionResult result = buildExecutor.build( project, buildDefinition, buildOutputFile,
+ projectsWithCommonScmRoot, projectScmRootUrl );
buildResult.setState( result.getExitCode() == 0 ? ContinuumProjectState.OK : ContinuumProjectState.FAILED );
@@ -209,7 +208,7 @@ public class ExecuteBuilderContinuumActi
AbstractContinuumAction.setProject( context, project );
projectDao.updateProject( project );
-
+
projectScmRootUrl = getProjectScmRootUrl( context, project.getScmUrl() );
projectsWithCommonScmRoot = getListOfProjectsInGroupWithCommonScmRoot( context );
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveAssignableRolesAction.java Mon Aug 13 04:29:09 2012
@@ -19,8 +19,6 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.util.Map;
-
import org.apache.continuum.dao.ProjectGroupDao;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.ProjectGroup;
@@ -28,6 +26,8 @@ import org.apache.maven.continuum.store.
import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException;
+import java.util.Map;
+
/**
* AddAssignableRolesAction:
*
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectAction.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,12 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.util.Map;
-
import org.apache.continuum.dao.ProjectDao;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
+import java.util.Map;
+
/**
* AddBuildDefinitionToProjectAction:
*
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectGroupAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectGroupAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/RemoveBuildDefinitionFromProjectGroupAction.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,13 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.util.Map;
-
import org.apache.continuum.dao.ProjectGroupDao;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.ProjectGroup;
+import java.util.Map;
+
/**
* AddBuildDefinitionToProjectAction:
*
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreCheckOutScmResultAction.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,14 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.util.Map;
-
import org.apache.continuum.dao.ProjectDao;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.scm.ScmResult;
import org.apache.maven.continuum.store.ContinuumStoreException;
import org.codehaus.plexus.taskqueue.execution.TaskExecutionException;
+import java.util.Map;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectAction.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,14 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.util.Map;
-
import org.apache.continuum.dao.ProjectGroupDao;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.store.ContinuumStoreException;
+import java.util.Map;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectGroupAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectGroupAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/StoreProjectGroupAction.java Mon Aug 13 04:29:09 2012
@@ -19,13 +19,13 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.util.Map;
-
import org.apache.continuum.dao.ProjectGroupDao;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.model.project.ProjectGroup;
import org.apache.maven.continuum.store.ContinuumStoreException;
+import java.util.Map;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectAction.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,12 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.util.Map;
-
import org.apache.continuum.dao.ProjectDao;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.Project;
+import java.util.Map;
+
/**
* AddBuildDefinitionToProjectAction:
*
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectGroupAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectGroupAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateBuildDefinitionFromProjectGroupAction.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,12 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.util.Map;
-
import org.apache.continuum.dao.ProjectGroupDao;
import org.apache.maven.continuum.model.project.BuildDefinition;
import org.apache.maven.continuum.model.project.ProjectGroup;
+import java.util.Map;
+
/**
* AddBuildDefinitionToProjectAction:
*
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateProjectFromWorkingDirectoryContinuumAction.java Mon Aug 13 04:29:09 2012
@@ -19,9 +19,6 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.dao.BuildDefinitionDao;
import org.apache.continuum.dao.ProjectDao;
import org.apache.maven.continuum.ContinuumException;
@@ -34,6 +31,9 @@ import org.apache.maven.continuum.model.
import org.apache.maven.continuum.store.ContinuumStoreException;
import org.apache.maven.continuum.utils.WorkingDirectoryService;
+import java.util.List;
+import java.util.Map;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -83,9 +83,10 @@ public class UpdateProjectFromWorkingDir
ScmResult scmResult = (ScmResult) context.get( "scmResult" );
List<Project> projectsWithCommonScmRoot = getListOfProjectsInGroupWithCommonScmRoot( context );
String projectScmRootUrl = getProjectScmRootUrl( context, project.getScmUrl() );
-
- builder.updateProjectFromCheckOut( workingDirectoryService.getWorkingDirectory( project,
- projectScmRootUrl, projectsWithCommonScmRoot ), project, buildDefinition, scmResult );
+
+ builder.updateProjectFromCheckOut( workingDirectoryService.getWorkingDirectory( project, projectScmRootUrl,
+ projectsWithCommonScmRoot ),
+ project, buildDefinition, scmResult );
// ----------------------------------------------------------------------
// Store the new descriptor
// ----------------------------------------------------------------------
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,6 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.io.File;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.dao.BuildResultDao;
import org.apache.continuum.dao.ProjectDao;
import org.apache.continuum.scm.ContinuumScm;
@@ -48,6 +42,12 @@ import org.apache.maven.scm.command.upda
import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.repository.ScmRepositoryException;
+import java.io.File;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -117,14 +117,13 @@ public class UpdateWorkingDirectoryFromS
{
notifier.checkoutStarted( project, buildDefinition );
- List<Project> projectsWithCommonScmRoot = getListOfProjectsInGroupWithCommonScmRoot( context );
+ List<Project> projectsWithCommonScmRoot = getListOfProjectsInGroupWithCommonScmRoot( context );
String projectScmRootUrl = getProjectScmRootUrl( context, project.getScmUrl() );
-
- // TODO: not sure why this is different to the context, but it all needs to change
- File workingDirectory =
- workingDirectoryService.getWorkingDirectory( project, projectScmRootUrl,
- projectsWithCommonScmRoot );
-
+
+ // TODO: not sure why this is different to the context, but it all needs to change
+ File workingDirectory = workingDirectoryService.getWorkingDirectory( project, projectScmRootUrl,
+ projectsWithCommonScmRoot );
+
ContinuumScmConfiguration config = createScmConfiguration( project, workingDirectory, projectScmRootUrl );
config.setLatestUpdateDate( latestUpdateDate );
String tag = config.getTag();
@@ -194,7 +193,7 @@ public class UpdateWorkingDirectoryFromS
}
catch ( Exception e )
{
- // nasty nasty, but we're in finally, so just sacrifice the state to keep the original exception
+ // nasty nasty, but we're in finally, so just sacrifice the state to keep the original exception
getLogger().error( e.getMessage(), e );
}
@@ -205,11 +204,12 @@ public class UpdateWorkingDirectoryFromS
AbstractContinuumAction.setProject( context, project );
}
- private ContinuumScmConfiguration createScmConfiguration( Project project, File workingDirectory, String scmRootUrl )
+ private ContinuumScmConfiguration createScmConfiguration( Project project, File workingDirectory,
+ String scmRootUrl )
{
ContinuumScmConfiguration config = new ContinuumScmConfiguration();
-
- if( project.isCheckedOutInSingleDirectory() && scmRootUrl!= null && !"".equals( scmRootUrl ) )
+
+ if ( project.isCheckedOutInSingleDirectory() && scmRootUrl != null && !"".equals( scmRootUrl ) )
{
config.setUrl( scmRootUrl );
}
@@ -219,7 +219,8 @@ public class UpdateWorkingDirectoryFromS
}
// CONTINUUM-2628
- config = ContinuumScmUtils.setSCMCredentialsforSSH( config, config.getUrl(), project.getScmUsername(), project.getScmPassword() );
+ config = ContinuumScmUtils.setSCMCredentialsforSSH( config, config.getUrl(), project.getScmUsername(),
+ project.getScmPassword() );
config.setUseCredentialsCache( project.isScmUseCache() );
config.setWorkingDirectory( workingDirectory );
@@ -354,12 +355,12 @@ public class UpdateWorkingDirectoryFromS
}
return message.toString();
}
-
+
public static ScmResult getUpdateScmResult( Map<String, Object> context, ScmResult defaultValue )
{
return (ScmResult) getObject( context, KEY_UPDATE_SCM_RESULT, defaultValue );
}
-
+
public static void setUpdateScmResult( Map<String, Object> context, ScmResult scmResult )
{
context.put( KEY_UPDATE_SCM_RESULT, scmResult );
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProject.java Mon Aug 13 04:29:09 2012
@@ -19,15 +19,15 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.dao.ProjectDao;
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.execution.manager.BuildExecutorManager;
import org.apache.maven.continuum.model.project.Project;
import org.codehaus.plexus.util.StringUtils;
+import java.util.List;
+import java.util.Map;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProjectGroup.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProjectGroup.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProjectGroup.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ValidateProjectGroup.java Mon Aug 13 04:29:09 2012
@@ -19,10 +19,10 @@ package org.apache.maven.continuum.core.
* under the License.
*/
-import java.util.Map;
-
import org.apache.maven.continuum.model.project.ProjectGroup;
+import java.util.Map;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/AbstractBuildExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,6 @@ package org.apache.maven.continuum.execu
* under the License.
*/
-import java.io.File;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import org.apache.continuum.utils.shell.ExecutionResult;
import org.apache.continuum.utils.shell.ShellCommandHelper;
import org.apache.maven.artifact.Artifact;
@@ -49,6 +41,14 @@ import org.codehaus.plexus.util.cli.Comm
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -159,7 +159,7 @@ public abstract class AbstractBuildExecu
if ( StringUtils.isEmpty( defaultExecutable ) )
{
log.warn( "The default executable for build executor '" + id + "' is not set. " +
- "This will cause a problem unless the project has a executable configured." );
+ "This will cause a problem unless the project has a executable configured." );
}
else
{
@@ -173,7 +173,7 @@ public abstract class AbstractBuildExecu
else
{
log.info( "Resolved the executable '" + defaultExecutable + "' to " + "'" +
- resolvedExecutable.getAbsolutePath() + "'." );
+ resolvedExecutable.getAbsolutePath() + "'." );
}
}
}
@@ -190,7 +190,7 @@ public abstract class AbstractBuildExecu
* @return The executable path
*/
protected String findExecutable( String executable, String defaultExecutable, boolean resolveExecutable,
- File workingDirectory )
+ File workingDirectory )
{
// ----------------------------------------------------------------------
// If we're not searching the path for the executable, prefix the
@@ -250,7 +250,7 @@ public abstract class AbstractBuildExecu
throws ContinuumBuildExecutorException
{
- File workingDirectory = getWorkingDirectory( project, projectScmRootUrl, projectsWithCommonScmRoot );
+ File workingDirectory = getWorkingDirectory( project, projectScmRootUrl, projectsWithCommonScmRoot );
String actualExecutable = findExecutable( executable, defaultExecutable, resolveExecutable, workingDirectory );
@@ -281,9 +281,9 @@ public abstract class AbstractBuildExecu
workingDirectory = chrootJailDirectory; // not really used but must exist
}
- ExecutionResult result =
- getShellCommandHelper().executeShellCommand( workingDirectory, actualExecutable, arguments, output,
- project.getId(), environments );
+ ExecutionResult result = getShellCommandHelper().executeShellCommand( workingDirectory, actualExecutable,
+ arguments, output, project.getId(),
+ environments );
log.info( "Exit code: " + result.getExitCode() );
@@ -342,7 +342,8 @@ public abstract class AbstractBuildExecu
return jdk.getVarValue();
}
- public void backupTestFiles( Project project, int buildId, String projectScmRootUrl, List<Project> projectsWithCommonScmRoot )
+ public void backupTestFiles( Project project, int buildId, String projectScmRootUrl,
+ List<Project> projectsWithCommonScmRoot )
{
//Nothing to do, by default
}
@@ -402,7 +403,7 @@ public abstract class AbstractBuildExecu
return relPath + File.separator + buildFile;
}
-
+
protected boolean isDescriptionUpdated( BuildDefinition buildDefinition, ScmResult scmResult, Project project )
{
boolean update = true;
@@ -441,8 +442,8 @@ public abstract class AbstractBuildExecu
public boolean isBuilding( Project project )
{
- return project.getState() == ContinuumProjectState.BUILDING ||
- getShellCommandHelper().isRunning( project.getId() );
+ return project.getState() == ContinuumProjectState.BUILDING || getShellCommandHelper().isRunning(
+ project.getId() );
}
public void killProcess( Project project )
@@ -458,9 +459,11 @@ public abstract class AbstractBuildExecu
return Collections.emptyList();
}
- public File getWorkingDirectory( Project project, String projectScmRootUrl, List<Project> projectsWithCommonScmRoot )
+ public File getWorkingDirectory( Project project, String projectScmRootUrl,
+ List<Project> projectsWithCommonScmRoot )
{
- return getWorkingDirectoryService().getWorkingDirectory( project, projectScmRootUrl, projectsWithCommonScmRoot );
+ return getWorkingDirectoryService().getWorkingDirectory( project, projectScmRootUrl,
+ projectsWithCommonScmRoot );
}
public InstallationService getInstallationService()
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/ant/AntBuildExecutor.java Mon Aug 13 04:29:09 2012
@@ -71,11 +71,12 @@ public class AntBuildExecutor
// ContinuumBuilder Implementation
// ----------------------------------------------------------------------
- public ContinuumBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput, List<Project> projectsWithCommonScmRoot, String projectScmRootUrl )
+ public ContinuumBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput,
+ List<Project> projectsWithCommonScmRoot, String projectScmRootUrl )
throws ContinuumBuildExecutorException
{
- String executable = getInstallationService().getExecutorConfigurator( InstallationService.ANT_TYPE )
- .getExecutable();
+ String executable = getInstallationService().getExecutorConfigurator(
+ InstallationService.ANT_TYPE ).getExecutable();
StringBuffer arguments = new StringBuffer();
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorNotFoundException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorNotFoundException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorNotFoundException.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/BuildExecutorNotFoundException.java Mon Aug 13 04:29:09 2012
@@ -26,9 +26,9 @@ package org.apache.maven.continuum.execu
public class BuildExecutorNotFoundException
extends Exception
{
- private static final long serialVersionUID = 2709593430202284107L;
+ private static final long serialVersionUID = 2709593430202284107L;
- public BuildExecutorNotFoundException( String message )
+ public BuildExecutorNotFoundException( String message )
{
super( message );
}
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/manager/DefaultBuildExecutorManager.java Mon Aug 13 04:29:09 2012
@@ -19,15 +19,15 @@ package org.apache.maven.continuum.execu
* under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.maven.continuum.ContinuumException;
import org.apache.maven.continuum.execution.ContinuumBuildExecutor;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/DefaultMavenOneMetadataHelper.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,6 @@ package org.apache.maven.continuum.execu
* under the License.
*/
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectDependency;
import org.apache.maven.continuum.model.project.ProjectDeveloper;
@@ -40,6 +32,14 @@ import org.codehaus.plexus.util.xml.pull
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -56,7 +56,7 @@ public class DefaultMavenOneMetadataHelp
// ----------------------------------------------------------------------
/**
- * @deprecated Use {@link #mapMetadata(ContinuumProjectBuildingResult,File,Project)} instead
+ * @deprecated Use {@link #mapMetadata(ContinuumProjectBuildingResult, File, Project)} instead
*/
public void mapMetadata( File metadata, Project project )
throws MavenOneMetadataHelperException
@@ -64,7 +64,8 @@ public class DefaultMavenOneMetadataHelp
mapMetadata( new ContinuumProjectBuildingResult(), metadata, project, true );
}
- public void mapMetadata( ContinuumProjectBuildingResult result, File metadata, Project project, boolean updateDefinition )
+ public void mapMetadata( ContinuumProjectBuildingResult result, File metadata, Project project,
+ boolean updateDefinition )
throws MavenOneMetadataHelperException
{
Xpp3Dom mavenProject;
@@ -348,7 +349,7 @@ public class DefaultMavenOneMetadataHelp
project.setGroupId( groupId );
project.setArtifactId( artifactId );
-
+
if ( updateDefinition )
{
project.setVersion( version );
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneBuildExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,6 @@ package org.apache.maven.continuum.execu
* under the License.
*/
-import java.io.File;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import org.apache.continuum.model.repository.LocalRepository;
import org.apache.maven.continuum.execution.AbstractBuildExecutor;
import org.apache.maven.continuum.execution.ContinuumBuildExecutionResult;
@@ -42,6 +34,14 @@ import org.apache.maven.continuum.model.
import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -82,11 +82,12 @@ public class MavenOneBuildExecutor
// Builder Implementation
// ----------------------------------------------------------------------
- public ContinuumBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput, List<Project> projectsWithCommonScmRoot, String projectScmRootUrl )
+ public ContinuumBuildExecutionResult build( Project project, BuildDefinition buildDefinition, File buildOutput,
+ List<Project> projectsWithCommonScmRoot, String projectScmRootUrl )
throws ContinuumBuildExecutorException
{
- String executable =
- getInstallationService().getExecutorConfigurator( InstallationService.MAVEN1_TYPE ).getExecutable();
+ String executable = getInstallationService().getExecutorConfigurator(
+ InstallationService.MAVEN1_TYPE ).getExecutable();
StringBuffer arguments = new StringBuffer();
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelper.java Mon Aug 13 04:29:09 2012
@@ -33,7 +33,7 @@ public interface MavenOneMetadataHelper
String ROLE = MavenOneMetadataHelper.class.getName();
/**
- * @deprecated Use {@link #mapMetadata(ContinuumProjectBuildingResult,File,Project)} instead
+ * @deprecated Use {@link #mapMetadata(ContinuumProjectBuildingResult, File, Project)} instead
*/
void mapMetadata( File metadata, Project project )
throws MavenOneMetadataHelperException;
@@ -45,6 +45,6 @@ public interface MavenOneMetadataHelper
* @throws MavenOneMetadataHelperException
*
*/
- void mapMetadata( ContinuumProjectBuildingResult result, File metadata, Project project, boolean updateDefinition)
+ void mapMetadata( ContinuumProjectBuildingResult result, File metadata, Project project, boolean updateDefinition )
throws MavenOneMetadataHelperException;
}
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelperException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelperException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelperException.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m1/MavenOneMetadataHelperException.java Mon Aug 13 04:29:09 2012
@@ -26,9 +26,9 @@ package org.apache.maven.continuum.execu
public class MavenOneMetadataHelperException
extends Exception
{
- private static final long serialVersionUID = -5868938464601717160L;
+ private static final long serialVersionUID = -5868938464601717160L;
- public MavenOneMetadataHelperException( String message )
+ public MavenOneMetadataHelperException( String message )
{
super( message );
}
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/DefaultMavenBuilderHelper.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,6 @@ package org.apache.maven.continuum.execu
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.continuum.model.repository.LocalRepository;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -74,6 +68,12 @@ import org.codehaus.plexus.util.xml.pull
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -118,7 +118,8 @@ public class DefaultMavenBuilderHelper
// MavenBuilderHelper Implementation
// ----------------------------------------------------------------------
- public void mapMetadataToProject( ContinuumProjectBuildingResult result, File metadata, Project continuumProject, boolean update )
+ public void mapMetadataToProject( ContinuumProjectBuildingResult result, File metadata, Project continuumProject,
+ boolean update )
{
MavenProject mavenProject = getMavenProject( result, metadata );
@@ -129,11 +130,11 @@ public class DefaultMavenBuilderHelper
return;
}
- mapMavenProjectToContinuumProject( result, mavenProject, continuumProject, update);
+ mapMavenProjectToContinuumProject( result, mavenProject, continuumProject, update );
}
public void mapMavenProjectToContinuumProject( ContinuumProjectBuildingResult result, MavenProject mavenProject,
- Project continuumProject, boolean update)
+ Project continuumProject, boolean update )
{
if ( mavenProject == null )
{
@@ -141,26 +142,27 @@ public class DefaultMavenBuilderHelper
return;
}
- if (update){
+ if ( update )
+ {
// ----------------------------------------------------------------------
// Name
// ----------------------------------------------------------------------
-
+
continuumProject.setName( getProjectName( mavenProject ) );
-
+
// ----------------------------------------------------------------------
// Version
// ----------------------------------------------------------------------
-
+
continuumProject.setVersion( getVersion( mavenProject ) );
-
+
// ----------------------------------------------------------------------
// Description
// ----------------------------------------------------------------------
continuumProject.setDescription( mavenProject.getDescription() );
- }
-
+ }
+
// ----------------------------------------------------------------------
// SCM Url
// ----------------------------------------------------------------------
@@ -389,7 +391,7 @@ public class DefaultMavenBuilderHelper
ProfileManager profileManager = new DefaultProfileManager( container, settings );
- project = projectBuilder.build( file, getLocalRepository(), profileManager, true);
+ project = projectBuilder.build( file, getLocalRepository(), profileManager, true );
if ( log.isDebugEnabled() )
{
@@ -481,8 +483,8 @@ public class DefaultMavenBuilderHelper
{
result.addError( ContinuumProjectBuildingResult.ERROR_MISSING_SCM_CONNECTION, getProjectName( project ) );
- log.error(
- "Missing 'connection' element in the 'scm' element in the " + getProjectName( project ) + " POM." );
+ log.error( "Missing 'connection' element in the 'scm' element in the " + getProjectName( project ) +
+ " POM." );
return null;
}
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenBuilderHelper.java Mon Aug 13 04:29:09 2012
@@ -35,7 +35,8 @@ public interface MavenBuilderHelper
{
String ROLE = MavenBuilderHelper.class.getName();
- void mapMetadataToProject( ContinuumProjectBuildingResult result, File metadata, Project project, boolean updateDefinition);
+ void mapMetadataToProject( ContinuumProjectBuildingResult result, File metadata, Project project,
+ boolean updateDefinition );
MavenProject getMavenProject( ContinuumProjectBuildingResult result, File file );
@@ -46,10 +47,10 @@ public interface MavenBuilderHelper
* @param groupPom map this project as if it is being used to initialize a project group
*/
void mapMavenProjectToContinuumProject( ContinuumProjectBuildingResult result, MavenProject mavenProject,
- Project continuumProject, boolean updateDefinition);
+ Project continuumProject, boolean updateDefinition );
ArtifactRepository getLocalRepository()
throws SettingsConfigurationException;
-
+
void setLocalRepository( LocalRepository repository );
}
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/MavenTwoBuildExecutor.java Mon Aug 13 04:29:09 2012
@@ -19,21 +19,9 @@ package org.apache.maven.continuum.execu
* under the License.
*/
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
import org.apache.continuum.model.repository.LocalRepository;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.continuum.builddefinition.BuildDefinitionUpdatePolicyConstants;
import org.apache.maven.continuum.configuration.ConfigurationException;
import org.apache.maven.continuum.configuration.ConfigurationService;
import org.apache.maven.continuum.execution.AbstractBuildExecutor;
@@ -57,6 +45,16 @@ import org.codehaus.plexus.util.Director
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -139,8 +137,8 @@ public class MavenTwoBuildExecutor
List<Project> projectsWithCommonScmRoot, String projectScmRootUrl )
throws ContinuumBuildExecutorException
{
- String executable = getInstallationService().getExecutorConfigurator( InstallationService.MAVEN2_TYPE )
- .getExecutable();
+ String executable = getInstallationService().getExecutorConfigurator(
+ InstallationService.MAVEN2_TYPE ).getExecutable();
StringBuffer arguments = new StringBuffer();
@@ -165,11 +163,12 @@ public class MavenTwoBuildExecutor
LocalRepository repository = project.getProjectGroup().getLocalRepository();
if ( repository != null )
{
- arguments.append( "\"-Dmaven.repo.local=" ).append( StringUtils.clean( repository.getLocation() ) ).append( "\" " );
+ arguments.append( "\"-Dmaven.repo.local=" ).append( StringUtils.clean( repository.getLocation() ) ).append(
+ "\" " );
}
-
+
arguments.append( StringUtils.clean( buildDefinition.getGoals() ) );
-
+
Map<String, String> environments = getEnvironments( buildDefinition );
String m2Home = environments.get( getInstallationService().getEnvVar( InstallationService.MAVEN2_TYPE ) );
if ( StringUtils.isNotEmpty( m2Home ) )
@@ -200,7 +199,7 @@ public class MavenTwoBuildExecutor
throw new ContinuumBuildExecutorException( "Error while mapping metadata:" + result.getErrorsAsString() );
}
}
-
+
private static File getPomFile( String projectBuildFile, File workingDirectory )
{
File f = null;
@@ -222,7 +221,7 @@ public class MavenTwoBuildExecutor
@Override
public List<Artifact> getDeployableArtifacts( Project continuumProject, File workingDirectory,
- BuildDefinition buildDefinition )
+ BuildDefinition buildDefinition )
throws ContinuumBuildExecutorException
{
MavenProject project = getMavenProject( continuumProject, workingDirectory, buildDefinition );
@@ -339,7 +338,8 @@ public class MavenTwoBuildExecutor
}
@Override
- public void backupTestFiles( Project project, int buildId, String projectScmRootUrl, List<Project> projectsWithCommonScmRoot )
+ public void backupTestFiles( Project project, int buildId, String projectScmRootUrl,
+ List<Project> projectsWithCommonScmRoot )
{
File backupDirectory = null;
try
@@ -354,7 +354,8 @@ public class MavenTwoBuildExecutor
{
log.info( "error on surefire backup directory creation skip backup " + e.getMessage(), e );
}
- backupTestFiles( getWorkingDirectory( project, projectScmRootUrl, projectsWithCommonScmRoot ), backupDirectory );
+ backupTestFiles( getWorkingDirectory( project, projectScmRootUrl, projectsWithCommonScmRoot ),
+ backupDirectory );
}
private void backupTestFiles( File workingDir, File backupDirectory )
@@ -398,10 +399,10 @@ public class MavenTwoBuildExecutor
{
//Check if it's a recursive build
boolean isRecursive = false;
- if (StringUtils.isNotEmpty( buildDefinition.getArguments() ) )
+ if ( StringUtils.isNotEmpty( buildDefinition.getArguments() ) )
{
- isRecursive = buildDefinition.getArguments().indexOf( "-N" ) < 0 &&
- buildDefinition.getArguments().indexOf( "--non-recursive" ) < 0 ;
+ isRecursive = buildDefinition.getArguments().indexOf( "-N" ) < 0 && buildDefinition.getArguments().indexOf(
+ "--non-recursive" ) < 0;
}
if ( isRecursive && changes != null && !changes.isEmpty() )
{
@@ -422,7 +423,7 @@ public class MavenTwoBuildExecutor
}
return false;
}
-
+
//check if changes are only in sub-modules or not
List<String> modules = project.getModules();
@@ -449,12 +450,12 @@ public class MavenTwoBuildExecutor
if ( log.isDebugEnabled() )
{
log.debug( "changeFile.name " + file.getName() + " removed because in a module" );
- }
+ }
files.remove( file );
found = true;
break;
}
- if (log.isDebugEnabled())
+ if ( log.isDebugEnabled() )
{
log.debug( "no remving file " + file.getName() + " not in module " + module );
}
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/SettingsConfigurationException.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/SettingsConfigurationException.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/SettingsConfigurationException.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/maven/m2/SettingsConfigurationException.java Mon Aug 13 04:29:09 2012
@@ -45,7 +45,7 @@ public class SettingsConfigurationExcept
public SettingsConfigurationException( String message, Throwable cause, int lineNumber, int columnNumber )
{
super( message + ( lineNumber > 0 ? "\n Line: " + lineNumber : "" ) +
- ( columnNumber > 0 ? "\n Column: " + columnNumber : "" ), cause );
+ ( columnNumber > 0 ? "\n Column: " + columnNumber : "" ), cause );
this.lineNumber = lineNumber;
this.columnNumber = columnNumber;
}
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/execution/shell/ShellBuildExecutor.java Mon Aug 13 04:29:09 2012
@@ -68,14 +68,15 @@ public class ShellBuildExecutor
// ----------------------------------------------------------------------
public synchronized ContinuumBuildExecutionResult build( Project project, BuildDefinition buildDefinition,
- File buildOutput, List<Project> projectsWithCommonScmRoot, String projectScmRootUrl )
+ File buildOutput, List<Project> projectsWithCommonScmRoot,
+ String projectScmRootUrl )
throws ContinuumBuildExecutorException
{
// TODO: this should be validated earlier?
String executable = getBuildFileForProject( project, buildDefinition );
- return executeShellCommand( project, executable, buildDefinition.getArguments(), buildOutput,
- getEnvironments( buildDefinition ), null, null );
+ return executeShellCommand( project, executable, buildDefinition.getArguments(), buildOutput, getEnvironments(
+ buildDefinition ), null, null );
}
protected Map<String, String> getEnvironments( BuildDefinition buildDefinition )
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/initialization/DefaultContinuumInitializer.java Mon Aug 13 04:29:09 2012
@@ -19,9 +19,6 @@ package org.apache.maven.continuum.initi
* under the License.
*/
-import java.io.IOException;
-import java.util.Collection;
-
import org.apache.continuum.dao.LocalRepositoryDao;
import org.apache.continuum.dao.ProjectGroupDao;
import org.apache.continuum.dao.RepositoryPurgeConfigurationDao;
@@ -42,6 +39,9 @@ import org.jpox.SchemaTool;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.util.Collection;
+
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,6 @@ package org.apache.maven.continuum.notif
* under the License.
*/
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.dao.ProjectDao;
import org.apache.continuum.dao.ProjectGroupDao;
import org.apache.continuum.model.project.ProjectScmRoot;
@@ -37,6 +32,11 @@ import org.apache.maven.continuum.store.
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -124,8 +124,8 @@ public class DefaultContinuumNotificatio
// - scm results are used to detect if scm failed
project = projectDao.getProjectWithAllDetails( project.getId() );
- ProjectGroup projectGroup =
- projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId( project.getProjectGroup().getId() );
+ ProjectGroup projectGroup = projectGroupDao.getProjectGroupWithBuildDetailsByProjectGroupId(
+ project.getProjectGroup().getId() );
Map<String, List<ProjectNotifier>> notifiersMap = new HashMap<String, List<ProjectNotifier>>();
@@ -241,7 +241,7 @@ public class DefaultContinuumNotificatio
if ( !projectNotifier.isEnabled() )
{
log.info( projectNotifier.getType() + " projectNotifier (id=" + projectNotifier.getId() +
- ") is disabled." );
+ ") is disabled." );
continue;
}
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/FormatterTool.java Mon Aug 13 04:29:09 2012
@@ -19,11 +19,11 @@ package org.apache.maven.continuum.notif
* under the License.
*/
+import org.apache.maven.continuum.project.ContinuumProjectState;
+
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.apache.maven.continuum.project.ContinuumProjectState;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java Mon Aug 13 04:29:09 2012
@@ -19,25 +19,6 @@ package org.apache.maven.continuum.notif
* under the License.
*/
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-
import org.apache.continuum.model.project.ProjectScmRoot;
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.configuration.ConfigurationService;
@@ -73,6 +54,24 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.mail.javamail.JavaMailSender;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
@@ -115,6 +114,7 @@ public class MailContinuumNotifier
// ----------------------------------------------------------------------
// Configuration
// ----------------------------------------------------------------------
+
/**
* @plexus.configuration
*/
@@ -167,7 +167,8 @@ public class MailContinuumNotifier
*
* @plexus.configuration
*/
- private String prepareBuildSubjectFormat = "[continuum] PREPARE BUILD ${state]: ${projectScmRoot.projectGroup.name}";
+ private String prepareBuildSubjectFormat =
+ "[continuum] PREPARE BUILD ${state]: ${projectScmRoot.projectGroup.name}";
// ----------------------------------------------------------------------
//
@@ -254,19 +255,19 @@ public class MailContinuumNotifier
if ( build != null )
{
- log.error( "br state="+build.getState() );
+ log.error( "br state=" + build.getState() );
}
if ( project != null )
{
- log.error( "project state="+project.getState() );
+ log.error( "project state=" + project.getState() );
}
BuildDefinition buildDefinition = context.getBuildDefinition();
ProjectScmRoot projectScmRoot = context.getProjectScmRoot();
- boolean isPrepareBuildComplete =
- messageId.equals( ContinuumNotificationDispatcher.MESSAGE_ID_PREPARE_BUILD_COMPLETE );
+ boolean isPrepareBuildComplete = messageId.equals(
+ ContinuumNotificationDispatcher.MESSAGE_ID_PREPARE_BUILD_COMPLETE );
if ( projectScmRoot == null && isPrepareBuildComplete )
{
@@ -351,15 +352,15 @@ public class MailContinuumNotifier
{
context.put( "build", build );
- ReportTestResult reportTestResult =
- reportTestSuiteGenerator.generateReportTestResult( build.getId(), project.getId() );
+ ReportTestResult reportTestResult = reportTestSuiteGenerator.generateReportTestResult( build.getId(),
+ project.getId() );
context.put( "testResult", reportTestResult );
context.put( "project", project );
- context.put( "changesSinceLastSuccess",
- continuum.getChangesSinceLastSuccess( project.getId(), build.getId() ) );
+ context.put( "changesSinceLastSuccess", continuum.getChangesSinceLastSuccess( project.getId(),
+ build.getId() ) );
context.put( "previousBuild", previousBuild );
@@ -384,8 +385,8 @@ public class MailContinuumNotifier
context.put( "osName", osName );
- context.put( "javaVersion",
- System.getProperty( "java.version" ) + "(" + System.getProperty( "java.vendor" ) + ")" );
+ context.put( "javaVersion", System.getProperty( "java.version" ) + "(" + System.getProperty(
+ "java.vendor" ) + ")" );
// TODO only in case of a java project ?
context.put( "javaHomeInformations", getJavaHomeInformations( buildDefinition ) );
@@ -461,8 +462,8 @@ public class MailContinuumNotifier
// Data objects
// ----------------------------------------------------------------------
- context.put( "reportUrl",
- getReportUrl( projectScmRoot.getProjectGroup(), projectScmRoot, configurationService ) );
+ context.put( "reportUrl", getReportUrl( projectScmRoot.getProjectGroup(), projectScmRoot,
+ configurationService ) );
context.put( "projectScmRoot", projectScmRoot );
@@ -546,18 +547,18 @@ public class MailContinuumNotifier
// depends on ExecutorId
if ( MavenTwoBuildExecutor.ID.equals( project.getExecutorId() ) )
{
- executorConfigurator =
- continuum.getInstallationService().getExecutorConfigurator( InstallationService.MAVEN2_TYPE );
+ executorConfigurator = continuum.getInstallationService().getExecutorConfigurator(
+ InstallationService.MAVEN2_TYPE );
}
else if ( MavenOneBuildExecutor.ID.equals( project.getExecutorId() ) )
{
- executorConfigurator =
- continuum.getInstallationService().getExecutorConfigurator( InstallationService.MAVEN1_TYPE );
+ executorConfigurator = continuum.getInstallationService().getExecutorConfigurator(
+ InstallationService.MAVEN1_TYPE );
}
else if ( AntBuildExecutor.ID.equals( project.getExecutorId() ) )
{
- executorConfigurator =
- continuum.getInstallationService().getExecutorConfigurator( InstallationService.ANT_TYPE );
+ executorConfigurator = continuum.getInstallationService().getExecutorConfigurator(
+ InstallationService.ANT_TYPE );
}
else
{
@@ -597,8 +598,8 @@ public class MailContinuumNotifier
StringWriter writer = new StringWriter();
- boolean velocityResults =
- velocity.getEngine().evaluate( context, writer, "subjectPattern", prepareBuildSubjectFormat );
+ boolean velocityResults = velocity.getEngine().evaluate( context, writer, "subjectPattern",
+ prepareBuildSubjectFormat );
return writer.toString();
}
@@ -673,7 +674,7 @@ public class MailContinuumNotifier
if ( fromMailbox == null )
{
log.warn( project.getName() +
- ": Project is missing nag email and global from mailbox is missing, not sending mail." );
+ ": Project is missing nag email and global from mailbox is missing, not sending mail." );
return;
}
@@ -716,45 +717,48 @@ public class MailContinuumNotifier
String[] addresses = StringUtils.split( addressField, "," );
for ( String address : addresses )
{
- if (!listRecipents.contains(address.trim())) {
+ if ( !listRecipents.contains( address.trim() ) )
+ {
// [CONTINUUM-2281] Dont repeat addesss in recipents.
// TODO: set a proper name
- InternetAddress to = new InternetAddress(address.trim());
+ InternetAddress to = new InternetAddress( address.trim() );
- log.info("Recipient: To '" + to + "'.");
- message.addRecipient(Message.RecipientType.TO, to);
- listRecipents.add(address.trim());
+ log.info( "Recipient: To '" + to + "'." );
+ message.addRecipient( Message.RecipientType.TO, to );
+ listRecipents.add( address.trim() );
}
}
}
- if (context.getBuildResult() != null)
+ if ( context.getBuildResult() != null )
{
- String committerField = (String) notifier.getConfiguration().get(COMMITTER_FIELD);
- String developerField = (String) notifier.getConfiguration().get(DEVELOPER_FIELD);
+ String committerField = (String) notifier.getConfiguration().get( COMMITTER_FIELD );
+ String developerField = (String) notifier.getConfiguration().get( DEVELOPER_FIELD );
// Developers constains committers.
- if (StringUtils.isNotEmpty(developerField) && Boolean.parseBoolean(developerField))
+ if ( StringUtils.isNotEmpty( developerField ) && Boolean.parseBoolean( developerField ) )
{
List<ProjectDeveloper> developers = project.getDevelopers();
- if (developers == null || developers.isEmpty())
+ if ( developers == null || developers.isEmpty() )
{
- log.warn("No developers have been configured...notifcation email will not be sent");
+ log.warn(
+ "No developers have been configured...notifcation email will not be sent" );
return;
}
- Map<String, String> developerToEmailMap = mapDevelopersToRecipients(developers);
- for (String email : developerToEmailMap.values())
+ Map<String, String> developerToEmailMap = mapDevelopersToRecipients( developers );
+ for ( String email : developerToEmailMap.values() )
{
- if (!listRecipents.contains(email.trim()))
+ if ( !listRecipents.contains( email.trim() ) )
{
- InternetAddress to = new InternetAddress(email.trim());
- log.info("Recipient: To '" + to + "'.");
- message.addRecipient(Message.RecipientType.TO, to);
- listRecipents.add(email.trim());
+ InternetAddress to = new InternetAddress( email.trim() );
+ log.info( "Recipient: To '" + to + "'." );
+ message.addRecipient( Message.RecipientType.TO, to );
+ listRecipents.add( email.trim() );
}
}
- }
- else if (StringUtils.isNotEmpty(committerField) && Boolean.parseBoolean(committerField))
+ }
+ else if ( StringUtils.isNotEmpty( committerField ) && Boolean.parseBoolean(
+ committerField ) )
{
ScmResult scmResult = context.getBuildResult().getScmResult();
if ( scmResult != null && scmResult.getChanges() != null &&
@@ -764,7 +768,7 @@ public class MailContinuumNotifier
if ( developers == null || developers.isEmpty() )
{
log.warn( "No developers have been configured...notifcation email " +
- "will not be sent" );
+ "will not be sent" );
return;
}
@@ -775,7 +779,7 @@ public class MailContinuumNotifier
for ( ChangeSet changeSet : changes )
{
String scmId = changeSet.getAuthor();
- if (StringUtils.isNotEmpty(scmId))
+ if ( StringUtils.isNotEmpty( scmId ) )
{
String email = developerToEmailMap.get( scmId );
if ( StringUtils.isEmpty( email ) )
@@ -785,15 +789,15 @@ public class MailContinuumNotifier
"no email address is defined in developers list for '" + scmId +
"' scm id." );
}
- else if (!listRecipents.contains(email.trim()))
- {
+ else if ( !listRecipents.contains( email.trim() ) )
+ {
// [CONTINUUM-2281] Dont repeat addesss in recipents.)
// TODO: set a proper name
InternetAddress to = new InternetAddress( email.trim() );
log.info( "Recipient: To '" + to + "'." );
message.addRecipient( Message.RecipientType.TO, to );
- listRecipents.add(email.trim());
+ listRecipents.add( email.trim() );
}
}
}
@@ -855,7 +859,7 @@ public class MailContinuumNotifier
if ( fromMailbox == null )
{
log.warn( projectGroup.getName() +
- ": ProjectGroup is missing nag email and global from mailbox is missing, not sending mail." );
+ ": ProjectGroup is missing nag email and global from mailbox is missing, not sending mail." );
return;
}
Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/manager/NotifierManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/manager/NotifierManager.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/manager/NotifierManager.java (original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/manager/NotifierManager.java Mon Aug 13 04:29:09 2012
@@ -27,5 +27,5 @@ import org.apache.maven.continuum.notifi
*/
public interface NotifierManager
{
- Notifier getNotifier(String notifierId);
+ Notifier getNotifier( String notifierId );
}