You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2011/08/16 04:53:01 UTC
svn commit: r1158090 - in /continuum/trunk:
continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/
continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/configuration/
continuu...
Author: ctan
Date: Tue Aug 16 02:53:00 2011
New Revision: 1158090
URL: http://svn.apache.org/viewvc?rev=1158090&view=rev
Log:
[CONTINUUM-2638] do not set buildagenturl when master successfully ping'd the agent, instead retrieve the buildagenturl from the buildcontext
Modified:
continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java
continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java
continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/PrepareBuildProjectsTaskExecutor.java
continuum/trunk/continuum-core/src/test/java/org/apache/continuum/builder/distributed/stubs/SlaveBuildAgentTransportClientStub.java
continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java
continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java
continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.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
continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentService.java Tue Aug 16 02:53:00 2011
@@ -139,7 +139,4 @@ public interface ContinuumBuildAgentServ
*/
String getBuildAgentPlatform()
throws ContinuumBuildAgentException;
-
- void setBuildAgentUrl( String url )
- throws ContinuumBuildAgentException;
}
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/java/org/apache/continuum/buildagent/configuration/BuildAgentConfigurationService.java Tue Aug 16 02:53:00 2011
@@ -51,10 +51,6 @@ public interface BuildAgentConfiguration
String getSharedSecretPassword();
- String getBuildAgentUrl();
-
- void setBuildAgentUrl( String buildAgentUrl );
-
void store()
throws BuildAgentConfigurationException;
}
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-api/src/main/mdo/continuum-buildagent.xml Tue Aug 16 02:53:00 2011
@@ -68,11 +68,6 @@
<version>1.4.1+</version>
<type>String</type>
</field>
- <field>
- <name>buildAgentUrl</name>
- <version>1.4.1+</version>
- <type>String</type>
- </field>
</fields>
</class>
<class xml.tagName="buildagent-installation">
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/ContinuumBuildAgentServiceImpl.java Tue Aug 16 02:53:00 2011
@@ -1004,21 +1004,6 @@ public class ContinuumBuildAgentServiceI
}
}
- public void setBuildAgentUrl( String url )
- throws ContinuumBuildAgentException
- {
- try
- {
- buildAgentConfigurationService.setBuildAgentUrl( url );
- buildAgentConfigurationService.store();
- }
- catch( BuildAgentConfigurationException e )
- {
- log.error( "Error occurred while setting build agent url " + url, e );
- throw new ContinuumBuildAgentException( "Error occurred while setting build agent url " + url, e );
- }
- }
-
private List<BuildContext> initializeBuildContext( List<Map<String, Object>> projectsBuildContext )
{
List<BuildContext> buildContext = new ArrayList<BuildContext>();
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfiguration.java Tue Aug 16 02:53:00 2011
@@ -107,7 +107,6 @@ public class DefaultBuildAgentConfigurat
this.generalBuildAgentConfiguration.setInstallations( configuration.getInstallations() );
this.generalBuildAgentConfiguration.setLocalRepositories( configuration.getLocalRepositories() );
this.generalBuildAgentConfiguration.setSharedSecretPassword( configuration.getSharedSecretPassword() );
- this.generalBuildAgentConfiguration.setBuildAgentUrl( configuration.getBuildAgentUrl() );
}
catch ( IOException e )
{
@@ -158,7 +157,6 @@ public class DefaultBuildAgentConfigurat
configurationModel.setInstallations( this.generalBuildAgentConfiguration.getInstallations() );
configurationModel.setLocalRepositories( this.generalBuildAgentConfiguration.getLocalRepositories() );
configurationModel.setSharedSecretPassword( this.generalBuildAgentConfiguration.getSharedSecretPassword() );
- configurationModel.setBuildAgentUrl( this.generalBuildAgentConfiguration.getBuildAgentUrl() );
ContinuumBuildAgentConfigurationModelXpp3Writer writer =
new ContinuumBuildAgentConfigurationModelXpp3Writer();
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/DefaultBuildAgentConfigurationService.java Tue Aug 16 02:53:00 2011
@@ -155,16 +155,6 @@ public class DefaultBuildAgentConfigurat
return generalBuildAgentConfiguration.getSharedSecretPassword();
}
- public void setBuildAgentUrl( String buildAgentUrl )
- {
- generalBuildAgentConfiguration.setBuildAgentUrl( buildAgentUrl );
- }
-
- public String getBuildAgentUrl()
- {
- return generalBuildAgentConfiguration.getBuildAgentUrl();
- }
-
public void store()
throws BuildAgentConfigurationException
{
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/configuration/GeneralBuildAgentConfiguration.java Tue Aug 16 02:53:00 2011
@@ -39,8 +39,6 @@ public class GeneralBuildAgentConfigurat
private String sharedSecretPassword;
- private String buildAgentUrl;
-
public File getWorkingDirectory()
{
return workingDirectory;
@@ -100,14 +98,4 @@ public class GeneralBuildAgentConfigurat
{
return sharedSecretPassword;
}
-
- public void setBuildAgentUrl( String buildAgentUrl )
- {
- this.buildAgentUrl = buildAgentUrl;
- }
-
- public String getBuildAgentUrl()
- {
- return buildAgentUrl;
- }
}
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/manager/DefaultBuildAgentManager.java Tue Aug 16 02:53:00 2011
@@ -23,7 +23,10 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.Map;
+import org.apache.continuum.buildagent.buildcontext.BuildContext;
+import org.apache.continuum.buildagent.buildcontext.manager.BuildContextManager;
import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService;
+import org.apache.continuum.buildagent.utils.ContinuumBuildAgentUtil;
import org.apache.continuum.distributed.transport.master.MasterBuildAgentTransportClient;
import org.apache.maven.continuum.ContinuumException;
import org.codehaus.plexus.util.StringUtils;
@@ -43,6 +46,11 @@ public class DefaultBuildAgentManager
*/
private BuildAgentConfigurationService buildAgentConfigurationService;
+ /**
+ * @plexus.requirement
+ */
+ private BuildContextManager buildContextManager;
+
public void startProjectBuild( int projectId )
throws ContinuumException
{
@@ -51,7 +59,7 @@ public class DefaultBuildAgentManager
MasterBuildAgentTransportClient client =
new MasterBuildAgentTransportClient( new URL( buildAgentConfigurationService.getContinuumServerUrl() ) )
;
- client.startProjectBuild( projectId, getBuildAgentUrl() );
+ client.startProjectBuild( projectId, getBuildAgentUrl( projectId ) );
}
catch ( MalformedURLException e )
{
@@ -75,7 +83,7 @@ public class DefaultBuildAgentManager
MasterBuildAgentTransportClient client =
new MasterBuildAgentTransportClient( new URL( buildAgentConfigurationService.getContinuumServerUrl() ) )
;
- client.returnBuildResult( buildResult, getBuildAgentUrl() );
+ client.returnBuildResult( buildResult, ContinuumBuildAgentUtil.getBuildAgentUrl( buildResult ) );
}
catch ( MalformedURLException e )
{
@@ -99,7 +107,7 @@ public class DefaultBuildAgentManager
MasterBuildAgentTransportClient client =
new MasterBuildAgentTransportClient( new URL( buildAgentConfigurationService.getContinuumServerUrl() ) )
;
- return client.getEnvironments( buildDefinitionId, installationType, getBuildAgentUrl() );
+ return client.getEnvironments( buildDefinitionId, installationType );
}
catch ( MalformedURLException e )
{
@@ -147,7 +155,7 @@ public class DefaultBuildAgentManager
MasterBuildAgentTransportClient client =
new MasterBuildAgentTransportClient( new URL( buildAgentConfigurationService.getContinuumServerUrl() ) )
;
- return client.shouldBuild( context, getBuildAgentUrl() );
+ return client.shouldBuild( context, ContinuumBuildAgentUtil.getBuildAgentUrl( context ) );
}
catch ( MalformedURLException e )
{
@@ -171,7 +179,7 @@ public class DefaultBuildAgentManager
MasterBuildAgentTransportClient client =
new MasterBuildAgentTransportClient( new URL( buildAgentConfigurationService.getContinuumServerUrl() ) )
;
- client.startPrepareBuild( context, getBuildAgentUrl() );
+ client.startPrepareBuild( context, ContinuumBuildAgentUtil.getBuildAgentUrl( context ) );
}
catch ( MalformedURLException e )
{
@@ -195,7 +203,7 @@ public class DefaultBuildAgentManager
MasterBuildAgentTransportClient client =
new MasterBuildAgentTransportClient( new URL( buildAgentConfigurationService.getContinuumServerUrl() ) )
;
- client.prepareBuildFinished( context, getBuildAgentUrl() );
+ client.prepareBuildFinished( context, ContinuumBuildAgentUtil.getBuildAgentUrl( context ) );
}
catch ( MalformedURLException e )
{
@@ -239,8 +247,15 @@ public class DefaultBuildAgentManager
}
}
- private String getBuildAgentUrl()
+ private String getBuildAgentUrl( int projectId )
{
- return buildAgentConfigurationService.getBuildAgentUrl();
+ BuildContext context = buildContextManager.getBuildContext( projectId );
+
+ if ( context != null )
+ {
+ return context.getBuildAgentUrl();
+ }
+
+ return "";
}
-}
+}
\ No newline at end of file
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/BuildProjectTaskExecutor.java Tue Aug 16 02:53:00 2011
@@ -450,6 +450,7 @@ public class BuildProjectTaskExecutor
map.put( ContinuumBuildAgentUtil.KEY_TRIGGER, context.getTrigger() );
map.put( ContinuumBuildAgentUtil.KEY_USERNAME, context.getUsername() );
map.put( ContinuumBuildAgentUtil.KEY_SCM_CHANGES, getScmChanges( context.getScmResult() ) );
+ map.put( ContinuumBuildAgentUtil.KEY_BUILD_AGENT_URL, context.getBuildAgentUrl() );
if( context.getExecutorId().equals( ContinuumBuildExecutorConstants.MAVEN_TWO_BUILD_EXECUTOR ) )
{
Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/PrepareBuildProjectsTaskExecutor.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/PrepareBuildProjectsTaskExecutor.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/PrepareBuildProjectsTaskExecutor.java (original)
+++ continuum/trunk/continuum-buildagent/continuum-buildagent-core/src/main/java/org/apache/continuum/buildagent/taskqueue/execution/PrepareBuildProjectsTaskExecutor.java Tue Aug 16 02:53:00 2011
@@ -157,6 +157,7 @@ public class PrepareBuildProjectsTaskExe
Map<String, Object> map = new HashMap<String, Object>();
map.put( ContinuumBuildAgentUtil.KEY_PROJECT_GROUP_ID, buildContext.getProjectGroupId() );
map.put( ContinuumBuildAgentUtil.KEY_SCM_ROOT_ADDRESS, buildContext.getScmRootAddress() );
+ map.put( ContinuumBuildAgentUtil.KEY_BUILD_AGENT_URL, buildContext.getBuildAgentUrl() );
try
{
@@ -186,6 +187,7 @@ public class PrepareBuildProjectsTaskExe
actionContext.put( ContinuumBuildAgentUtil.KEY_USERNAME, buildContext.getUsername() );
actionContext.put( ContinuumBuildAgentUtil.KEY_SCM_USERNAME, buildContext.getScmUsername() );
actionContext.put( ContinuumBuildAgentUtil.KEY_SCM_PASSWORD, buildContext.getScmPassword() );
+ actionContext.put( ContinuumBuildAgentUtil.KEY_BUILD_AGENT_URL, buildContext.getBuildAgentUrl() );
buildContext.setActionContext( actionContext );
}
@@ -278,6 +280,8 @@ public class PrepareBuildProjectsTaskExe
ContinuumBuildAgentUtil.getScmRootAddress( context ) );
result.put( ContinuumBuildAgentUtil.KEY_SCM_ROOT_STATE,
ContinuumBuildAgentUtil.getScmRootState( context ) );
+ result.put( ContinuumBuildAgentUtil.KEY_BUILD_AGENT_URL,
+ ContinuumBuildAgentUtil.getBuildAgentUrl( context ) );
if ( ContinuumBuildAgentUtil.getScmRootState( context ) == ContinuumProjectState.ERROR )
{
Modified: continuum/trunk/continuum-core/src/test/java/org/apache/continuum/builder/distributed/stubs/SlaveBuildAgentTransportClientStub.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/test/java/org/apache/continuum/builder/distributed/stubs/SlaveBuildAgentTransportClientStub.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/test/java/org/apache/continuum/builder/distributed/stubs/SlaveBuildAgentTransportClientStub.java (original)
+++ continuum/trunk/continuum-core/src/test/java/org/apache/continuum/builder/distributed/stubs/SlaveBuildAgentTransportClientStub.java Tue Aug 16 02:53:00 2011
@@ -280,13 +280,6 @@ public class SlaveBuildAgentTransportCli
return null;
}
- public void setBuildAgentUrl( String buildAgentUrl )
- throws Exception
- {
- // TODO Auto-generated method stub
-
- }
-
public Boolean isProjectCurrentlyPreparingBuild( int projectId )
throws Exception
{
Modified: continuum/trunk/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/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-api/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportService.java Tue Aug 16 02:53:00 2011
@@ -41,7 +41,7 @@ public interface MasterBuildAgentTranspo
public Boolean startPrepareBuild( Map<String, Object> prepareBuildResult, String buildAgentUrl )
throws Exception;
- public Map<String, String> getEnvironments( Integer buildDefinitionId, String installationType, String buildAgentUrl )
+ public Map<String, String> getEnvironments( Integer buildDefinitionId, String installationType )
throws Exception;
public Boolean updateProject( Map<String, Object> project )
Modified: continuum/trunk/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/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-client/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportClient.java Tue Aug 16 02:53:00 2011
@@ -176,13 +176,13 @@ public class MasterBuildAgentTransportCl
return result;
}
- public Map<String, String> getEnvironments( Integer buildDefinitionId, String installationType, String buildAgentUrl )
+ public Map<String, String> getEnvironments( Integer buildDefinitionId, String installationType )
throws Exception
{
Map<String, String> result;
try
{
- result = master.getEnvironments( buildDefinitionId, installationType, buildAgentUrl );
+ result = master.getEnvironments( buildDefinitionId, installationType );
log.debug( "Retrieved environments. buildDefinitionId={}, installationType={} from master {}",
new Object[] { buildDefinitionId, installationType, masterServerUrl } );
}
Modified: continuum/trunk/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/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-master/continuum-distributed-master-server/src/main/java/org/apache/continuum/distributed/transport/master/MasterBuildAgentTransportServer.java Tue Aug 16 02:53:00 2011
@@ -84,12 +84,12 @@ public class MasterBuildAgentTransportSe
return Boolean.TRUE;
}
- public Map<String, String> getEnvironments( Integer buildDefinitionId, String installationType, String buildAgentUrl )
+ public Map<String, String> getEnvironments( Integer buildDefinitionId, String installationType )
throws Exception
{
Map<String, String> envs = distributedBuildService.getEnvironments( buildDefinitionId, installationType );
- log.debug( "Retrieving environments by build agent {}. buildDefinitionId={}, installationType={}",
- new Object[] { buildAgentUrl, buildDefinitionId, installationType } );
+ log.debug( "Retrieving environments buildDefinitionId={}, installationType={}",
+ new Object[] { buildDefinitionId, installationType } );
return envs;
}
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=1158090&r1=1158089&r2=1158090&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 Tue Aug 16 02:53:00 2011
@@ -154,7 +154,4 @@ public interface SlaveBuildAgentTranspor
*/
public String getBuildAgentPlatform()
throws Exception;
-
- public void setBuildAgentUrl( String buildAgentUrl )
- throws Exception;
}
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=1158090&r1=1158089&r2=1158090&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 Tue Aug 16 02:53:00 2011
@@ -163,11 +163,6 @@ public class SlaveBuildAgentTransportCli
{
result = slave.ping();
log.debug( "Ping build agent {} : {}", buildAgentUrl, ( result ? "ok" : "failed" ) );
-
- if ( result )
- {
- slave.setBuildAgentUrl( buildAgentUrl );
- }
}
catch ( Exception e )
{
@@ -815,10 +810,4 @@ public class SlaveBuildAgentTransportCli
return result;
}
-
- public void setBuildAgentUrl( String buildAgentUrl )
- throws Exception
- {
- slave.setBuildAgentUrl( buildAgentUrl );
- }
}
Modified: continuum/trunk/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/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java?rev=1158090&r1=1158089&r2=1158090&view=diff
==============================================================================
--- continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java (original)
+++ continuum/trunk/continuum-distributed/continuum-distributed-slave/continuum-distributed-slave-server/src/main/java/org/apache/continuum/distributed/transport/slave/SlaveBuildAgentTransportServer.java Tue Aug 16 02:53:00 2011
@@ -575,10 +575,4 @@ public class SlaveBuildAgentTransportSer
{
return continuumBuildAgentService.getBuildAgentPlatform();
}
-
- public void setBuildAgentUrl( String buildAgentUrl )
- throws Exception
- {
- continuumBuildAgentService.setBuildAgentUrl( buildAgentUrl );
- }
}