Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 80460 invoked from network); 29 Apr 2009 05:00:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Apr 2009 05:00:18 -0000 Received: (qmail 51126 invoked by uid 500); 29 Apr 2009 05:00:17 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 51071 invoked by uid 500); 29 Apr 2009 05:00:17 -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 51062 invoked by uid 99); 29 Apr 2009 05:00:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2009 05:00:17 +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; Wed, 29 Apr 2009 05:00:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A9617238896D; Wed, 29 Apr 2009 04:59:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r769659 - in /continuum/trunk: continuum-builder/src/main/java/org/apache/continuum/builder/utils/ continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/ continuum-distributed/continuum-distributed-slave/continuum-di... Date: Wed, 29 Apr 2009 04:59:52 -0000 To: commits@continuum.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090429045953.A9617238896D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Wed Apr 29 04:59:52 2009 New Revision: 769659 URL: http://svn.apache.org/viewvc?rev=769659&view=rev Log: More java5 code and clean up lot of warnings found by Idea. merge -r 769654:769655 from 1.3.x branch Modified: continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java Modified: continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java?rev=769659&r1=769658&r2=769659&view=diff ============================================================================== --- continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java (original) +++ continuum/trunk/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java Wed Apr 29 04:59:52 2009 @@ -289,7 +289,7 @@ return getString( context, KEY_INSTALLATION_VAR_NAME ); } - public static List getScmChanges( Map context ) + public static List> getScmChanges( Map context ) { return getList( context, KEY_SCM_CHANGES ); } @@ -318,7 +318,7 @@ } } - public static List getChangeSetFiles( Map context ) + public static List> getChangeSetFiles( Map context ) { return getList( context, KEY_CHANGESET_FILES ); } @@ -379,12 +379,12 @@ return getString( context, KEY_SCM_TAG ); } - public static Map getProjectParent( Map context ) + public static Map getProjectParent( Map context ) { return getMap( context, KEY_PROJECT_PARENT ); } - public static List getProjectDevelopers( Map context ) + public static List> getProjectDevelopers( Map context ) { return getList( context, KEY_PROJECT_DEVELOPERS ); } @@ -404,12 +404,12 @@ return getString( context, KEY_PROJECT_DEVELOPER_SCMID ); } - public static List getProjectDependencies( Map context ) + public static List> getProjectDependencies( Map context ) { return getList( context, KEY_PROJECT_DEPENDENCIES ); } - public static List getProjectNotifiers( Map context ) + public static List> getProjectNotifiers( Map context ) { return getList( context, KEY_PROJECT_NOTIFIERS ); } @@ -464,12 +464,12 @@ return getBoolean( context, KEY_NOTIFIER_SEND_ON_WARNING ); } - public static Map getScmResult( Map context ) + public static Map getScmResult( Map context ) { return getMap( context, KEY_SCM_RESULT ); } - public static Map getMavenProject( Map context ) + public static Map getMavenProject( Map context ) { return getMap( context, KEY_MAVEN_PROJECT ); } Modified: continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java?rev=769659&r1=769658&r2=769659&view=diff ============================================================================== --- continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java (original) +++ continuum/trunk/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java Wed Apr 29 04:59:52 2009 @@ -569,7 +569,7 @@ { SlaveBuildAgentTransportClient client = new SlaveBuildAgentTransportClient( new URL( buildAgentUrl ) ); - Map result = client.getBuildResult( projectId ); + Map result = client.getBuildResult( projectId ); if ( result != null ) { @@ -1141,11 +1141,11 @@ private List getScmChanges( Map context ) { List changes = new ArrayList(); - List scmChanges = ContinuumBuildConstant.getScmChanges( context ); + List> scmChanges = ContinuumBuildConstant.getScmChanges( context ); if ( scmChanges != null ) { - for ( Map map : scmChanges ) + for ( Map map : scmChanges ) { ChangeSet changeSet = new ChangeSet(); changeSet.setAuthor( ContinuumBuildConstant.getChangeSetAuthor( map ) ); @@ -1161,11 +1161,11 @@ private void setChangeFiles( ChangeSet changeSet, Map context ) { - List changeFiles = ContinuumBuildConstant.getChangeSetFiles( context ); + List> changeFiles = ContinuumBuildConstant.getChangeSetFiles( context ); if ( changeFiles != null ) { - for ( Map map : changeFiles ) + for ( Map map : changeFiles ) { ChangeFile changeFile = new ChangeFile(); changeFile.setName( ContinuumBuildConstant.getChangeFileName( map ) ); @@ -1179,7 +1179,7 @@ private ProjectDependency getProjectParent( Map context ) { - Map map = ContinuumBuildConstant.getProjectParent( context ); + Map map = ContinuumBuildConstant.getProjectParent( context ); if ( map != null && map.size() > 0 ) { @@ -1198,11 +1198,11 @@ { List projectDependencies = new ArrayList(); - List dependencies = ContinuumBuildConstant.getProjectDependencies( context ); + List> dependencies = ContinuumBuildConstant.getProjectDependencies( context ); if ( dependencies != null ) { - for ( Map map : dependencies ) + for ( Map map : dependencies ) { ProjectDependency dependency = new ProjectDependency(); dependency.setGroupId( ContinuumBuildConstant.getGroupId( map ) ); @@ -1219,11 +1219,11 @@ { List projectDevelopers = new ArrayList(); - List developers = ContinuumBuildConstant.getProjectDevelopers( context ); + List> developers = ContinuumBuildConstant.getProjectDevelopers( context ); if ( developers != null ) { - for ( Map map : developers ) + for ( Map map : developers ) { ProjectDeveloper developer = new ProjectDeveloper(); developer.setName( ContinuumBuildConstant.getDeveloperName( map ) ); @@ -1240,11 +1240,11 @@ { List projectNotifiers = new ArrayList(); - List notifiers = ContinuumBuildConstant.getProjectNotifiers( context ); + List> notifiers = ContinuumBuildConstant.getProjectNotifiers( context ); if ( notifiers != null ) { - for ( Map map : notifiers ) + for ( Map map : notifiers ) { ProjectNotifier notifier = new ProjectNotifier(); notifier.setConfiguration( ContinuumBuildConstant.getNotifierConfiguration( map ) ); @@ -1266,7 +1266,7 @@ private ScmResult getScmResult( Map context ) { - Map map = ContinuumBuildConstant.getScmResult( context ); + Map map = ContinuumBuildConstant.getScmResult( context ); if ( !map.isEmpty() ) { @@ -1286,7 +1286,7 @@ private String getMavenProjectVersion( Map context ) { - Map map = ContinuumBuildConstant.getMavenProject( context ); + Map map = ContinuumBuildConstant.getMavenProject( context ); if ( !map.isEmpty() ) { @@ -1298,7 +1298,7 @@ private List getMavenProjectModules( Map context ) { - Map map = ContinuumBuildConstant.getMavenProject( context ); + Map map = ContinuumBuildConstant.getMavenProject( context ); if ( !map.isEmpty() ) { Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java?rev=769659&r1=769658&r2=769659&view=diff ============================================================================== --- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java (original) +++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java Wed Apr 29 04:59:52 2009 @@ -33,7 +33,7 @@ public Boolean buildProjects( List> projectsBuildContext ) throws Exception; - public Map getBuildResult( int projectId ) + public Map getBuildResult( int projectId ) throws Exception; public Integer getProjectCurrentlyBuilding() Modified: continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java?rev=769659&r1=769658&r2=769659&view=diff ============================================================================== --- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java (original) +++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java Wed Apr 29 04:59:52 2009 @@ -106,10 +106,10 @@ return installations; } - public Map getBuildResult( int projectId ) + public Map getBuildResult( int projectId ) throws Exception { - Map buildResult; + Map buildResult; try {