Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 41630 invoked from network); 14 Apr 2009 16:28:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Apr 2009 16:28:52 -0000 Received: (qmail 52389 invoked by uid 500); 14 Apr 2009 16:28:51 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 52351 invoked by uid 500); 14 Apr 2009 16:28:51 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 52323 invoked by uid 99); 14 Apr 2009 16:28:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Apr 2009 16:28:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Apr 2009 16:28:42 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1DC7B23889C4; Tue, 14 Apr 2009 16:28:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r764863 [2/5] - in /continuum/branches/continuum-1.3.x: continuum-api/src/main/java/org/apache/continuum/taskqueue/ continuum-api/src/main/java/org/apache/continuum/utils/shell/ continuum-api/src/main/java/org/apache/maven/continuum/build/s... Date: Tue, 14 Apr 2009 16:28:17 -0000 To: commits@continuum.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090414162822.1DC7B23889C4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentReleaseManager.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentReleaseManager.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentReleaseManager.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentReleaseManager.java Tue Apr 14 16:28:12 2009 @@ -47,7 +47,7 @@ public class DefaultBuildAgentReleaseManager implements BuildAgentReleaseManager { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( DefaultBuildAgentReleaseManager.class ); /** * @plexus.requirement @@ -64,7 +64,8 @@ */ BuildAgentInstallationService buildAgentInstallationService; - public String releasePrepare( Map projectMap, Map properties, Map releaseVersion, Map developmentVersion, Map environments ) + public String releasePrepare( Map projectMap, Map properties, Map releaseVersion, Map developmentVersion, + Map environments ) throws ContinuumReleaseException { Project project = getProject( projectMap ); @@ -75,11 +76,14 @@ String workingDirectory = buildAgentConfigurationService.getWorkingDirectory( project.getId() ).getPath(); - String executable = buildAgentInstallationService.getExecutorConfigurator( BuildAgentInstallationService.MAVEN2_TYPE ).getExecutable(); + String executable = buildAgentInstallationService.getExecutorConfigurator( + BuildAgentInstallationService.MAVEN2_TYPE ).getExecutable(); if ( environments != null ) { - String m2Home = environments.get( buildAgentInstallationService.getEnvVar( BuildAgentInstallationService.MAVEN2_TYPE ) ); + String m2Home = + environments.get( buildAgentInstallationService.getEnvVar( BuildAgentInstallationService.MAVEN2_TYPE ) ) + ; if ( StringUtils.isNotEmpty( m2Home ) ) { executable = m2Home + File.separator + "bin" + File.separator + executable; @@ -103,15 +107,16 @@ return (ReleaseResult) releaseManager.getReleaseResults().get( releaseId ); } - public Map getListener( String releaseId ) + public Map getListener( String releaseId ) { - ContinuumReleaseManagerListener listener = (ContinuumReleaseManagerListener) releaseManager.getListeners().get( releaseId ); + ContinuumReleaseManagerListener listener = + (ContinuumReleaseManagerListener) releaseManager.getListeners().get( releaseId ); - Map map = new HashMap(); + Map map = new HashMap(); if ( listener != null ) - { - map.put( ContinuumBuildAgentUtil.KEY_RELEASE_STATE, new Integer( listener.getState() ) ); + { + map.put( ContinuumBuildAgentUtil.KEY_RELEASE_STATE, listener.getState() ); if ( listener.getPhases() != null ) { map.put( ContinuumBuildAgentUtil.KEY_RELEASE_PHASES, listener.getPhases() ); @@ -151,7 +156,8 @@ return ""; } - public void releasePerform( String releaseId, String goals, String arguments, boolean useReleaseProfile, Map repository ) + public void releasePerform( String releaseId, String goals, String arguments, boolean useReleaseProfile, + Map repository ) throws ContinuumReleaseException { ContinuumReleaseManagerListener listener = new DefaultReleaseManagerListener(); @@ -166,15 +172,16 @@ repo.setLocation( ContinuumBuildAgentUtil.getLocalRepository( repository ) ); } - File performDirectory = new File( buildAgentConfigurationService.getWorkingDirectory(), - "releases-" + System.currentTimeMillis() ); + File performDirectory = + new File( buildAgentConfigurationService.getWorkingDirectory(), "releases-" + System.currentTimeMillis() ); performDirectory.mkdirs(); releaseManager.perform( releaseId, performDirectory, goals, arguments, useReleaseProfile, listener, repo ); } - public String releasePerformFromScm( String goals, String arguments, boolean useReleaseProfile, Map repository, String scmUrl, - String scmUsername, String scmPassword, String scmTag, String scmTagBase, Map environments ) + public String releasePerformFromScm( String goals, String arguments, boolean useReleaseProfile, Map repository, + String scmUrl, String scmUsername, String scmPassword, String scmTag, + String scmTagBase, Map environments ) throws ContinuumReleaseException { ContinuumReleaseDescriptor descriptor = new ContinuumReleaseDescriptor(); @@ -222,7 +229,8 @@ { ContinuumReleaseManagerListener listener = new DefaultReleaseManagerListener(); - releaseManager.rollback( releaseId, buildAgentConfigurationService.getWorkingDirectory( projectId ).getPath(), listener ); + releaseManager.rollback( releaseId, buildAgentConfigurationService.getWorkingDirectory( projectId ).getPath(), + listener ); //recurse until rollback is finished while ( listener.getState() != ContinuumReleaseManagerListener.FINISHED ) @@ -291,7 +299,7 @@ } prop = ContinuumBuildAgentUtil.getScmCommentPrefix( context ); - if ( StringUtils.isNotBlank( prop ) ); + if ( StringUtils.isNotBlank( prop ) ) { props.put( "commentPrefix", prop ); } @@ -301,7 +309,7 @@ { props.put( "tag", prop ); } - + prop = ContinuumBuildAgentUtil.getPrepareGoals( context ); if ( StringUtils.isNotBlank( prop ) ) { @@ -334,5 +342,5 @@ return props; } - + } Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/PrepareBuildProjectsTask.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/PrepareBuildProjectsTask.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/PrepareBuildProjectsTask.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/PrepareBuildProjectsTask.java Tue Apr 14 16:28:12 2009 @@ -27,15 +27,16 @@ public class PrepareBuildProjectsTask implements Task { - private List buildContexts; + private final List buildContexts; - private int trigger; + private final int trigger; - private int projectGroupId; + private final int projectGroupId; - private String scmRootAddress; + private final String scmRootAddress; - public PrepareBuildProjectsTask( List buildContexts, int trigger, int projectGroupId, String scmRootAddress ) + public PrepareBuildProjectsTask( List buildContexts, int trigger, int projectGroupId, + String scmRootAddress ) { this.buildContexts = buildContexts; this.trigger = trigger; Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java Tue Apr 14 16:28:12 2009 @@ -69,7 +69,7 @@ public class BuildProjectTaskExecutor implements TaskExecutor { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( BuildProjectTaskExecutor.class ); /** * @plexus.requirement @@ -124,8 +124,6 @@ try { - Map actionContext = context.getActionContext(); - try { performAction( "update-project-from-agent-working-directory", context ); @@ -398,7 +396,7 @@ private boolean shouldBuild( BuildContext context ) throws TaskExecutionException { - Map map = new HashMap(); + Map map = new HashMap(); map.put( ContinuumBuildAgentUtil.KEY_PROJECT_ID, context.getProjectId() ); map.put( ContinuumBuildAgentUtil.KEY_BUILD_DEFINITION_ID, context.getBuildDefinitionId() ); map.put( ContinuumBuildAgentUtil.KEY_TRIGGER, context.getTrigger() ); @@ -422,7 +420,7 @@ private List getScmChanges( ScmResult scmResult ) { - List scmChanges = new ArrayList(); + List> scmChanges = new ArrayList>(); if ( scmResult != null && scmResult.getChanges() != null ) { @@ -430,7 +428,7 @@ { ChangeSet changeSet = (ChangeSet) obj; - Map map = new HashMap(); + Map map = new HashMap(); if ( StringUtils.isNotEmpty( changeSet.getAuthor() ) ) { map.put( ContinuumBuildAgentUtil.KEY_CHANGESET_AUTHOR, changeSet.getAuthor() ); @@ -459,15 +457,15 @@ return scmChanges; } - private List getScmChangeFiles( List files ) + private List> getScmChangeFiles( List files ) { - List scmChangeFiles = new ArrayList(); + List> scmChangeFiles = new ArrayList>(); if ( files != null ) { for ( ChangeFile changeFile : files ) { - Map map = new HashMap(); + Map map = new HashMap(); if ( StringUtils.isNotEmpty( changeFile.getName() ) ) { @@ -502,7 +500,7 @@ private Map getMavenProject( BuildContext context ) throws TaskExecutionException { - Map mavenProject = new HashMap(); + Map mavenProject = new HashMap(); try { Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/PrepareBuildProjectsTaskExecutor.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/PrepareBuildProjectsTaskExecutor.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/PrepareBuildProjectsTaskExecutor.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/PrepareBuildProjectsTaskExecutor.java Tue Apr 14 16:28:12 2009 @@ -53,7 +53,7 @@ public class PrepareBuildProjectsTaskExecutor implements TaskExecutor { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( PrepareBuildProjectsTaskExecutor.class ); /** * @plexus.requirement @@ -351,7 +351,7 @@ private void performAction( String actionName, BuildContext buildContext ) throws TaskExecutionException { - TaskExecutionException exception = null; + TaskExecutionException exception; try { @@ -382,7 +382,7 @@ private void mergeScmResults( BuildContext buildContext ) { - Map context = buildContext.getActionContext(); + Map context = buildContext.getActionContext(); ScmResult oldScmResult = ContinuumBuildAgentUtil.getOldScmResult( context, null ); ScmResult newScmResult = ContinuumBuildAgentUtil.getScmResult( context, null ); Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/manager/DefaultBuildAgentTaskQueueManager.java Tue Apr 14 16:28:12 2009 @@ -43,7 +43,7 @@ public class DefaultBuildAgentTaskQueueManager implements BuildAgentTaskQueueManager, Contextualizable { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( DefaultBuildAgentTaskQueueManager.class ); /** * @plexus.requirement role-hint="build-agent" @@ -87,14 +87,14 @@ { return buildAgentPrepareBuildQueue; } - + private void removeProjectsFromBuildQueue() throws TaskQueueManagerException { try { List queues = buildAgentBuildQueue.getQueueSnapshot(); - + if ( queues != null ) { for ( BuildProjectTask task : queues ) @@ -118,7 +118,7 @@ throws TaskQueueManagerException { Task task = getBuildTaskQueueExecutor().getCurrentTask(); - + if ( task != null ) { if ( task instanceof BuildProjectTask ) @@ -174,7 +174,7 @@ try { List queues = buildAgentBuildQueue.getQueueSnapshot(); - + if ( queues != null ) { for ( BuildProjectTask task : queues ) @@ -205,12 +205,13 @@ try { List queues = buildAgentPrepareBuildQueue.getQueueSnapshot(); - + if ( queues != null ) { for ( PrepareBuildProjectsTask task : queues ) { - if ( task.getProjectGroupId() == projectGroupId && task.getTrigger() == trigger && task.getScmRootAddress().equals( scmRootAddress ) ) + if ( task.getProjectGroupId() == projectGroupId && task.getTrigger() == trigger && + task.getScmRootAddress().equals( scmRootAddress ) ) { log.info( "projects already in build queue" ); return true; Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java Tue Apr 14 16:28:12 2009 @@ -23,6 +23,7 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -573,27 +574,17 @@ } else { - List list = new ArrayList(); + List list = new ArrayList(); if ( obj instanceof Object[] ) { Object[] objA = (Object[]) obj; - for ( Object o : objA ) - { - if ( o instanceof Map ) - { - list.add( (Map) o ); - } - else - { - list.add( o ); - } - } + list.addAll( Arrays.asList( objA ) ); } else { - list = (List) obj; + list = (List) obj; } return list; @@ -744,9 +735,9 @@ return result; } - private static List getScmChanges( ScmResult scmResult ) + private static List> getScmChanges( ScmResult scmResult ) { - List scmChanges = new ArrayList(); + List> scmChanges = new ArrayList>(); List changes = scmResult.getChanges(); @@ -754,7 +745,7 @@ { for ( ChangeSet cs : changes ) { - Map changeSet = new HashMap(); + Map changeSet = new HashMap(); if ( StringUtils.isNotEmpty( cs.getAuthor() ) ) { @@ -785,15 +776,15 @@ return scmChanges; } - private static List getChangeFiles( List changeFiles ) + private static List> getChangeFiles( List changeFiles ) { - List files = new ArrayList(); + List> files = new ArrayList>(); if ( changeFiles != null ) { for ( ChangeFile file : changeFiles ) { - Map changeFile = new HashMap(); + Map changeFile = new HashMap(); if ( StringUtils.isNotEmpty( file.getName() ) ) { changeFile.put( ContinuumBuildAgentUtil.KEY_CHANGEFILE_NAME, file.getName() ); Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/WorkingCopyContentGenerator.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/WorkingCopyContentGenerator.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/WorkingCopyContentGenerator.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/WorkingCopyContentGenerator.java Tue Apr 14 16:28:12 2009 @@ -14,12 +14,12 @@ */ public class WorkingCopyContentGenerator { + private static final DecimalFormat decFormatter = new DecimalFormat( "###.##" ); + private File basedir; private String urlParamSeparator; - private static DecimalFormat decFormatter = new DecimalFormat( "###.##" ); - private static final long KILO = 1024; private static final long MEGA = 1024 * KILO; Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/java/org/apache/continuum/web/startup/BuildAgentStartup.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/java/org/apache/continuum/web/startup/BuildAgentStartup.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/java/org/apache/continuum/web/startup/BuildAgentStartup.java (original) +++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-webapp/src/main/java/org/apache/continuum/web/startup/BuildAgentStartup.java Tue Apr 14 16:28:12 2009 @@ -13,9 +13,9 @@ public class BuildAgentStartup implements ServletContextListener { - private Logger log = LoggerFactory.getLogger( getClass() ); - - /** + private static final Logger log = LoggerFactory.getLogger( BuildAgentStartup.class ); + + /** * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent) */ public void contextDestroyed( ServletContextEvent sce ) @@ -23,30 +23,30 @@ // nothing to do here } - - /** + + /** * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent) */ public void contextInitialized( ServletContextEvent sce ) { log.info( "Initializing Build Agent Task Queue Executor" ); - WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext( sce - .getServletContext() ); - - TaskQueueExecutor buildAgent = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils - .buildSpringId( TaskQueueExecutor.class, "build-agent" ) ); - - TaskQueueExecutor prepareBuildAgent = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils - .buildSpringId( TaskQueueExecutor.class, "prepare-build-agent" ) ); + WebApplicationContext wac = + WebApplicationContextUtils.getRequiredWebApplicationContext( sce.getServletContext() ); + + TaskQueueExecutor buildAgent = (TaskQueueExecutor) wac.getBean( + PlexusToSpringUtils.buildSpringId( TaskQueueExecutor.class, "build-agent" ) ); + + TaskQueueExecutor prepareBuildAgent = (TaskQueueExecutor) wac.getBean( + PlexusToSpringUtils.buildSpringId( TaskQueueExecutor.class, "prepare-build-agent" ) ); - TaskQueueExecutor prepareRelease = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils - .buildSpringId( TaskQueueExecutor.class, "prepare-release" ) ); + TaskQueueExecutor prepareRelease = (TaskQueueExecutor) wac.getBean( + PlexusToSpringUtils.buildSpringId( TaskQueueExecutor.class, "prepare-release" ) ); - TaskQueueExecutor performRelease = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils - .buildSpringId( TaskQueueExecutor.class, "perform-release" ) ); + TaskQueueExecutor performRelease = (TaskQueueExecutor) wac.getBean( + PlexusToSpringUtils.buildSpringId( TaskQueueExecutor.class, "perform-release" ) ); - TaskQueueExecutor rollbackRelease = (TaskQueueExecutor) wac.getBean( PlexusToSpringUtils - .buildSpringId( TaskQueueExecutor.class, "rollback-release" ) ); + TaskQueueExecutor rollbackRelease = (TaskQueueExecutor) wac.getBean( + PlexusToSpringUtils.buildSpringId( TaskQueueExecutor.class, "rollback-release" ) ); } } Modified: continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java (original) +++ continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/DistributedBuildProjectTaskExecutor.java Tue Apr 14 16:28:12 2009 @@ -57,7 +57,7 @@ public class DistributedBuildProjectTaskExecutor implements DistributedBuildTaskExecutor { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( DistributedBuildProjectTaskExecutor.class ); private String buildAgentUrl; @@ -105,9 +105,9 @@ SlaveBuildAgentTransportClient client = new SlaveBuildAgentTransportClient( new URL( buildAgentUrl ) ); log.info( "initializing buildContext" ); - List buildContext = initializeBuildContext( prepareBuildTask.getProjectsBuildDefinitionsMap(), - prepareBuildTask.getTrigger(), - prepareBuildTask.getScmRootAddress() ); + List> buildContext = + initializeBuildContext( prepareBuildTask.getProjectsBuildDefinitionsMap(), + prepareBuildTask.getTrigger(), prepareBuildTask.getScmRootAddress() ); startTime = System.currentTimeMillis(); client.buildProjects( buildContext ); @@ -126,11 +126,11 @@ } } - private List initializeBuildContext( Map projectsAndBuildDefinitions, int trigger, - String scmRootAddress ) + private List> initializeBuildContext( Map projectsAndBuildDefinitions, + int trigger, String scmRootAddress ) throws ContinuumException { - List buildContext = new ArrayList(); + List> buildContext = new ArrayList>(); List projects = new ArrayList(); try @@ -156,7 +156,7 @@ BuildDefinition buildDef = buildDefinitionDao.getBuildDefinition( buildDefinitionId ); BuildResult buildResult = buildResultDao.getLatestBuildResultForProject( project.getId() ); - Map context = new HashMap(); + Map context = new HashMap(); context.put( ContinuumBuildConstant.KEY_PROJECT_GROUP_ID, project.getProjectGroup().getId() ); context.put( ContinuumBuildConstant.KEY_PROJECT_GROUP_NAME, project.getProjectGroup().getName() ); @@ -303,9 +303,9 @@ return scmChanges; } - private List getScmChanges( ScmResult scmResult ) + private List> getScmChanges( ScmResult scmResult ) { - List scmChanges = new ArrayList(); + List> scmChanges = new ArrayList>(); if ( scmResult != null && scmResult.getChanges() != null ) { @@ -313,7 +313,7 @@ { ChangeSet changeSet = (ChangeSet) obj; - Map map = new HashMap(); + Map map = new HashMap(); if ( StringUtils.isNotEmpty( changeSet.getAuthor() ) ) { map.put( ContinuumBuildConstant.KEY_CHANGESET_AUTHOR, changeSet.getAuthor() ); @@ -342,15 +342,15 @@ return scmChanges; } - private List getScmChangeFiles( List files ) + private List> getScmChangeFiles( List files ) { - List scmChangeFiles = new ArrayList(); + List> scmChangeFiles = new ArrayList>(); if ( files != null ) { for ( ChangeFile changeFile : files ) { - Map map = new HashMap(); + Map map = new HashMap(); if ( StringUtils.isNotEmpty( changeFile.getName() ) ) { Modified: continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java (original) +++ continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/ThreadedDistributedBuildTaskQueueExecutor.java Tue Apr 14 16:28:12 2009 @@ -49,7 +49,7 @@ private static final int CANCEL_TASK = 2; - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( ThreadedDistributedBuildTaskQueueExecutor.class ); /** * @requirement Modified: continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/deferred/DistributedBuildProjectTaskExecutorDeferred.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/deferred/DistributedBuildProjectTaskExecutorDeferred.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/deferred/DistributedBuildProjectTaskExecutorDeferred.java (original) +++ continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/deferred/DistributedBuildProjectTaskExecutorDeferred.java Tue Apr 14 16:28:12 2009 @@ -10,7 +10,7 @@ public class DistributedBuildProjectTaskExecutorDeferred implements TaskExecutor { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( DistributedBuildProjectTaskExecutorDeferred.class ); /** * @plexus.requirement Modified: continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/overall/DistributedBuildProjectTaskExecutorOverall.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/overall/DistributedBuildProjectTaskExecutorOverall.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/overall/DistributedBuildProjectTaskExecutorOverall.java (original) +++ continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/distributed/executor/overall/DistributedBuildProjectTaskExecutorOverall.java Tue Apr 14 16:28:12 2009 @@ -19,11 +19,6 @@ import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.model.system.Profile; import org.apache.maven.continuum.store.ContinuumStoreException; -import org.codehaus.plexus.PlexusConstants; -import org.codehaus.plexus.PlexusContainer; -import org.codehaus.plexus.context.Context; -import org.codehaus.plexus.context.ContextException; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; import org.codehaus.plexus.taskqueue.Task; import org.codehaus.plexus.taskqueue.TaskQueue; import org.codehaus.plexus.taskqueue.execution.TaskExecutionException; @@ -34,9 +29,9 @@ import org.slf4j.LoggerFactory; public class DistributedBuildProjectTaskExecutorOverall - implements TaskExecutor, Contextualizable + implements TaskExecutor { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( DistributedBuildProjectTaskExecutorOverall.class ); /** * @plexus.requirement @@ -63,8 +58,6 @@ */ private TaskQueue deferredTaskQueue; - PlexusContainer container; - public void executeTask( Task task ) throws TaskExecutionException { @@ -74,7 +67,7 @@ Map executors = buildManager.getTaskQueueExecutors(); - DistributedBuildTaskQueueExecutor executor = filterExecutors( agentGroup, executors ); + DistributedBuildTaskQueueExecutor executor = filterExecutors( agentGroup, executors ); if ( executor != null ) { log.info( "delegating task to build agent task queue executor: " + executor.getBuildAgentUrl() ); @@ -99,7 +92,8 @@ } } - private DistributedBuildTaskQueueExecutor filterExecutors( Map executors ) + private DistributedBuildTaskQueueExecutor filterExecutors( + Map executors ) { // return the first non-busy taskqueue executor for ( String url : executors.keySet() ) @@ -112,10 +106,7 @@ // else return the first executor if ( !executors.isEmpty() ) { - for ( String url : executors.keySet() ) - { - return executors.get( url ); - } + return executors.values().iterator().next(); } return null; } @@ -200,13 +191,4 @@ return null; } - - // -------------------------------- - // Plexus Lifecycle - // -------------------------------- - public void contextualize( Context context ) - throws ContextException - { - container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY ); - } } Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java Tue Apr 14 16:28:12 2009 @@ -63,7 +63,6 @@ import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher; import org.apache.maven.continuum.project.ContinuumProjectState; import org.apache.maven.continuum.store.ContinuumStoreException; - import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.component.repository.exception.ComponentLifecycleException; @@ -85,7 +84,7 @@ public class DefaultDistributedBuildManager implements DistributedBuildManager, Contextualizable, Initializable { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( DefaultDistributedBuildManager.class ); /** * @plexus.requirement @@ -497,7 +496,7 @@ { SlaveBuildAgentTransportClient client = new SlaveBuildAgentTransportClient( new URL( buildAgentUrl ) ); - List installationsList = client.getAvailableInstallations(); + List> installationsList = client.getAvailableInstallations(); for ( Map context : installationsList ) { Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/buildmanager/ParallelBuildsManager.java Tue Apr 14 16:28:12 2009 @@ -31,8 +31,8 @@ import org.apache.continuum.buildqueue.BuildQueueService; import org.apache.continuum.buildqueue.BuildQueueServiceException; import org.apache.continuum.dao.BuildDefinitionDao; -import org.apache.continuum.taskqueue.CheckOutTask; import org.apache.continuum.taskqueue.BuildProjectTask; +import org.apache.continuum.taskqueue.CheckOutTask; import org.apache.continuum.taskqueue.OverallBuildQueue; import org.apache.continuum.taskqueue.PrepareBuildProjectsTask; import org.apache.continuum.taskqueueexecutor.ParallelBuildsThreadedTaskQueueExecutor; @@ -67,7 +67,7 @@ public class ParallelBuildsManager implements BuildsManager, Contextualizable { - private Logger log = LoggerFactory.getLogger( ParallelBuildsManager.class ); + private static final Logger log = LoggerFactory.getLogger( ParallelBuildsManager.class ); // map must be synchronized! private Map overallBuildQueues = @@ -112,7 +112,7 @@ } OverallBuildQueue overallBuildQueue = - getOverallBuildQueue( projectId, BUILD_QUEUE, buildDefinition.getSchedule().getBuildQueues() ); + getOverallBuildQueue( BUILD_QUEUE, buildDefinition.getSchedule().getBuildQueues() ); String buildDefinitionLabel = buildDefinition.getDescription(); if ( StringUtils.isEmpty( buildDefinitionLabel ) ) @@ -157,7 +157,6 @@ catch ( TaskQueueException e ) { log.warn( "Error occurred while verifying if project is already queued." ); - continue; } } @@ -165,7 +164,7 @@ { BuildDefinition buildDef = projectsBuildDefinitionsMap.get( firstProjectId ); OverallBuildQueue overallBuildQueue = - getOverallBuildQueue( firstProjectId, BUILD_QUEUE, buildDef.getSchedule().getBuildQueues() ); + getOverallBuildQueue( BUILD_QUEUE, buildDef.getSchedule().getBuildQueues() ); if ( overallBuildQueue != null ) { @@ -230,7 +229,7 @@ { synchronized ( overallBuildQueues ) { - OverallBuildQueue overallBuildQueue = null; + OverallBuildQueue overallBuildQueue; overallBuildQueue = overallBuildQueues.get( buildQueueId ); if ( overallBuildQueue != null ) { @@ -274,7 +273,7 @@ synchronized ( overallBuildQueues ) { Set keySet = overallBuildQueues.keySet(); - OverallBuildQueue overallBuildQueue = null; + OverallBuildQueue overallBuildQueue; for ( Integer key : keySet ) { overallBuildQueue = overallBuildQueues.get( key ); @@ -389,7 +388,7 @@ } OverallBuildQueue overallBuildQueue = - getOverallBuildQueue( projectId, CHECKOUT_QUEUE, defaultBuildDefinition.getSchedule().getBuildQueues() ); + getOverallBuildQueue( CHECKOUT_QUEUE, defaultBuildDefinition.getSchedule().getBuildQueues() ); CheckOutTask checkoutTask = new CheckOutTask( projectId, workingDirectory, projectName, scmUsername, scmPassword ); try @@ -496,7 +495,7 @@ { if ( task != null ) { - Map map = ( (PrepareBuildProjectsTask) task ).getProjectsBuildDefinitionsMap(); + Map map = task.getProjectsBuildDefinitionsMap(); if ( map.size() > 0 ) { @@ -658,13 +657,11 @@ else { log.error( "Project '" + projectId + "' not found in any of the build queues." ); - continue; } } catch ( TaskQueueException e ) { log.error( "Error occurred while removing project '" + projectId + "' from build queue." ); - continue; } } } @@ -687,13 +684,11 @@ else { log.error( "Project '" + projectId + "' not found in any of the checkout queues." ); - continue; } } catch ( TaskQueueException e ) { log.error( "Error occurred while removing project '" + projectId + "' from checkout queue." ); - continue; } } } @@ -806,8 +801,8 @@ public void removeOverallBuildQueue( int overallBuildQueueId ) throws BuildManagerException { - List tasks = null; - List checkoutTasks = null; + List tasks; + List checkoutTasks; synchronized ( overallBuildQueues ) { @@ -870,7 +865,6 @@ catch ( ContinuumStoreException e ) { log.error( "Unable to queue build task for project '" + buildTask.getProjectName() + "'" ); - continue; } } @@ -885,7 +879,6 @@ catch ( ContinuumStoreException e ) { log.error( "Unable to queue checkout task for project '" + task.getProjectName() + "'" ); - continue; } } } @@ -1115,7 +1108,7 @@ } // get overall queue where project will be queued - private OverallBuildQueue getOverallBuildQueue( int projectId, int typeOfQueue, List buildQueues ) + private OverallBuildQueue getOverallBuildQueue( int typeOfQueue, List buildQueues ) throws BuildManagerException { OverallBuildQueue whereToBeQueued = null; @@ -1238,7 +1231,7 @@ this.container = container; } - private OverallBuildQueue createOverallBuildQueue( BuildQueue defaultBuildQueue ) + private void createOverallBuildQueue( BuildQueue defaultBuildQueue ) throws ComponentLookupException { OverallBuildQueue overallBuildQueue = (OverallBuildQueue) container.lookup( OverallBuildQueue.class ); @@ -1246,8 +1239,6 @@ overallBuildQueue.setName( defaultBuildQueue.getName() ); overallBuildQueues.put( overallBuildQueue.getId(), overallBuildQueue ); - - return overallBuildQueue; } public TaskQueue getPrepareBuildQueue() Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/release/distributed/DistributedReleaseUtil.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/release/distributed/DistributedReleaseUtil.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/release/distributed/DistributedReleaseUtil.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/release/distributed/DistributedReleaseUtil.java Tue Apr 14 16:28:12 2009 @@ -20,6 +20,7 @@ */ import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -235,12 +236,12 @@ public static boolean getBoolean( Map context, String key ) { - return ( (Boolean) getObject( context, key ) ).booleanValue(); + return (Boolean) getObject( context, key ); } - + public static boolean getBoolean( Map context, String key, boolean defaultValue ) { - return ( (Boolean) getObject( context, key, Boolean.valueOf( defaultValue ) ) ).booleanValue(); + return (Boolean) getObject( context, key, defaultValue ); } public static List getList( Map context, String key, Object defaultValue ) @@ -253,27 +254,17 @@ } else { - List list = new ArrayList(); + List list = new ArrayList(); if ( obj instanceof Object[] ) { Object[] objA = (Object[]) obj; - - for ( Object o : objA ) - { - if ( o instanceof Map ) - { - list.add( (Map) o ); - } - else - { - list.add( o ); - } - } + + list.addAll( Arrays.asList( objA ) ); } else { - list = (List) obj; + list = (List) obj; } return list; Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/release/distributed/manager/DefaultDistributedReleaseManager.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/release/distributed/manager/DefaultDistributedReleaseManager.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/release/distributed/manager/DefaultDistributedReleaseManager.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/release/distributed/manager/DefaultDistributedReleaseManager.java Tue Apr 14 16:28:12 2009 @@ -59,7 +59,7 @@ public class DefaultDistributedReleaseManager implements DistributedReleaseManager { - private Logger log = LoggerFactory.getLogger( this.getClass() ); + private static final Logger log = LoggerFactory.getLogger( DefaultDistributedReleaseManager.class ); public final String PREPARED_RELEASES_FILENAME = "prepared-releases.xml"; @@ -78,7 +78,7 @@ */ ConfigurationService configurationService; - private Map releasesInProgress; + private Map> releasesInProgress; public Map getReleasePluginParameters( int projectId, String pomFilename ) throws ContinuumReleaseException, BuildAgentConfigurationException @@ -99,8 +99,8 @@ } catch ( MalformedURLException e ) { - log.error( "Invalid build agent url " + buildAgentUrl ); - throw new ContinuumReleaseException( "Invalid build agent url " + buildAgentUrl ); + log.error( "Invalid build agent url " + buildAgentUrl ); + throw new ContinuumReleaseException( "Invalid build agent url " + buildAgentUrl ); } catch ( Exception e ) { @@ -138,7 +138,7 @@ } } - public String releasePrepare( Project project, Properties releaseProperties, Map releaseVersion, + public String releasePrepare( Project project, Properties releaseProperties, Map releaseVersion, Map developmentVersion, Map environments ) throws ContinuumReleaseException, BuildAgentConfigurationException { @@ -154,8 +154,9 @@ try { SlaveBuildAgentTransportClient client = new SlaveBuildAgentTransportClient( new URL( buildAgentUrl ) ); - String releaseId = client.releasePrepare( createProjectMap( project ), createPropertiesMap( releaseProperties ), - releaseVersion, developmentVersion, environments ); + String releaseId = + client.releasePrepare( createProjectMap( project ), createPropertiesMap( releaseProperties ), + releaseVersion, developmentVersion, environments ); addReleasePrepare( releaseId, buildAgentUrl, releaseVersion.get( releaseId ) ); @@ -292,8 +293,8 @@ } } - public void releasePerform( int projectId, String releaseId, String goals, String arguments, boolean useReleaseProfile, - LocalRepository repository ) + public void releasePerform( int projectId, String releaseId, String goals, String arguments, + boolean useReleaseProfile, LocalRepository repository ) throws ContinuumReleaseException, BuildAgentConfigurationException { String buildAgentUrl = getBuildAgentUrl( releaseId ); @@ -313,7 +314,7 @@ arguments = ""; } - Map map = new HashMap(); + Map map = new HashMap(); if ( repository != null ) { @@ -321,7 +322,7 @@ map.put( DistributedReleaseUtil.KEY_LOCAL_REPOSITORY_NAME, repository.getName() ); map.put( DistributedReleaseUtil.KEY_LOCAL_REPOSITORY_LAYOUT, repository.getLayout() ); } - + try { SlaveBuildAgentTransportClient client = new SlaveBuildAgentTransportClient( new URL( buildAgentUrl ) ); @@ -341,8 +342,9 @@ } } - public void releasePerformFromScm( int projectId, String goals, String arguments, boolean useReleaseProfile, LocalRepository repository, - String scmUrl, String scmUsername, String scmPassword, String scmTag, String scmTagBase, Map environments ) + public void releasePerformFromScm( int projectId, String goals, String arguments, boolean useReleaseProfile, + LocalRepository repository, String scmUrl, String scmUsername, + String scmPassword, String scmTag, String scmTagBase, Map environments ) throws ContinuumReleaseException, BuildAgentConfigurationException { BuildResult buildResult = buildResultDao.getLatestBuildResultForProject( projectId ); @@ -364,7 +366,7 @@ arguments = ""; } - Map map = new HashMap(); + Map map = new HashMap(); if ( repository != null ) { @@ -376,8 +378,9 @@ try { SlaveBuildAgentTransportClient client = new SlaveBuildAgentTransportClient( new URL( buildAgentUrl ) ); - String releaseId = client.releasePerformFromScm( goals, arguments, useReleaseProfile, map, scmUrl, scmUsername, scmPassword, - scmTag, scmTagBase, environments ); + String releaseId = + client.releasePerformFromScm( goals, arguments, useReleaseProfile, map, scmUrl, scmUsername, + scmPassword, scmTag, scmTagBase, environments ); addReleaseInProgress( releaseId, "perform", projectId ); } @@ -454,8 +457,8 @@ throws ContinuumReleaseException, BuildAgentConfigurationException { List releases = new ArrayList(); - Map releasesMap = new HashMap(); - + Map> releasesMap = new HashMap>(); + if ( releasesInProgress != null && !releasesInProgress.isEmpty() ) { for ( String releaseId : releasesInProgress.keySet() ) @@ -471,12 +474,13 @@ try { - SlaveBuildAgentTransportClient client = new SlaveBuildAgentTransportClient( new URL( buildAgentUrl ) ); + SlaveBuildAgentTransportClient client = + new SlaveBuildAgentTransportClient( new URL( buildAgentUrl ) ); Map map = client.getListener( releaseId ); if ( map != null && !map.isEmpty() ) { - Map release = releasesInProgress.get( releaseId ); + Map release = releasesInProgress.get( releaseId ); release.put( DistributedReleaseUtil.KEY_RELEASE_ID, releaseId ); release.put( DistributedReleaseUtil.KEY_BUILD_AGENT_URL, buildAgentUrl ); @@ -506,15 +510,16 @@ private Map createProjectMap( Project project ) { - Map map = new HashMap(); + Map map = new HashMap(); - map.put( DistributedReleaseUtil.KEY_PROJECT_ID, new Integer( project.getId() ) ); + map.put( DistributedReleaseUtil.KEY_PROJECT_ID, project.getId() ); map.put( DistributedReleaseUtil.KEY_GROUP_ID, project.getGroupId() ); map.put( DistributedReleaseUtil.KEY_ARTIFACT_ID, project.getArtifactId() ); map.put( DistributedReleaseUtil.KEY_SCM_URL, project.getScmUrl() ); if ( project.getProjectGroup().getLocalRepository() != null ) { - map.put( DistributedReleaseUtil.KEY_LOCAL_REPOSITORY, project.getProjectGroup().getLocalRepository().getLocation() ); + map.put( DistributedReleaseUtil.KEY_LOCAL_REPOSITORY, + project.getProjectGroup().getLocalRepository().getLocation() ); } return map; @@ -522,7 +527,7 @@ private Map createPropertiesMap( Properties properties ) { - Map map = new HashMap(); + Map map = new HashMap(); String prop = properties.getProperty( "username" ); if ( prop != null ) @@ -598,7 +603,7 @@ { ContinuumPrepareReleasesModelXpp3Reader reader = new ContinuumPrepareReleasesModelXpp3Reader(); PreparedReleaseModel model = reader.read( new InputStreamReader( new FileInputStream( file ) ) ); - + return model.getPreparedReleases(); } catch ( IOException e ) @@ -637,20 +642,20 @@ { preparedReleases = new ArrayList(); } - else + else { boolean found = false; for ( PreparedRelease preparedRelease : preparedReleases ) { - if ( preparedRelease.getReleaseId().equals( release.getReleaseId() ) && - preparedRelease.getReleaseName().equals( release.getReleaseName() ) ) + if ( preparedRelease.getReleaseId().equals( release.getReleaseId() ) && + preparedRelease.getReleaseName().equals( release.getReleaseName() ) ) { preparedRelease.setBuildAgentUrl( release.getBuildAgentUrl() ); found = true; } } - + if ( !found ) { preparedReleases.add( release ); @@ -676,10 +681,10 @@ { if ( releasesInProgress == null ) { - releasesInProgress = new HashMap(); + releasesInProgress = new HashMap>(); } - Map map = new HashMap(); + Map map = new HashMap(); map.put( DistributedReleaseUtil.KEY_RELEASE_GOAL, releaseType ); map.put( DistributedReleaseUtil.KEY_PROJECT_ID, projectId ); @@ -715,8 +720,8 @@ private File getPreparedReleasesFile() { - return new File( System.getProperty( "appserver.base" ) + File.separator + "conf" + File.separator - + PREPARED_RELEASES_FILENAME ); + return new File( System.getProperty( "appserver.base" ) + File.separator + "conf" + File.separator + + PREPARED_RELEASES_FILENAME ); } private boolean checkBuildAgent( String buildAgentUrl ) Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/repository/DefaultRepositoryService.java Tue Apr 14 16:28:12 2009 @@ -19,6 +19,8 @@ * under the License. */ +import java.util.List; + import org.apache.continuum.dao.LocalRepositoryDao; import org.apache.continuum.dao.ProjectGroupDao; import org.apache.continuum.dao.RepositoryPurgeConfigurationDao; @@ -32,8 +34,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; - /** * DefaultRepositoryService * @@ -45,7 +45,7 @@ public class DefaultRepositoryService implements RepositoryService { - private Logger log = LoggerFactory.getLogger( DefaultRepositoryService.class ); + private static final Logger log = LoggerFactory.getLogger( DefaultRepositoryService.class ); /** * @plexus.requirement @@ -81,7 +81,7 @@ { throw new RepositoryServiceException( "Local repository name must be unique" ); } - + if ( repo.getLocation().equals( localRepository.getLocation() ) ) { throw new RepositoryServiceException( "Local repository location must be unique" ); Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/DefaultOverallBuildQueue.java Tue Apr 14 16:28:12 2009 @@ -27,8 +27,6 @@ import org.apache.commons.lang.ArrayUtils; import org.apache.continuum.dao.BuildDefinitionDao; import org.apache.continuum.taskqueueexecutor.ParallelBuildsThreadedTaskQueueExecutor; -import org.apache.continuum.taskqueue.BuildProjectTask; -import org.apache.continuum.taskqueue.CheckOutTask; import org.apache.maven.continuum.model.project.BuildDefinition; import org.apache.maven.continuum.store.ContinuumStoreException; import org.codehaus.plexus.taskqueue.Task; @@ -48,6 +46,8 @@ public class DefaultOverallBuildQueue implements OverallBuildQueue { + private static final Logger log = LoggerFactory.getLogger( DefaultOverallBuildQueue.class ); + @Resource private BuildDefinitionDao buildDefinitionDao; @@ -59,8 +59,6 @@ private String name; - private Logger log = LoggerFactory.getLogger( DefaultOverallBuildQueue.class ); - public int getId() { return id; Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueue/manager/DefaultTaskQueueManager.java Tue Apr 14 16:28:12 2009 @@ -58,7 +58,7 @@ public class DefaultTaskQueueManager implements TaskQueueManager, Contextualizable { - private Logger log = LoggerFactory.getLogger( DefaultTaskQueueManager.class ); + private static final Logger log = LoggerFactory.getLogger( DefaultTaskQueueManager.class ); /** * @plexus.requirement role-hint="distributed-build-project" Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueueexecutor/ParallelBuildsThreadedTaskQueueExecutor.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueueexecutor/ParallelBuildsThreadedTaskQueueExecutor.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueueexecutor/ParallelBuildsThreadedTaskQueueExecutor.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/taskqueueexecutor/ParallelBuildsThreadedTaskQueueExecutor.java Tue Apr 14 16:28:12 2009 @@ -47,24 +47,24 @@ public class ParallelBuildsThreadedTaskQueueExecutor implements TaskQueueExecutor, Initializable, Startable { + private static final Logger log = LoggerFactory.getLogger( ParallelBuildsThreadedTaskQueueExecutor.class ); + private static final int SHUTDOWN = 1; private static final int CANCEL_TASK = 2; - private Logger log = LoggerFactory.getLogger( getClass() ); - /** - * @requirement + * @requirement */ private TaskQueue queue; /** - * @requirement + * @requirement */ private TaskExecutor executor; /** - * @configuration + * @configuration */ private String name; @@ -220,8 +220,9 @@ } else { - log.warn( "Task not cancelled (Flags: done: " + future.isDone() + " cancelled: " + - future.isCancelled() + ")" ); + log.warn( + "Task not cancelled (Flags: done: " + future.isDone() + " cancelled: " + future.isCancelled() + + ")" ); } } else Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/build/settings/DefaultSchedulesActivator.java Tue Apr 14 16:28:12 2009 @@ -19,6 +19,11 @@ * under the License. */ +import java.text.ParseException; +import java.util.Collection; +import java.util.Date; +import java.util.List; + import org.apache.continuum.dao.BuildDefinitionDao; import org.apache.continuum.dao.DirectoryPurgeConfigurationDao; import org.apache.continuum.dao.RepositoryPurgeConfigurationDao; @@ -42,11 +47,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.text.ParseException; -import java.util.Collection; -import java.util.Date; -import java.util.List; - /** * @author Jason van Zyl * @version $Id$ @@ -55,7 +55,7 @@ public class DefaultSchedulesActivator implements SchedulesActivator { - private Logger log = LoggerFactory.getLogger( DefaultSchedulesActivator.class ); + private static final Logger log = LoggerFactory.getLogger( DefaultSchedulesActivator.class ); /** * @plexus.requirement @@ -83,7 +83,7 @@ private Scheduler scheduler; //private int delay = 3600; - private int delay = 1; + private static final int delay = 1; public void activateSchedules( Continuum continuum ) throws SchedulesActivationException @@ -156,7 +156,7 @@ { log.info( "Deactivating schedule " + schedule.getName() ); - unschedule( schedule, continuum ); + unschedule( schedule ); } protected void schedule( Schedule schedule, Continuum continuum, Class jobClass ) @@ -218,7 +218,7 @@ } } - protected void unschedule( Schedule schedule, Continuum continuum ) + private void unschedule( Schedule schedule ) throws SchedulesActivationException { try @@ -242,12 +242,8 @@ { List buildDef = buildDefinitionDao.getBuildDefinitionsBySchedule( schedule.getId() ); - if ( buildDef.size() > 0 ) - { - return true; - } + return buildDef.size() > 0; - return false; } private boolean isScheduleFromPurgeJob( Schedule schedule ) @@ -257,11 +253,7 @@ List dirPurgeConfigs = directoryPurgeConfigurationDao.getDirectoryPurgeConfigurationsBySchedule( schedule.getId() ); - if ( repoPurgeConfigs.size() > 0 || dirPurgeConfigs.size() > 0 ) - { - return true; - } + return repoPurgeConfigs.size() > 0 || dirPurgeConfigs.size() > 0; - return false; } } Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Tue Apr 14 16:28:12 2009 @@ -19,6 +19,11 @@ * under the License. */ +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + import org.apache.continuum.dao.BuildDefinitionDao; import org.apache.continuum.dao.BuildResultDao; import org.apache.continuum.dao.ProjectDao; @@ -50,11 +55,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - /** * @author Trygve Laugstøl * @version $Id$ @@ -63,7 +63,7 @@ public class DefaultBuildController implements BuildController { - private Logger log = LoggerFactory.getLogger( DefaultBuildController.class ); + private static final Logger log = LoggerFactory.getLogger( DefaultBuildController.class ); /** * @plexus.requirement @@ -79,12 +79,12 @@ * @plexus.requirement */ private ProjectDao projectDao; - + /** * @plexus.requirement */ private ProjectGroupDao projectGroupDao; - + /** * @plexus.requirement */ @@ -132,7 +132,7 @@ log.info( "Error updating from SCM, not building" ); return; } - + log.info( "Starting build of " + context.getProject().getName() ); startBuild( context ); @@ -165,7 +165,7 @@ context.setCancelled( (Boolean) actionContext.get( AbstractContinuumAction.KEY_CANCELLED ) ); - String s = (String) actionContext.get( AbstractContinuumAction.KEY_BUILD_ID ); + String s = AbstractContinuumAction.getBuildId( actionContext ); if ( s != null && !context.isCancelled() ) { @@ -213,7 +213,7 @@ { try { - String s = (String) context.getActionContext().get( AbstractContinuumAction.KEY_BUILD_ID ); + String s = AbstractContinuumAction.getBuildId( context.getActionContext() ); if ( s != null ) { @@ -328,7 +328,8 @@ * @return * @throws TaskExecutionException */ - protected BuildContext initializeBuildContext( int projectId, int buildDefinitionId, int trigger, ScmResult scmResult ) + protected BuildContext initializeBuildContext( int projectId, int buildDefinitionId, int trigger, + ScmResult scmResult ) throws TaskExecutionException { BuildContext context = new BuildContext(); @@ -352,7 +353,7 @@ context.setOldBuildResult( oldBuildResult ); - context.setScmResult( scmResult ); + context.setScmResult( scmResult ); // CONTINUUM-1871 olamy if continuum is killed during building oldBuildResult will have a endTime 0 // this means all changes since the project has been loaded in continuum will be in memory @@ -635,7 +636,8 @@ if ( dependencyProject != null ) { List buildResults = buildResultDao.getBuildResultsInSuccessForProject( dependencyProject.getId(), - context.getOldBuildResult().getEndTime() ); + context.getOldBuildResult().getEndTime() ) + ; if ( buildResults != null && !buildResults.isEmpty() ) { log.debug( "Dependency changed: " + dep.getGroupId() + ":" + dep.getArtifactId() + ":" + @@ -644,14 +646,14 @@ } else { - log.debug( "Dependency not changed: " + dep.getGroupId() + ":" + dep.getArtifactId() + - ":" + dep.getVersion() ); + log.debug( "Dependency not changed: " + dep.getGroupId() + ":" + dep.getArtifactId() + ":" + + dep.getVersion() ); } } else { - log.debug( "Skip non Continuum project: " + dep.getGroupId() + ":" + dep.getArtifactId() + - ":" + dep.getVersion() ); + log.debug( "Skip non Continuum project: " + dep.getGroupId() + ":" + dep.getArtifactId() + ":" + + dep.getVersion() ); } } Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/builddefinition/DefaultBuildDefinitionService.java Tue Apr 14 16:28:12 2009 @@ -19,7 +19,6 @@ package org.apache.maven.continuum.builddefinition; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.apache.continuum.buildqueue.BuildQueueServiceException; @@ -53,7 +52,7 @@ public class DefaultBuildDefinitionService implements BuildDefinitionService, Initializable { - private Logger log = LoggerFactory.getLogger( DefaultBuildDefinitionService.class ); + private static final Logger log = LoggerFactory.getLogger( DefaultBuildDefinitionService.class ); /** * @plexus.configuration default-value="" @@ -577,9 +576,8 @@ } project = projectDao.getProjectWithBuildDetails( project.getId() ); - for ( Iterator iterator = template.getBuildDefinitions().iterator(); iterator.hasNext(); ) + for ( BuildDefinition bd : (List) template.getBuildDefinitions() ) { - BuildDefinition bd = iterator.next(); bd = cloneBuildDefinition( bd ); bd.setTemplate( false ); bd = buildDefinitionDao.addBuildDefinition( bd ); @@ -606,9 +604,8 @@ return null; } - for ( Iterator iterator = template.getBuildDefinitions().iterator(); iterator.hasNext(); ) + for ( BuildDefinition bd : (List) template.getBuildDefinitions() ) { - BuildDefinition bd = iterator.next(); bd.setTemplate( false ); bd = buildDefinitionDao.addBuildDefinition( cloneBuildDefinition( bd ) ); projectGroup.addBuildDefinition( bd ); Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/buildqueue/evaluator/BuildProjectTaskViabilityEvaluator.java Tue Apr 14 16:28:12 2009 @@ -19,17 +19,16 @@ * under the License. */ -import org.apache.continuum.taskqueue.BuildProjectTask; -import org.apache.maven.continuum.project.ContinuumProjectState; -import org.codehaus.plexus.taskqueue.TaskViabilityEvaluator; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.continuum.taskqueue.BuildProjectTask; +import org.apache.maven.continuum.project.ContinuumProjectState; +import org.codehaus.plexus.taskqueue.TaskViabilityEvaluator; + /** * @author Trygve Laugstøl * @version $Id$ @@ -71,9 +70,9 @@ for ( BuildProjectTask task : (Collection) tasks ) { - Integer key = new Integer( task.getProjectId() ); + int key = task.getProjectId(); - List projectTasks = (List) projects.get( key ); + List projectTasks = projects.get( key ); if ( projectTasks == null ) { @@ -87,9 +86,9 @@ List toBeRemoved = new ArrayList(); - for ( Iterator it = projects.values().iterator(); it.hasNext(); ) + for ( List projectTasks : projects.values() ) { - toBeRemoved.addAll( checkTasks( (List) it.next() ) ); + toBeRemoved.addAll( checkTasks( projectTasks ) ); } return toBeRemoved; Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractBuildDefinitionContinuumAction.java Tue Apr 14 16:28:12 2009 @@ -19,6 +19,8 @@ * under the License. */ +import java.util.List; + import org.apache.continuum.dao.BuildDefinitionDao; import org.apache.continuum.dao.ScheduleDao; import org.apache.maven.continuum.ContinuumException; @@ -30,8 +32,6 @@ import org.apache.maven.continuum.store.ContinuumObjectNotFoundException; import org.apache.maven.continuum.store.ContinuumStoreException; -import java.util.List; - /** * AbstractBuildDefinitionContinuumAction: * @@ -148,8 +148,8 @@ * @param buildDefinition * @throws ContinuumException */ - protected BuildDefinition updateBuildDefinitionInList( List buildDefinitions, - BuildDefinition buildDefinition ) + protected void updateBuildDefinitionInList( List buildDefinitions, + BuildDefinition buildDefinition ) throws ContinuumException { try @@ -202,8 +202,6 @@ storedDefinition.setAlwaysBuild( buildDefinition.isAlwaysBuild() ); buildDefinitionDao.storeBuildDefinition( storedDefinition ); - - return storedDefinition; } else { Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java Tue Apr 14 16:28:12 2009 @@ -30,7 +30,6 @@ import org.apache.maven.continuum.model.project.ProjectGroup; import org.apache.maven.continuum.model.scm.ScmResult; import org.codehaus.plexus.action.AbstractAction; -import org.codehaus.plexus.util.StringUtils; /** * @author Trygve Laugstøl @@ -100,20 +99,6 @@ public static final String KEY_SCM_RESULT_MAP = "scm-result-map"; // ---------------------------------------------------------------------- - // Utils - // ---------------------------------------------------------------------- - - protected String nullIfEmpty( String string ) - { - if ( StringUtils.isEmpty( string ) ) - { - return null; - } - - return string; - } - - // ---------------------------------------------------------------------- // // ---------------------------------------------------------------------- @@ -179,7 +164,7 @@ public static ScmResult getUpdateScmResult( Map context ) { - return (ScmResult) getObject( context, KEY_UPDATE_SCM_RESULT ); + return getUpdateScmResult( context, null ); } public static ScmResult getUpdateScmResult( Map context, ScmResult defaultValue ) @@ -199,7 +184,7 @@ public static ScmResult getScmResult( Map context ) { - return (ScmResult) getObject( context, KEY_SCM_RESULT ); + return getScmResult( context, null ); } public static ScmResult getScmResult( Map context, ScmResult defaultValue ) @@ -209,7 +194,7 @@ public static ScmResult getOldScmResult( Map context ) { - return (ScmResult) getObject( context, KEY_OLD_SCM_RESULT ); + return getOldScmResult( context, null ); } public static ScmResult getOldScmResult( Map context, ScmResult defaultValue ) @@ -263,7 +248,7 @@ public static boolean getBoolean( Map context, String key, boolean defaultValue ) { - return (Boolean) getObject( context, key, Boolean.valueOf( defaultValue ) ); + return (Boolean) getObject( context, key, defaultValue ); } protected static int getInteger( Map context, String key ) Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectAction.java Tue Apr 14 16:28:12 2009 @@ -15,14 +15,14 @@ * the License. */ +import java.util.List; +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.BuildDefinitionTemplate; import org.apache.maven.continuum.model.project.Project; -import java.util.Iterator; -import java.util.Map; - /** * AddBuildDefinitionToProjectAction: * @@ -49,10 +49,8 @@ if ( buildDefinitionTemplate != null ) { - for ( Iterator iterator = buildDefinitionTemplate.getBuildDefinitions().iterator(); - iterator.hasNext(); ) + for ( BuildDefinition buildDefinition : (List) buildDefinitionTemplate.getBuildDefinitions() ) { - BuildDefinition buildDefinition = iterator.next(); resolveDefaultBuildDefinitionsForProject( buildDefinition, project ); project.addBuildDefinition( buildDefinition ); Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectGroupAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectGroupAction.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectGroupAction.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AddBuildDefinitionToProjectGroupAction.java Tue Apr 14 16:28:12 2009 @@ -19,14 +19,14 @@ * under the License. */ +import java.util.List; +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.BuildDefinitionTemplate; import org.apache.maven.continuum.model.project.ProjectGroup; -import java.util.Iterator; -import java.util.Map; - /** * AddBuildDefinitionToProjectAction: * @@ -52,10 +52,8 @@ BuildDefinitionTemplate buildDefinitionTemplate = getBuildDefinitionTemplate( map ); if ( buildDefinitionTemplate != null ) { - for ( Iterator iterator = buildDefinitionTemplate.getBuildDefinitions().iterator(); - iterator.hasNext(); ) + for ( BuildDefinition buildDefinition : (List) buildDefinitionTemplate.getBuildDefinitions() ) { - BuildDefinition buildDefinition = iterator.next(); resolveDefaultBuildDefinitionsForProjectGroup( buildDefinition, projectGroup ); projectGroup.addBuildDefinition( buildDefinition ); Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java?rev=764863&r1=764862&r2=764863&view=diff ============================================================================== --- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java (original) +++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckWorkingDirectoryAction.java Tue Apr 14 16:28:12 2009 @@ -19,13 +19,13 @@ * under the License. */ +import java.io.File; +import java.util.Map; + import org.apache.continuum.dao.ProjectDao; import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.utils.WorkingDirectoryService; -import java.io.File; -import java.util.Map; - /** * @author Trygve Laugstøl * @version $Id$ @@ -61,6 +61,6 @@ File[] files = workingDirectory.listFiles(); - context.put( KEY_WORKING_DIRECTORY_EXISTS, Boolean.valueOf( files.length > 0 ) ); + context.put( KEY_WORKING_DIRECTORY_EXISTS, files.length > 0 ); } }