You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2009/04/28 06:59:08 UTC
svn commit: r769240 - in /continuum/branches/continuum-1.3.x:
continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/
continuum-api/src/main/java/org/apache/continuum/dao/
continuum-api/src/main/java/org/apache/continuum/release/d...
Author: evenisse
Date: Tue Apr 28 04:59:03 2009
New Revision: 769240
URL: http://svn.apache.org/viewvc?rev=769240&view=rev
Log:
More java5 code and clean up lot of warnings found by Idea
Modified:
continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/DistributedBuildManager.java
continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/dao/DaoUtils.java
continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/release/distributed/manager/DistributedReleaseManager.java
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.java
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentReleaseManager.java
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/PrepareBuildProjectsTaskExecutor.java
continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/utils/ContinuumBuildAgentUtil.java
continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java
continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/builder/distributed/manager/DefaultDistributedBuildManager.java
continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/continuum/release/distributed/manager/DefaultDistributedReleaseManager.java
continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java
continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java
continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java
continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
continuum/branches/continuum-1.3.x/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/DistributedReleasesAction.java
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/util/GenerateRecipentNotifier.java
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java
Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/DistributedBuildManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/DistributedBuildManager.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/DistributedBuildManager.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/builder/distributed/manager/DistributedBuildManager.java Tue Apr 28 04:59:03 2009
@@ -34,21 +34,21 @@
void cancelDistributedBuild( String buildAgentUrl, int projectGroupId, String scmRootAddress )
throws ContinuumException;
- void updateBuildResult( Map context )
+ void updateBuildResult( Map<String, Object> context )
throws ContinuumException;
- void prepareBuildFinished( Map context )
+ void prepareBuildFinished( Map<String, Object> context )
throws ContinuumException;
void startProjectBuild( int projectId )
throws ContinuumException;
- void startPrepareBuild( Map context )
+ void startPrepareBuild( Map<String, Object> context )
throws ContinuumException;
void reload()
throws ContinuumException;
-
+
void removeAgentFromTaskQueueExecutor( String buildAgentUrl )
throws ContinuumException;
@@ -65,10 +65,10 @@
Map<String, String> getEnvironments( int buildDefinitionId, String installationType )
throws ContinuumException;
- void updateProject( Map context )
+ void updateProject( Map<String, Object> context )
throws ContinuumException;
- boolean shouldBuild( Map context );
+ boolean shouldBuild( Map<String, Object> context );
Map<String, DistributedBuildTaskQueueExecutor> getTaskQueueExecutors();
Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/dao/DaoUtils.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/dao/DaoUtils.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/dao/DaoUtils.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/dao/DaoUtils.java Tue Apr 28 04:59:03 2009
@@ -19,10 +19,10 @@
* under the License.
*/
-import org.apache.maven.continuum.store.ContinuumStoreException;
-
import java.util.Map;
+import org.apache.maven.continuum.store.ContinuumStoreException;
+
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -33,12 +33,12 @@
void eraseDatabase();
- Map<Integer, Integer> getProjectIdsAndBuildDefinitionsIdsBySchedule( int scheduleId )
+ Map<Integer, Object> getProjectIdsAndBuildDefinitionsIdsBySchedule( int scheduleId )
throws ContinuumStoreException;
- Map<Integer, Integer> getProjectGroupIdsAndBuildDefinitionsIdsBySchedule( int scheduleId )
+ Map<Integer, Object> getProjectGroupIdsAndBuildDefinitionsIdsBySchedule( int scheduleId )
throws ContinuumStoreException;
- Map<Integer, Integer> getAggregatedProjectIdsAndBuildDefinitionIdsBySchedule( int scheduleId )
+ Map<Integer, Object> getAggregatedProjectIdsAndBuildDefinitionIdsBySchedule( int scheduleId )
throws ContinuumStoreException;
}
Modified: continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/release/distributed/manager/DistributedReleaseManager.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/release/distributed/manager/DistributedReleaseManager.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/release/distributed/manager/DistributedReleaseManager.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-api/src/main/java/org/apache/continuum/release/distributed/manager/DistributedReleaseManager.java Tue Apr 28 04:59:03 2009
@@ -66,6 +66,6 @@
String releaseCleanup( String releaseId )
throws ContinuumReleaseException, BuildAgentConfigurationException;
- List<Map> getAllReleasesInProgress()
+ List<Map<String, Object>> getAllReleasesInProgress()
throws ContinuumReleaseException, BuildAgentConfigurationException;
}
\ No newline at end of file
Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.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/BuildAgentManager.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentManager.java Tue Apr 28 04:59:03 2009
@@ -27,24 +27,24 @@
{
String ROLE = BuildAgentManager.class.getName();
- void returnBuildResult( Map result )
+ void returnBuildResult( Map<String, Object> result )
throws ContinuumException;
-
+
void startProjectBuild( int projectId )
throws ContinuumException;
Map<String, String> getEnvironments( int buildDefinitionId, String installationType )
throws ContinuumException;
- void updateProject( Map project )
+ void updateProject( Map<String, Object> project )
throws ContinuumException;
- boolean shouldBuild( Map context )
+ boolean shouldBuild( Map<String, Object> context )
throws ContinuumException;
- void startPrepareBuild( Map context )
+ void startPrepareBuild( Map<String, Object> context )
throws ContinuumException;
- void endPrepareBuild( Map context )
+ void endPrepareBuild( Map<String, Object> context )
throws ContinuumException;
}
Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.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/BuildAgentReleaseManager.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/BuildAgentReleaseManager.java Tue Apr 28 04:59:03 2009
@@ -28,7 +28,8 @@
{
String ROLE = BuildAgentReleaseManager.class.getName();
- String releasePrepare( Map project, Map properties, Map releaseVersion, Map developmentVersion,
+ String releasePrepare( Map<String, Object> project, Map<String, Object> properties,
+ Map<String, String> releaseVersion, Map<String, String> developmentVersion,
Map<String, String> environments )
throws ContinuumReleaseException;
Modified: continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.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/DefaultBuildAgentManager.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java Tue Apr 28 04:59:03 2009
@@ -138,7 +138,7 @@
}
}
- public boolean shouldBuild( Map context )
+ public boolean shouldBuild( Map<String, Object> context )
throws ContinuumException
{
try
@@ -162,7 +162,7 @@
}
}
- public void startPrepareBuild( Map context )
+ public void startPrepareBuild( Map<String, Object> context )
throws ContinuumException
{
try
@@ -186,7 +186,7 @@
}
}
- public void endPrepareBuild( Map context )
+ public void endPrepareBuild( Map<String, Object> context )
throws ContinuumException
{
try
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=769240&r1=769239&r2=769240&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 28 04:59:03 2009
@@ -64,7 +64,8 @@
*/
BuildAgentInstallationService buildAgentInstallationService;
- public String releasePrepare( Map projectMap, Map properties, Map releaseVersion, Map developmentVersion,
+ public String releasePrepare( Map<String, Object> projectMap, Map<String, Object> properties,
+ Map<String, String> releaseVersion, Map<String, String> developmentVersion,
Map<String, String> environments )
throws ContinuumReleaseException
{
@@ -248,7 +249,7 @@
releaseManager.getPreparedReleases().remove( releaseId );
}
- private Project getProject( Map context )
+ private Project getProject( Map<String, Object> context )
{
Project project = new Project();
@@ -276,7 +277,7 @@
return project;
}
- private Properties getReleaseProperties( Map context )
+ private Properties getReleaseProperties( Map<String, Object> context )
{
Properties props = new Properties();
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=769240&r1=769239&r2=769240&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 28 04:59:03 2009
@@ -178,7 +178,7 @@
buildContext.setActionContext( actionContext );
}
- private boolean checkProjectScmRoot( Map context )
+ private boolean checkProjectScmRoot( Map<String, Object> context )
{
return !( context != null &&
ContinuumBuildAgentUtil.getScmRootState( context ) == ContinuumProjectState.ERROR );
@@ -260,7 +260,7 @@
}
}
- private void endPrepareBuild( Map context )
+ private void endPrepareBuild( Map<String, Object> context )
throws TaskExecutionException
{
if ( context != null )
@@ -414,7 +414,7 @@
private void buildProjects( List<BuildContext> buildContexts )
throws TaskExecutionException
{
- Map map = new HashMap();
+ Map<String, Object> map = new HashMap<String, Object>();
map.put( ContinuumBuildAgentUtil.KEY_BUILD_CONTEXTS, buildContexts );
BuildContext context = new BuildContext();
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=769240&r1=769239&r2=769240&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 28 04:59:03 2009
@@ -247,157 +247,157 @@
public static final String KEY_LOCAL_REPOSITORY_LAYOUT = "repo-layout";
- public static Integer getProjectId( Map context )
+ public static Integer getProjectId( Map<String, Object> context )
{
return getInteger( context, KEY_PROJECT_ID );
}
- public static String getProjectName( Map context )
+ public static String getProjectName( Map<String, Object> context )
{
return getString( context, KEY_PROJECT_NAME );
}
- public static Integer getProjectState( Map context )
+ public static Integer getProjectState( Map<String, Object> context )
{
return getInteger( context, KEY_PROJECT_STATE );
}
- public static Integer getBuildDefinitionId( Map context )
+ public static Integer getBuildDefinitionId( Map<String, Object> context )
{
return getInteger( context, KEY_BUILD_DEFINITION_ID );
}
- public static String getBuildFile( Map context )
+ public static String getBuildFile( Map<String, Object> context )
{
return getString( context, KEY_BUILD_FILE );
}
- public static String getExecutorId( Map context )
+ public static String getExecutorId( Map<String, Object> context )
{
return getString( context, KEY_EXECUTOR_ID );
}
- public static String getGoals( Map context )
+ public static String getGoals( Map<String, Object> context )
{
return getString( context, KEY_GOALS );
}
- public static String getArguments( Map context )
+ public static String getArguments( Map<String, Object> context )
{
return getString( context, KEY_ARGUMENTS );
}
- public static String getScmUrl( Map context )
+ public static String getScmUrl( Map<String, Object> context )
{
return getString( context, KEY_SCM_URL );
}
- public static String getScmUsername( Map context )
+ public static String getScmUsername( Map<String, Object> context )
{
return getString( context, KEY_SCM_USERNAME, "" );
}
- public static String getScmPassword( Map context )
+ public static String getScmPassword( Map<String, Object> context )
{
return getString( context, KEY_SCM_PASSWORD, "" );
}
- public static boolean isBuildFresh( Map context )
+ public static boolean isBuildFresh( Map<String, Object> context )
{
return getBoolean( context, KEY_BUILD_FRESH );
}
- public static int getProjectGroupId( Map context )
+ public static int getProjectGroupId( Map<String, Object> context )
{
return getInteger( context, KEY_PROJECT_GROUP_ID );
}
- public static String getScmRootAddress( Map context )
+ public static String getScmRootAddress( Map<String, Object> context )
{
return getString( context, KEY_SCM_ROOT_ADDRESS );
}
- public static int getScmRootState( Map context )
+ public static int getScmRootState( Map<String, Object> context )
{
return getInteger( context, KEY_SCM_ROOT_STATE );
}
- public static Project getProject( Map context )
+ public static Project getProject( Map<String, Object> context )
{
return (Project) getObject( context, KEY_PROJECT );
}
- public static BuildDefinition getBuildDefinition( Map context )
+ public static BuildDefinition getBuildDefinition( Map<String, Object> context )
{
return (BuildDefinition) getObject( context, KEY_BUILD_DEFINITION );
}
- public static ScmResult getCheckoutScmResult( Map context, Object defaultValue )
+ public static ScmResult getCheckoutScmResult( Map<String, Object> context, Object defaultValue )
{
return (ScmResult) getObject( context, KEY_CHECKOUT_SCM_RESULT, defaultValue );
}
- public static ScmResult getUpdateScmResult( Map context, Object defaultValue )
+ public static ScmResult getUpdateScmResult( Map<String, Object> context, Object defaultValue )
{
return (ScmResult) getObject( context, KEY_UPDATE_SCM_RESULT, defaultValue );
}
- public static ScmResult getScmResult( Map context, Object defaultValue )
+ public static ScmResult getScmResult( Map<String, Object> context, Object defaultValue )
{
return (ScmResult) getObject( context, KEY_SCM_RESULT, defaultValue );
}
- public static int getTrigger( Map context )
+ public static int getTrigger( Map<String, Object> context )
{
return getInteger( context, KEY_TRIGGER );
}
- public static BuildResult getBuildResult( Map context, Object defaultValue )
+ public static BuildResult getBuildResult( Map<String, Object> context, Object defaultValue )
{
- return (BuildResult) getObject( context, KEY_BUILD_RESULT );
+ return (BuildResult) getObject( context, KEY_BUILD_RESULT, defaultValue );
}
- public static Map<String, String> getEnvironments( Map context )
+ public static Map<String, String> getEnvironments( Map<String, Object> context )
{
return (Map<String, String>) getObject( context, KEY_ENVIRONMENTS );
}
- public static String getLocalRepository( Map context )
+ public static String getLocalRepository( Map<String, Object> context )
{
return getString( context, KEY_LOCAL_REPOSITORY, "" );
}
- public static String getProjectVersion( Map context )
+ public static String getProjectVersion( Map<String, Object> context )
{
return getString( context, KEY_PROJECT_VERSION );
}
- public static String getProjectGroupName( Map context )
+ public static String getProjectGroupName( Map<String, Object> context )
{
return getString( context, KEY_PROJECT_GROUP_NAME );
}
- public static int getBuildNumber( Map context )
+ public static int getBuildNumber( Map<String, Object> context )
{
return getInteger( context, KEY_BUILD_NUMBER );
}
- public static List<Map<String, Object>> getOldScmChanges( Map context )
+ public static List<Map<String, Object>> getOldScmChanges( Map<String, Object> context )
{
return getList( context, KEY_OLD_SCM_CHANGES );
}
- public static String getChangeSetAuthor( Map context )
+ public static String getChangeSetAuthor( Map<String, Object> context )
{
return getString( context, KEY_CHANGESET_AUTHOR );
}
- public static String getChangeSetComment( Map context )
+ public static String getChangeSetComment( Map<String, Object> context )
{
return getString( context, KEY_CHANGESET_COMMENT );
}
- public static long getChangeSetDate( Map context )
+ public static long getChangeSetDate( Map<String, Object> context )
{
Date date = getDate( context, KEY_CHANGESET_DATE );
@@ -411,117 +411,117 @@
}
}
- public static List getChangeSetFiles( Map context )
+ public static List getChangeSetFiles( Map<String, Object> context )
{
return getList( context, KEY_CHANGESET_FILES );
}
- public static String getChangeFileName( Map context )
+ public static String getChangeFileName( Map<String, Object> context )
{
return getString( context, KEY_CHANGEFILE_NAME );
}
- public static String getChangeFileRevision( Map context )
+ public static String getChangeFileRevision( Map<String, Object> context )
{
return getString( context, KEY_CHANGEFILE_REVISION );
}
- public static String getChangeFileStatus( Map context )
+ public static String getChangeFileStatus( Map<String, Object> context )
{
return getString( context, KEY_CHANGEFILE_STATUS );
}
- public static ScmResult getOldScmResult( Map context, ScmResult defaultValue )
+ public static ScmResult getOldScmResult( Map<String, Object> context, ScmResult defaultValue )
{
return (ScmResult) getObject( context, KEY_OLD_SCM_RESULT, defaultValue );
}
- public static List getScmChanges( Map context )
+ public static List getScmChanges( Map<String, Object> context )
{
return getList( context, KEY_SCM_CHANGES );
}
- public static Date getLatestUpdateDate( Map context )
+ public static Date getLatestUpdateDate( Map<String, Object> context )
{
return getDate( context, KEY_LATEST_UPDATE_DATE );
}
- public static String getBuildAgentUrl( Map context )
+ public static String getBuildAgentUrl( Map<String, Object> context )
{
return getString( context, KEY_BUILD_AGENT_URL );
}
- public static String getGroupId( Map context )
+ public static String getGroupId( Map<String, Object> context )
{
return getString( context, KEY_GROUP_ID );
}
- public static String getArtifactId( Map context )
+ public static String getArtifactId( Map<String, Object> context )
{
return getString( context, KEY_ARTIFACT_ID );
}
- public static Map getReleaseVersion( Map context )
+ public static Map getReleaseVersion( Map<String, Object> context )
{
return getMap( context, KEY_RELEASE_VERSION );
}
- public static Map getDevelopmentVersion( Map context )
+ public static Map getDevelopmentVersion( Map<String, Object> context )
{
return getMap( context, KEY_DEVELOPMENT_VERSION );
}
- public static String getScmTagBase( Map context )
+ public static String getScmTagBase( Map<String, Object> context )
{
return getString( context, KEY_SCM_TAGBASE, "" );
}
- public static String getScmCommentPrefix( Map context )
+ public static String getScmCommentPrefix( Map<String, Object> context )
{
return getString( context, KEY_SCM_COMMENT_PREFIX, "" );
}
- public static String getScmTag( Map context )
+ public static String getScmTag( Map<String, Object> context )
{
return getString( context, KEY_SCM_TAG, "" );
}
- public static String getPrepareGoals( Map context )
+ public static String getPrepareGoals( Map<String, Object> context )
{
return getString( context, KEY_PREPARE_GOALS, "" );
}
- public static String getUseEditMode( Map context )
+ public static String getUseEditMode( Map<String, Object> context )
{
return getString( context, KEY_USE_EDIT_MODE, "" );
}
- public static String getAddSchema( Map context )
+ public static String getAddSchema( Map<String, Object> context )
{
return getString( context, KEY_ADD_SCHEMA, "" );
}
- public static String getAutoVersionSubmodules( Map context )
+ public static String getAutoVersionSubmodules( Map<String, Object> context )
{
return getString( context, KEY_AUTO_VERSION_SUBMODULES, "" );
}
- public static List getBuildContexts( Map context )
+ public static List getBuildContexts( Map<String, Object> context )
{
return getList( context, KEY_BUILD_CONTEXTS );
}
- public static int getMaxExecutionTime( Map context )
+ public static int getMaxExecutionTime( Map<String, Object> context )
{
return getInteger( context, KEY_MAX_JOB_EXEC_TIME );
}
- public static String getLocalRepositoryName( Map context )
+ public static String getLocalRepositoryName( Map<String, Object> context )
{
return getString( context, KEY_LOCAL_REPOSITORY_NAME, "" );
}
- public static String getLocalRepositoryLayout( Map context )
+ public static String getLocalRepositoryLayout( Map<String, Object> context )
{
return getString( context, KEY_LOCAL_REPOSITORY_LAYOUT, "" );
}
@@ -530,27 +530,27 @@
//
// ----------------------------------------------------------------------
- public static String getString( Map context, String key )
+ public static String getString( Map<String, Object> context, String key )
{
return (String) getObject( context, key );
}
- public static String getString( Map context, String key, String defaultValue )
+ public static String getString( Map<String, Object> context, String key, String defaultValue )
{
return (String) getObject( context, key, defaultValue );
}
- public static boolean getBoolean( Map context, String key )
+ public static boolean getBoolean( Map<String, Object> context, String key )
{
return (Boolean) getObject( context, key );
}
- public static boolean getBoolean( Map context, String key, boolean defaultValue )
+ public static boolean getBoolean( Map<String, Object> context, String key, boolean defaultValue )
{
return (Boolean) getObject( context, key, defaultValue );
}
- public static int getInteger( Map context, String key )
+ public static int getInteger( Map<String, Object> context, String key )
{
Object obj = getObject( context, key, null );
@@ -564,7 +564,7 @@
}
}
- public static List getList( Map context, String key )
+ public static List getList( Map<String, Object> context, String key )
{
Object obj = getObject( context, key, null );
@@ -591,7 +591,7 @@
}
}
- public static Date getDate( Map context, String key )
+ public static Date getDate( Map<String, Object> context, String key )
{
Object obj = getObject( context, key, null );
@@ -605,7 +605,7 @@
}
}
- protected static Map getMap( Map context, String key )
+ protected static Map getMap( Map<String, Object> context, String key )
{
Object obj = getObject( context, key, null );
@@ -619,7 +619,7 @@
}
}
- protected static Object getObject( Map context, String key )
+ protected static Object getObject( Map<String, Object> context, String key )
{
if ( !context.containsKey( key ) )
{
@@ -636,7 +636,7 @@
return value;
}
- protected static Object getObject( Map context, String key, Object defaultValue )
+ protected static Object getObject( Map<String, Object> context, String key, Object defaultValue )
{
Object value = context.get( key );
Modified: continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-builder/src/main/java/org/apache/continuum/builder/utils/ContinuumBuildConstant.java Tue Apr 28 04:59:03 2009
@@ -289,7 +289,7 @@
return getString( context, KEY_INSTALLATION_VAR_NAME );
}
- public static List getScmChanges( Map<String, Object> context )
+ public static List<Map> getScmChanges( Map<String, Object> context )
{
return getList( context, KEY_SCM_CHANGES );
}
@@ -318,7 +318,7 @@
}
}
- public static List getChangeSetFiles( Map<String, Object> context )
+ public static List<Map> getChangeSetFiles( Map<String, Object> context )
{
return getList( context, KEY_CHANGESET_FILES );
}
@@ -384,7 +384,7 @@
return getMap( context, KEY_PROJECT_PARENT );
}
- public static List getProjectDevelopers( Map<String, Object> context )
+ public static List<Map> getProjectDevelopers( Map<String, Object> context )
{
return getList( context, KEY_PROJECT_DEVELOPERS );
}
@@ -404,12 +404,12 @@
return getString( context, KEY_PROJECT_DEVELOPER_SCMID );
}
- public static List getProjectDependencies( Map<String, Object> context )
+ public static List<Map> getProjectDependencies( Map<String, Object> context )
{
return getList( context, KEY_PROJECT_DEPENDENCIES );
}
- public static List getProjectNotifiers( Map<String, Object> context )
+ public static List<Map> getProjectNotifiers( Map<String, Object> context )
{
return getList( context, KEY_PROJECT_NOTIFIERS );
}
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=769240&r1=769239&r2=769240&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 28 04:59:03 2009
@@ -343,7 +343,7 @@
}
}
- public void updateBuildResult( Map context )
+ public void updateBuildResult( Map<String, Object> context )
throws ContinuumException
{
try
@@ -435,7 +435,7 @@
}
}
- public void prepareBuildFinished( Map context )
+ public void prepareBuildFinished( Map<String, Object> context )
throws ContinuumException
{
int projectGroupId = ContinuumBuildConstant.getProjectGroupId( context );
@@ -532,7 +532,7 @@
}
}
- public void startPrepareBuild( Map context )
+ public void startPrepareBuild( Map<String, Object> context )
throws ContinuumException
{
try
@@ -639,7 +639,7 @@
return envVars;
}
- public void updateProject( Map context )
+ public void updateProject( Map<String, Object> context )
throws ContinuumException
{
try
@@ -758,7 +758,7 @@
return "";
}
- public boolean shouldBuild( Map context )
+ public boolean shouldBuild( Map<String, Object> context )
{
try
{
@@ -998,7 +998,7 @@
return true;
}
- private List<ProjectDependency> getModifiedDependencies( BuildResult oldBuildResult, Map context )
+ private List<ProjectDependency> getModifiedDependencies( BuildResult oldBuildResult, Map<String, Object> context )
throws ContinuumException
{
if ( oldBuildResult == null )
@@ -1088,7 +1088,7 @@
return null;
}
- private BuildResult convertMapToBuildResult( Map context )
+ private BuildResult convertMapToBuildResult( Map<String, Object> context )
{
BuildResult buildResult = new BuildResult();
@@ -1138,7 +1138,7 @@
return envVars;
}
- private List<ChangeSet> getScmChanges( Map context )
+ private List<ChangeSet> getScmChanges( Map<String, Object> context )
{
List<ChangeSet> changes = new ArrayList<ChangeSet>();
List<Map> scmChanges = ContinuumBuildConstant.getScmChanges( context );
@@ -1159,7 +1159,7 @@
return changes;
}
- private void setChangeFiles( ChangeSet changeSet, Map context )
+ private void setChangeFiles( ChangeSet changeSet, Map<String, Object> context )
{
List<Map> changeFiles = ContinuumBuildConstant.getChangeSetFiles( context );
@@ -1177,7 +1177,7 @@
}
}
- private ProjectDependency getProjectParent( Map context )
+ private ProjectDependency getProjectParent( Map<String, Object> context )
{
Map map = ContinuumBuildConstant.getProjectParent( context );
@@ -1194,7 +1194,7 @@
return null;
}
- private List<ProjectDependency> getProjectDependencies( Map context )
+ private List<ProjectDependency> getProjectDependencies( Map<String, Object> context )
{
List<ProjectDependency> projectDependencies = new ArrayList<ProjectDependency>();
@@ -1215,7 +1215,7 @@
return projectDependencies;
}
- private List<ProjectDeveloper> getProjectDevelopers( Map context )
+ private List<ProjectDeveloper> getProjectDevelopers( Map<String, Object> context )
{
List<ProjectDeveloper> projectDevelopers = new ArrayList<ProjectDeveloper>();
@@ -1236,7 +1236,7 @@
return projectDevelopers;
}
- private List<ProjectNotifier> getProjectNotifiers( Map context )
+ private List<ProjectNotifier> getProjectNotifiers( Map<String, Object> context )
{
List<ProjectNotifier> projectNotifiers = new ArrayList<ProjectNotifier>();
@@ -1264,7 +1264,7 @@
return projectNotifiers;
}
- private ScmResult getScmResult( Map context )
+ private ScmResult getScmResult( Map<String, Object> context )
{
Map map = ContinuumBuildConstant.getScmResult( context );
@@ -1284,7 +1284,7 @@
return null;
}
- private String getMavenProjectVersion( Map context )
+ private String getMavenProjectVersion( Map<String, Object> context )
{
Map map = ContinuumBuildConstant.getMavenProject( context );
@@ -1296,7 +1296,7 @@
return null;
}
- private List<String> getMavenProjectModules( Map context )
+ private List<String> getMavenProjectModules( Map<String, Object> context )
{
Map map = ContinuumBuildConstant.getMavenProject( context );
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=769240&r1=769239&r2=769240&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 28 04:59:03 2009
@@ -189,7 +189,7 @@
try
{
SlaveBuildAgentTransportClient client = new SlaveBuildAgentTransportClient( new URL( buildAgentUrl ) );
- Map result = client.getReleaseResult( releaseId );
+ Map<String, Object> result = client.getReleaseResult( releaseId );
ReleaseResult releaseResult = new ReleaseResult();
releaseResult.setStartTime( DistributedReleaseUtil.getStartTime( result ) );
@@ -453,10 +453,10 @@
}
}
- public List<Map> getAllReleasesInProgress()
+ public List<Map<String, Object>> getAllReleasesInProgress()
throws ContinuumReleaseException, BuildAgentConfigurationException
{
- List<Map> releases = new ArrayList<Map>();
+ List<Map<String, Object>> releases = new ArrayList<Map<String, Object>>();
Map<String, Map<String, Object>> releasesMap = new HashMap<String, Map<String, Object>>();
if ( releasesInProgress != null && !releasesInProgress.isEmpty() )
@@ -525,7 +525,7 @@
return map;
}
- private Map createPropertiesMap( Properties properties )
+ private Map<String, String> createPropertiesMap( Properties properties )
{
Map<String, String> map = new HashMap<String, String>();
Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Tue Apr 28 04:59:03 2009
@@ -878,7 +878,7 @@
{
Collection<Project> projectsList;
- Map projectsMap;
+ Map<Integer, Object> projectsMap;
try
{
@@ -2595,7 +2595,7 @@
// Workflow
// ----------------------------------------------------------------------
- protected void executeAction( String actionName, Map context )
+ protected void executeAction( String actionName, Map<String, Object> context )
throws ContinuumException
{
try
Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/DefaultContinuumNotificationDispatcher.java Tue Apr 28 04:59:03 2009
@@ -109,8 +109,6 @@
private void sendNotification( String messageId, Project project, BuildDefinition buildDefinition,
BuildResult buildResult )
{
- //Map context = new HashMap();
-
// ----------------------------------------------------------------------
// The objects are reread from the store to make sure they're getting the "final"
// state of the objects. Ideally this should be done on a per notifier basis or the
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java Tue Apr 28 04:59:03 2009
@@ -1,9 +1,9 @@
package org.apache.continuum.distributed.transport.master;
-import java.util.Map;
-
import com.atlassian.xmlrpc.ServiceObject;
+import java.util.Map;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -26,22 +26,30 @@
/**
* MasterBuildAgentTransportService
*/
-@ServiceObject( "MasterBuildAgentTransportService" )
+@ServiceObject("MasterBuildAgentTransportService")
public interface MasterBuildAgentTransportService
{
- public Boolean returnBuildResult( Map buildResult ) throws Exception;
+ public Boolean returnBuildResult( Map<String, Object> buildResult )
+ throws Exception;
- public Boolean startProjectBuild( Integer projectId ) throws Exception;
+ public Boolean startProjectBuild( Integer projectId )
+ throws Exception;
- public Boolean prepareBuildFinished( Map prepareBuildResult ) throws Exception;
+ public Boolean prepareBuildFinished( Map<String, Object> prepareBuildResult )
+ throws Exception;
- public Boolean startPrepareBuild( Map prepareBuildResult ) throws Exception;
+ public Boolean startPrepareBuild( Map<String, Object> prepareBuildResult )
+ throws Exception;
- public Map<String, String> getEnvironments( Integer buildDefinitionId, String installationType ) throws Exception;
+ public Map<String, String> getEnvironments( Integer buildDefinitionId, String installationType )
+ throws Exception;
- public Boolean updateProject( Map project ) throws Exception;
+ public Boolean updateProject( Map<String, Object> project )
+ throws Exception;
- public Boolean ping() throws Exception;
+ public Boolean ping()
+ throws Exception;
- public Boolean shouldBuild( Map context ) throws Exception;
+ public Boolean shouldBuild( Map<String, Object> context )
+ throws Exception;
}
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java Tue Apr 28 04:59:03 2009
@@ -67,7 +67,7 @@
}
}
- public Boolean returnBuildResult( Map buildResult )
+ public Boolean returnBuildResult( Map<String, Object> buildResult )
throws Exception
{
Boolean result;
@@ -105,7 +105,7 @@
return result;
}
- public Boolean prepareBuildFinished( Map prepareBuildResult )
+ public Boolean prepareBuildFinished( Map<String, Object> prepareBuildResult )
throws Exception
{
Boolean result;
@@ -143,7 +143,7 @@
return result;
}
- public Boolean startPrepareBuild( Map prepareBuildResult )
+ public Boolean startPrepareBuild( Map<String, Object> prepareBuildResult )
throws Exception
{
Boolean result;
@@ -180,7 +180,7 @@
return result;
}
- public Boolean updateProject( Map project )
+ public Boolean updateProject( Map<String, Object> project )
throws Exception
{
Boolean result;
@@ -199,7 +199,7 @@
return result;
}
- public Boolean shouldBuild( Map context )
+ public Boolean shouldBuild( Map<String, Object> context )
throws Exception
{
Boolean result;
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java Tue Apr 28 04:59:03 2009
@@ -40,7 +40,7 @@
this.distributedBuildManager = distributedBuildManager;
}
- public Boolean returnBuildResult( Map buildResult )
+ public Boolean returnBuildResult( Map<String, Object> buildResult )
throws Exception
{
log.info( "Build result returned." );
@@ -56,7 +56,7 @@
return Boolean.TRUE;
}
- public Boolean prepareBuildFinished( Map prepareBuildResult )
+ public Boolean prepareBuildFinished( Map<String, Object> prepareBuildResult )
throws Exception
{
log.info( "Prepare build finished." );
@@ -72,7 +72,7 @@
return Boolean.TRUE;
}
- public Boolean startPrepareBuild( Map prepareBuildResult )
+ public Boolean startPrepareBuild( Map<String, Object> prepareBuildResult )
throws Exception
{
log.info( "Start prepare build." );
@@ -87,7 +87,7 @@
return distributedBuildManager.getEnvironments( buildDefinitionId, installationType );
}
- public Boolean updateProject( Map project )
+ public Boolean updateProject( Map<String, Object> project )
throws Exception
{
log.info( "Start updating project" );
@@ -95,7 +95,7 @@
return Boolean.TRUE;
}
- public Boolean shouldBuild( Map context )
+ public Boolean shouldBuild( Map<String, Object> context )
throws Exception
{
log.info( "Checking if project should build" );
Modified: continuum/branches/continuum-1.3.x/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/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-api/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportService.java Tue Apr 28 04:59:03 2009
@@ -64,7 +64,7 @@
Map environments )
throws Exception;
- public Map getReleaseResult( String releaseId )
+ public Map<String, Object> getReleaseResult( String releaseId )
throws Exception;
public Map getListener( String releaseId )
Modified: continuum/branches/continuum-1.3.x/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/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-client/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportClient.java Tue Apr 28 04:59:03 2009
@@ -278,7 +278,7 @@
return releaseId;
}
- public Map getReleaseResult( String releaseId )
+ public Map<String, Object> getReleaseResult( String releaseId )
throws Exception
{
Map result;
Modified: continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java Tue Apr 28 04:59:03 2009
@@ -82,10 +82,10 @@
return installations;
}
- public Map getBuildResult( int projectId )
+ public Map<String, Object> getBuildResult( int projectId )
throws Exception
{
- Map buildResult;
+ Map<String, Object> buildResult;
try
{
@@ -212,7 +212,7 @@
}
}
- public Map getListener( String releaseId )
+ public Map<String, Object> getListener( String releaseId )
throws Exception
{
try
@@ -226,7 +226,7 @@
}
}
- public Map getReleaseResult( String releaseId )
+ public Map<String, Object> getReleaseResult( String releaseId )
throws Exception
{
try
Modified: continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-jabber/src/main/java/org/apache/maven/continuum/notification/jabber/JabberContinuumNotifier.java Tue Apr 28 04:59:03 2009
@@ -260,17 +260,17 @@
}
}
- private String getHost( Map configuration )
+ private String getHost( Map<String, String> configuration )
{
if ( configuration.containsKey( "host" ) )
{
- return (String) configuration.get( "host" );
+ return configuration.get( "host" );
}
else
{
if ( configuration.containsKey( "address" ) )
{
- String username = (String) configuration.get( "address" );
+ String username = configuration.get( "address" );
if ( username.indexOf( "@" ) > 0 )
{
@@ -282,13 +282,13 @@
return host;
}
- private int getPort( Map configuration )
+ private int getPort( Map<String, String> configuration )
{
if ( configuration.containsKey( "port" ) )
{
try
{
- return Integer.parseInt( (String) configuration.get( "port" ) );
+ return Integer.parseInt( configuration.get( "port" ) );
}
catch ( NumberFormatException e )
{
@@ -310,11 +310,11 @@
}
}
- private String getUsername( Map configuration )
+ private String getUsername( Map<String, String> configuration )
{
if ( configuration.containsKey( "login" ) )
{
- String username = (String) configuration.get( "login" );
+ String username = configuration.get( "login" );
if ( username.indexOf( "@" ) > 0 )
{
@@ -327,39 +327,39 @@
return fromAddress;
}
- private String getPassword( Map configuration )
+ private String getPassword( Map<String, String> configuration )
{
if ( configuration.containsKey( "password" ) )
{
- return (String) configuration.get( "password" );
+ return configuration.get( "password" );
}
return fromPassword;
}
- private boolean isSslConnection( Map configuration )
+ private boolean isSslConnection( Map<String, String> configuration )
{
if ( configuration.containsKey( "sslConnection" ) )
{
- return convertBoolean( (String) configuration.get( "sslConnection" ) );
+ return convertBoolean( configuration.get( "sslConnection" ) );
}
return sslConnection;
}
- private String getImDomainName( Map configuration )
+ private String getImDomainName( Map<String, String> configuration )
{
if ( configuration.containsKey( "domainName" ) )
{
- return (String) configuration.get( "domainName" );
+ return configuration.get( "domainName" );
}
return imDomainName;
}
- private boolean isGroup( Map configuration )
+ private boolean isGroup( Map<String, String> configuration )
{
- return configuration.containsKey( "isGroup" ) && convertBoolean( (String) configuration.get( "isGroup" ) );
+ return configuration.containsKey( "isGroup" ) && convertBoolean( configuration.get( "isGroup" ) );
}
private boolean convertBoolean( String value )
Modified: continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-notifiers/continuum-notifier-msn/src/main/java/org/apache/maven/continuum/notification/msn/MsnContinuumNotifier.java Tue Apr 28 04:59:03 2009
@@ -229,21 +229,21 @@
}
}
- private String getUsername( Map configuration )
+ private String getUsername( Map<String, String> configuration )
{
if ( configuration.containsKey( "login" ) )
{
- return (String) configuration.get( "login" );
+ return configuration.get( "login" );
}
return fromAddress;
}
- private String getPassword( Map configuration )
+ private String getPassword( Map<String, String> configuration )
{
if ( configuration.containsKey( "password" ) )
{
- return (String) configuration.get( "password" );
+ return configuration.get( "password" );
}
return fromPassword;
Modified: continuum/branches/continuum-1.3.x/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-store/src/main/java/org/apache/continuum/dao/DaoUtilsImpl.java Tue Apr 28 04:59:03 2009
@@ -19,6 +19,20 @@
* under the License.
*/
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Resource;
+import javax.jdo.Extent;
+import javax.jdo.JDOUserException;
+import javax.jdo.PersistenceManager;
+import javax.jdo.PersistenceManagerFactory;
+import javax.jdo.Query;
+import javax.jdo.Transaction;
+
import org.apache.continuum.model.project.ProjectScmRoot;
import org.apache.continuum.model.release.ContinuumReleaseResult;
import org.apache.continuum.model.repository.DirectoryPurgeConfiguration;
@@ -44,19 +58,6 @@
import org.codehaus.plexus.jdo.PlexusJdoUtils;
import org.springframework.stereotype.Repository;
-import javax.annotation.Resource;
-import javax.jdo.Extent;
-import javax.jdo.JDOUserException;
-import javax.jdo.PersistenceManager;
-import javax.jdo.PersistenceManagerFactory;
-import javax.jdo.Query;
-import javax.jdo.Transaction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
@@ -156,13 +157,13 @@
*
* @todo Move to a better place
*/
- public Map<Integer, Integer> getAggregatedProjectIdsAndBuildDefinitionIdsBySchedule( int scheduleId )
+ public Map<Integer, Object> getAggregatedProjectIdsAndBuildDefinitionIdsBySchedule( int scheduleId )
throws ContinuumStoreException
{
- Map<Integer, Integer> projectSource = getProjectIdsAndBuildDefinitionsIdsBySchedule( scheduleId );
- Map<Integer, Integer> projectGroupSource = getProjectGroupIdsAndBuildDefinitionsIdsBySchedule( scheduleId );
+ Map<Integer, Object> projectSource = getProjectIdsAndBuildDefinitionsIdsBySchedule( scheduleId );
+ Map<Integer, Object> projectGroupSource = getProjectGroupIdsAndBuildDefinitionsIdsBySchedule( scheduleId );
- Map<Integer, Integer> aggregate = new HashMap<Integer, Integer>();
+ Map<Integer, Object> aggregate = new HashMap<Integer, Object>();
// start out by checking if we have projects with this scheduleId
if ( projectSource != null )
@@ -199,7 +200,7 @@
* @throws ContinuumStoreException
* @todo Move to a better place
*/
- public Map<Integer, Integer> getProjectIdsAndBuildDefinitionsIdsBySchedule( int scheduleId )
+ public Map<Integer, Object> getProjectIdsAndBuildDefinitionsIdsBySchedule( int scheduleId )
throws ContinuumStoreException
{
PersistenceManager pm = getPersistenceManager();
@@ -273,7 +274,7 @@
* @throws ContinuumStoreException
* @todo Move to a better place
*/
- public Map<Integer, Integer> getProjectGroupIdsAndBuildDefinitionsIdsBySchedule( int scheduleId )
+ public Map<Integer, Object> getProjectGroupIdsAndBuildDefinitionsIdsBySchedule( int scheduleId )
throws ContinuumStoreException
{
PersistenceManager pm = getPersistenceManager();
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/DistributedReleasesAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/DistributedReleasesAction.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/DistributedReleasesAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/DistributedReleasesAction.java Tue Apr 28 04:59:03 2009
@@ -13,6 +13,7 @@
import org.codehaus.redback.integration.interceptor.SecureAction;
import org.codehaus.redback.integration.interceptor.SecureActionBundle;
import org.codehaus.redback.integration.interceptor.SecureActionException;
+
/**
* @plexus.component role="com.opensymphony.xwork2.Action" role-hint="distributedRelease"
*/
@@ -27,11 +28,11 @@
{
DistributedReleaseManager releaseManager = getContinuum().getDistributedReleaseManager();
- List<Map> releases = releaseManager.getAllReleasesInProgress();
+ List<Map<String, Object>> releases = releaseManager.getAllReleasesInProgress();
releasesSummary = new ArrayList<DistributedReleaseSummary>();
- for ( Map release : releases )
+ for ( Map<String, Object> release : releases )
{
DistributedReleaseSummary summary = new DistributedReleaseSummary();
summary.setReleaseId( DistributedReleaseUtil.getReleaseId( release ) );
@@ -54,7 +55,7 @@
{
this.releasesSummary = releasesSummary;
}
-
+
public SecureActionBundle getSecureActionBundle()
throws SecureActionException
{
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/util/GenerateRecipentNotifier.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/util/GenerateRecipentNotifier.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/util/GenerateRecipentNotifier.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/util/GenerateRecipentNotifier.java Tue Apr 28 04:59:03 2009
@@ -39,18 +39,18 @@
@SuppressWarnings("unchecked")
public static String generate( ProjectNotifier notifier )
{
- Map configuration = notifier.getConfiguration();
+ Map<String, String> configuration = notifier.getConfiguration();
String recipent = "unknown";
if ( ( "mail".equals( notifier.getType() ) ) || ( "msn".equals( notifier.getType() ) ) ||
( "jabber".equals( notifier.getType() ) ) )
{
- if ( StringUtils.isNotEmpty( (String) configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD ) ) )
+ if ( StringUtils.isNotEmpty( configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD ) ) )
{
- recipent = (String) configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
+ recipent = configuration.get( AbstractContinuumNotifier.ADDRESS_FIELD );
}
- if ( StringUtils.isNotEmpty( (String) configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) ) )
+ if ( StringUtils.isNotEmpty( configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) ) )
{
- if ( Boolean.parseBoolean( (String) configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) ) )
+ if ( Boolean.parseBoolean( configuration.get( AbstractContinuumNotifier.COMMITTER_FIELD ) ) )
{
if ( "unknown".equals( recipent ) )
{
@@ -65,7 +65,7 @@
}
if ( "irc".equals( notifier.getType() ) )
{
- recipent = (String) configuration.get( "host" );
+ recipent = configuration.get( "host" );
if ( configuration.get( "port" ) != null )
{
recipent = recipent + ":" + configuration.get( "port" );
@@ -74,7 +74,7 @@
}
if ( "wagon".equals( notifier.getType() ) )
{
- recipent = (String) configuration.get( "url" );
+ recipent = configuration.get( "url" );
}
return recipent;
}
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectGroupAction.java Tue Apr 28 04:59:03 2009
@@ -303,7 +303,7 @@
name = getProjectGroupName();
return CONFIRM;
}
-
+
AuditLog event = new AuditLog( getProjectGroupName(), AuditLogConstants.REMOVE_PROJECT_GROUP );
event.setCategory( AuditLogConstants.PROJECT );
event.setCurrentUser( getPrincipal() );
@@ -526,7 +526,7 @@
getContinuum().updateProject( project );
}
}
-
+
AuditLog event = new AuditLog( getProjectGroupName(), AuditLogConstants.MODIFY_PROJECT_GROUP );
event.setCategory( AuditLogConstants.PROJECT );
event.setCurrentUser( getPrincipal() );
@@ -556,7 +556,7 @@
{
getContinuum().buildProjectGroupWithBuildDefinition( projectGroupId, buildDefinitionId );
}
-
+
AuditLog event = new AuditLog( getProjectGroupName(), AuditLogConstants.FORCE_BUILD );
event.setCategory( AuditLogConstants.PROJECT );
event.setCurrentUser( getPrincipal() );
@@ -880,7 +880,7 @@
this.projects = projects;
}
- public Map getProjectGroups()
+ public Map<Integer, String> getProjectGroups()
{
return projectGroups;
}
@@ -900,7 +900,7 @@
this.projectInCOQueue = projectInQueue;
}
- public Collection getProjectList()
+ public Collection<Project> getProjectList()
{
return projectList;
}
@@ -940,7 +940,7 @@
this.filterProperty = filterProperty;
}
- public Map getCriteria()
+ public Map<String, String> getCriteria()
{
return FILTER_CRITERIA;
}
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java?rev=769240&r1=769239&r2=769240&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/SurefireReportAction.java Tue Apr 28 04:59:03 2009
@@ -19,10 +19,8 @@
* under the License.
*/
-import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -35,8 +33,6 @@
import org.apache.maven.continuum.reports.surefire.ReportTestSuiteGenerator;
import org.apache.maven.continuum.reports.surefire.ReportTestSuiteGeneratorException;
import org.apache.maven.continuum.web.exception.AuthorizationRequiredException;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.StringUtils;
/**
* @author Edwin Punzalan
@@ -49,18 +45,18 @@
{
/**
* @plexus.requirement
- */
+ */
private ReportTestSuiteGenerator reportTestSuiteGenerator;
-
+
private int buildId;
private int projectId;
- private List testSuites;
+ private List<ReportTestSuite> testSuites;
- private List testSummaryList;
+ private List<ReportTest> testSummaryList;
- private List testPackageList;
+ private List<ReportTest> testPackageList;
private String projectName;
@@ -89,7 +85,7 @@
return SUCCESS;
}
- private void getSummary( List suiteList )
+ private void getSummary( List<ReportTestSuite> suiteList )
{
int totalTests = 0;
@@ -99,11 +95,8 @@
float totalTime = 0.0f;
- for ( Iterator suites = suiteList.iterator(); suites.hasNext(); )
+ for ( ReportTestSuite suite : suiteList )
{
-
- ReportTestSuite suite = (ReportTestSuite) suites.next();
-
totalTests += suite.getNumberOfTests();
totalErrors += suite.getNumberOfErrors();
@@ -124,11 +117,11 @@
private void getDetails( List<ReportTestSuite> suiteList )
{
- Map testsByPackage = new LinkedHashMap();
+ Map<String, ReportTest> testsByPackage = new LinkedHashMap<String, ReportTest>();
for ( ReportTestSuite suite : suiteList )
{
- ReportTest report = (ReportTest) testsByPackage.get( suite.getPackageName() );
+ ReportTest report = testsByPackage.get( suite.getPackageName() );
if ( report == null )
{
@@ -158,7 +151,7 @@
testsByPackage.put( suite.getPackageName(), report );
}
- testPackageList = new ArrayList( testsByPackage.values() );
+ testPackageList = new ArrayList<ReportTest>( testsByPackage.values() );
}
public int getBuildId()
@@ -186,27 +179,12 @@
this.projectId = projectId;
}
- private String[] getIncludedFiles( File directory, String includes, String excludes )
- {
- DirectoryScanner scanner = new DirectoryScanner();
-
- scanner.setBasedir( directory );
-
- scanner.setIncludes( StringUtils.split( includes, "," ) );
-
- scanner.setExcludes( StringUtils.split( excludes, "," ) );
-
- scanner.scan();
-
- return scanner.getIncludedFiles();
- }
-
- public List getTestSuites()
+ public List<ReportTestSuite> getTestSuites()
{
return testSuites;
}
- public void setTestSuites( List testSuites )
+ public void setTestSuites( List<ReportTestSuite> testSuites )
{
this.testSuites = testSuites;
}
@@ -221,22 +199,22 @@
this.projectName = projectName;
}
- public List getTestSummaryList()
+ public List<ReportTest> getTestSummaryList()
{
return testSummaryList;
}
- public void setTestSummaryList( List testSummaryList )
+ public void setTestSummaryList( List<ReportTest> testSummaryList )
{
this.testSummaryList = testSummaryList;
}
- public List getTestPackageList()
+ public List<ReportTest> getTestPackageList()
{
return testPackageList;
}
- public void setTestPackageList( List testPackageList )
+ public void setTestPackageList( List<ReportTest> testPackageList )
{
this.testPackageList = testPackageList;
}