Skip to content
This repository was archived by the owner on Feb 12, 2025. It is now read-only.

Update. Lasts 5 Builds & Queue Position #245

Open
wants to merge 147 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
92b4f8e
Update ProjectGridRow.cs
PabloJHM Apr 12, 2016
5989589
Update Web.config
PabloJHM Apr 12, 2016
97136d3
Update Web.config
PabloJHM Apr 12, 2016
f2fb3bf
Update ProjectGrid.cs
PabloJHM Apr 12, 2016
c7c051d
Create DataGridRow.cs
PabloJHM Apr 12, 2016
7ff85d8
Update ProjectGrid.vm
PabloJHM Apr 12, 2016
f01fdee
Update DataGridRow.cs
PabloJHM Apr 12, 2016
e8b19df
Update ProjectGridRow.cs
PabloJHM Apr 12, 2016
db631a2
Create ProjectGridParameters.cs
PabloJHM Apr 12, 2016
0335e8e
Update VelocityProjectGridAction.cs
PabloJHM Apr 12, 2016
dd393aa
ProjectGrid: QueuePosition
PabloJHM Apr 13, 2016
0e5c232
Update cruisecontrol.css
PabloJHM Apr 13, 2016
4f492b0
Update ProjectGrid.vm
PabloJHM Apr 13, 2016
a62f3b9
Update ProjectGrid.vm
PabloJHM Apr 13, 2016
9f8f369
Update ProjectGrid.vm
PabloJHM Apr 13, 2016
c9ab524
Update cruisecontrol.css
PabloJHM Apr 13, 2016
57a7cbf
Update ProjectGrid.cs
PabloJHM Apr 13, 2016
7167c7a
Update ProjectGrid.vm
PabloJHM Apr 13, 2016
c77f6ea
Update ProjectGrid.vm
PabloJHM Apr 14, 2016
2519eb6
Update ProjectGrid.vm
PabloJHM Apr 15, 2016
eab632f
Update ProjectGrid.vm
PabloJHM Apr 15, 2016
28eb4c2
Update VelocityProjectGridAction.cs
PabloJHM Apr 18, 2016
45ba234
Update IFarmService.cs
PabloJHM Apr 18, 2016
ecb46dd
Update ProjectGridRow.cs
PabloJHM Apr 18, 2016
a679fe0
Update ProjectGridRow.cs
PabloJHM Apr 18, 2016
c6543ee
Update ProjectGridRow.cs
PabloJHM Apr 18, 2016
b2c057d
Update ProjectGrid.vm
PabloJHM Apr 18, 2016
6f509f8
Update ProjectGrid.vm
PabloJHM Apr 18, 2016
64647ed
Merge pull request #15 from PabloJHM/PabloJHM-patch-15
PabloJHM Apr 25, 2016
9d64b3a
Merge pull request #14 from PabloJHM/PabloJHM-patch-14
PabloJHM Apr 25, 2016
9f2f8d3
Merge pull request #13 from PabloJHM/PabloJHM-patch-13
PabloJHM Apr 25, 2016
50f4a54
Merge pull request #12 from PabloJHM/PabloJHM-patch-12
PabloJHM Apr 25, 2016
c4629ec
Merge pull request #4 from PabloJHM/PabloJHM-patch-3
PabloJHM Apr 25, 2016
54adf9f
Update ProjectGrid.cs
PabloJHM Apr 27, 2016
3e7bf02
Update ProjectGrid.vm
PabloJHM Apr 27, 2016
038f314
Update ProjectGridRow.cs
PabloJHM Apr 27, 2016
6e07eb0
Update ProjectGrid.cs
PabloJHM Apr 28, 2016
3cf05b9
Update DataGridRow.cs
PabloJHM Apr 28, 2016
b8021b0
Update VelocityProjectGridAction.cs
PabloJHM May 5, 2016
b117cd5
Update IFarmService.cs
PabloJHM May 5, 2016
e28b0dd
Update ServerAggregatingCruiseManagerWrapper.cs
PabloJHM May 5, 2016
76e7692
Update ProjectGridRow.cs
PabloJHM May 5, 2016
511ba89
Update ProjectGrid.vm
PabloJHM May 5, 2016
b295ab8
Update cruisecontrol.css
PabloJHM May 5, 2016
ed4cc22
Update Project.cs
PabloJHM May 6, 2016
b6e563e
Update ProjectGrid.vm
PabloJHM May 6, 2016
49b286b
Update cruisecontrol.css
PabloJHM May 6, 2016
42a2a38
Update Message.cs
PabloJHM May 6, 2016
b958230
Update ProjectGridRow.cs
PabloJHM May 6, 2016
fae40c6
Update Project.cs
PabloJHM May 6, 2016
d9b46b3
Update VelocityProjectGridAction.cs
PabloJHM May 6, 2016
0076783
Update IFarmService.cs
PabloJHM May 6, 2016
d7e8ed4
Update ServerAggregatingCruiseManagerWrapper.cs
PabloJHM May 6, 2016
04ddfd3
Update ServerAggregatingCruiseManagerWrapper.cs
PabloJHM May 6, 2016
52beaa0
Update IFarmService.cs
PabloJHM May 6, 2016
2ba3ab4
Update VelocityProjectGridAction.cs
PabloJHM May 6, 2016
657edce
Update ProjectGrid.cs: ReadDataFromFile
PabloJHM May 12, 2016
bafbcff
Update ProjectGrid.vm
PabloJHM May 12, 2016
969d053
Merge pull request #24 from PabloJHM/PabloJHM-patch-24
PabloJHM May 12, 2016
0154952
Merge pull request #23 from PabloJHM/PabloJHM-patch-23
PabloJHM May 12, 2016
aaf4673
Merge pull request #22 from PabloJHM/PabloJHM-patch-22
PabloJHM May 12, 2016
b4d1086
Merge pull request #25 from PabloJHM/PabloJHM-patch-25
PabloJHM May 12, 2016
4bba3dd
Merge pull request #21 from PabloJHM/PabloJHM-patch-21
PabloJHM May 13, 2016
65eb788
Merge pull request #20 from PabloJHM/PabloJHM-patch-20
PabloJHM May 13, 2016
8458b12
Merge pull request #19 from PabloJHM/PabloJHM-patch-19
PabloJHM May 13, 2016
cfa7917
Merge pull request #18 from PabloJHM/PabloJHM-patch-18
PabloJHM May 13, 2016
e4bdceb
Merge pull request #17 from PabloJHM/PabloJHM-patch-17
PabloJHM May 13, 2016
0a474f3
Merge pull request #16 from PabloJHM/PabloJHM-patch-16
PabloJHM May 13, 2016
5949b2e
Update ProjectGrid.cs
PabloJHM May 13, 2016
6317bb2
Update ProjectGrid.cs
PabloJHM May 13, 2016
ca05d84
Update ProjectGridRow.cs
PabloJHM May 13, 2016
d638987
Update ProjectGrid.vm
PabloJHM May 13, 2016
5e6cf93
Update Program.cs
PabloJHM May 16, 2016
55f6e3f
Update CommandType.cs
PabloJHM May 16, 2016
1e2ffb8
Update Help.txt
PabloJHM May 16, 2016
8fd6d16
Merge pull request #31 from PabloJHM/PabloJHM-patch-31
PabloJHM May 19, 2016
45e538f
Merge pull request #30 from PabloJHM/PabloJHM-patch-30
PabloJHM May 20, 2016
499356a
Merge pull request #29 from PabloJHM/PabloJHM-patch-29
PabloJHM May 20, 2016
80fc5b9
Merge pull request #28 from PabloJHM/PabloJHM-patch-28
PabloJHM May 20, 2016
14ed1d8
Merge pull request #27 from PabloJHM/PabloJHM-patch-27
PabloJHM May 20, 2016
95843aa
Update ProjectGrid.cs
PabloJHM May 20, 2016
a0e9000
Update ProjectGrid.vm
PabloJHM May 20, 2016
bec5021
Update ProjectGridRow.cs
PabloJHM May 20, 2016
3df8c6d
Update cruisecontrol.css
PabloJHM May 20, 2016
7d3b4f6
Update ProjectGrid.cs
PabloJHM May 23, 2016
26e6234
Update Project.cs
PabloJHM May 23, 2016
87cc2f3
Merge pull request #41 from PabloJHM/PabloJHM-patch-41
PabloJHM May 23, 2016
d2e3008
Merge pull request #40 from PabloJHM/PabloJHM-patch-40
PabloJHM Jun 3, 2016
45040ca
Merge pull request #39 from PabloJHM/PabloJHM-patch-39
PabloJHM Jun 3, 2016
f910fb4
Merge pull request #38 from PabloJHM/PabloJHM-patch-38
PabloJHM Jun 3, 2016
9287008
Merge pull request #37 from PabloJHM/PabloJHM-patch-37
PabloJHM Jun 3, 2016
842b8b7
Update Program.cs
PabloJHM Jun 3, 2016
6b70089
Merge pull request #42 from PabloJHM/PabloJHM-patch-42
PabloJHM Jun 3, 2016
337cc59
Update CommandType.cs
PabloJHM Jun 3, 2016
0b69780
Update Help.txt
PabloJHM Jun 3, 2016
aa51d6b
Update RemotingCruiseProjectManager.cs
PabloJHM Jun 3, 2016
8310ba5
Merge pull request #43 from PabloJHM/PabloJHM-patch-43
PabloJHM Jun 3, 2016
0eebfc0
Update Project.cs
PabloJHM Jun 3, 2016
52cf674
Merge pull request #44 from PabloJHM/PabloJHM-patch-44
PabloJHM Jun 3, 2016
4b3671f
Update ProjectGridTest.cs
PabloJHM Jun 3, 2016
04b268f
Update IProjectGrid.cs
PabloJHM Jun 3, 2016
0ef39ec
Update ProjectGrid.cs
PabloJHM Jun 3, 2016
378b6ac
Update VelocityProjectGridAction.cs
PabloJHM Jun 3, 2016
e98b0d3
Delete .gitignore
PabloJHM Jun 3, 2016
680a7b1
Delete Cancelled.png
PabloJHM Jun 3, 2016
52890b6
Delete CompletedFailed.png
PabloJHM Jun 3, 2016
786295c
Delete CompletedSuccess.png
PabloJHM Jun 3, 2016
ff2e668
Delete Pending.png
PabloJHM Jun 3, 2016
46d5aae
Delete Running.png
PabloJHM Jun 3, 2016
807ff95
Delete Unknown.png
PabloJHM Jun 3, 2016
a6c1083
Delete arrow_minus_small.gif
PabloJHM Jun 3, 2016
88cfc92
Delete arrow_plus_small.gif
PabloJHM Jun 3, 2016
01c448c
Delete asc.gif
PabloJHM Jun 3, 2016
8571a42
Delete bg.gif
PabloJHM Jun 3, 2016
3fef0bc
Delete bg_blue_stripe.gif
PabloJHM Jun 3, 2016
10cbf2f
Delete ccnet_logo.gif
PabloJHM Jun 3, 2016
eb65c25
Delete ccnet_logo_onwhite.gif
PabloJHM Jun 3, 2016
b2b3628
Delete check.jpg
PabloJHM Jun 3, 2016
20fa9c5
Delete corner_blue_lr.gif
PabloJHM Jun 3, 2016
8665a6e
Delete corner_blue_ur.gif
PabloJHM Jun 3, 2016
3248287
Delete corner_white_ll.gif
PabloJHM Jun 3, 2016
725d6ad
Delete corner_white_ul.gif
PabloJHM Jun 3, 2016
35e9605
Delete corner_white_ur.GIF
PabloJHM Jun 3, 2016
f8f25da
Delete desc.gif
PabloJHM Jun 3, 2016
0baa119
Delete error.png
PabloJHM Jun 3, 2016
2102691
Delete fxcop-critical-error.gif
PabloJHM Jun 3, 2016
cf92fcf
Delete fxcop-critical-warning.gif
PabloJHM Jun 3, 2016
eb99406
Delete fxcop-error.gif
PabloJHM Jun 3, 2016
ed11f92
Delete fxcop-warning.gif
PabloJHM Jun 3, 2016
433f678
Delete minus.png
PabloJHM Jun 3, 2016
ac6a1dc
Delete ok.png
PabloJHM Jun 3, 2016
47b091b
Delete plus.png
PabloJHM Jun 3, 2016
3f2e247
Delete rss.png
PabloJHM Jun 3, 2016
b8abcc4
Delete shim.gif
PabloJHM Jun 3, 2016
36fbb1d
Delete tipsy-north.gif
PabloJHM Jun 3, 2016
b8943eb
Delete tw_open_source_small.png
PabloJHM Jun 3, 2016
0ac9c26
Delete warning.png
PabloJHM Jun 3, 2016
e48f6cc
Create hue.txt
PabloJHM Jun 3, 2016
cbb23db
Add files via upload
PabloJHM Jun 3, 2016
bdd80f8
Delete hue.txt
PabloJHM Jun 3, 2016
c3f8138
Update CategorizedFarmReportFarmPlugin.cs
PabloJHM Jun 3, 2016
5108c0b
Merge pull request #45 from PabloJHM/PabloJHM-patch-45
PabloJHM Jun 3, 2016
38a4885
Update IFarmService.cs
PabloJHM Jun 3, 2016
e583e53
Update ServerAggregatingCruiseManagerWrapper.cs
PabloJHM Jun 3, 2016
4e91b0b
Update ProjectGrid.vm
PabloJHM Jun 3, 2016
89012de
Update Web.config
PabloJHM Jun 3, 2016
feb64ff
Update CommonAssemblyInfo.cs
PabloJHM Jun 3, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion project/CCCmd/CommandType.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
namespace ThoughtWorks.CruiseControl.CCCmd
namespace ThoughtWorks.CruiseControl.CCCmd
{
public enum CommandType
{
Retrieve,
ForceBuild,
CancelPending,
AbortBuild,
StartProject,
StopProject,
Volunteer,
CancelVolunteer,
Help
}
}
5 changes: 4 additions & 1 deletion project/CCCmd/Help.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CruiseControl.Net Command-Line Utility
CruiseControl.Net Command-Line Utility
Provides command-line access to a CruiseControl.Net server

CCCmd <command> [options]
Expand All @@ -7,8 +7,11 @@ command: one of the following actions
help: display this help screen
retrieve: retrieve details on a project or server
forcebuild: forces a build on a project
cancelpending: remove a build from the queue
abortbuild: aborts a build on a project
startproject: starts a project integrator
stopproject: stops a project integrator
volunteer: sets you as the fixer
cancelvolunteer: remove the fixer from a project

options:
208 changes: 144 additions & 64 deletions project/CCCmd/Program.cs

Large diffs are not rendered by default.

202 changes: 101 additions & 101 deletions project/CCTrayLib/Monitoring/RemotingCruiseProjectManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@

namespace ThoughtWorks.CruiseControl.CCTrayLib.Monitoring
{
/// <summary>
/// Allows access to the state of a single cruise control project, over remoting
/// </summary>
public class RemotingCruiseProjectManager : ICruiseProjectManager
{
/// <summary>
/// Allows access to the state of a single cruise control project, over remoting
/// </summary>
public class RemotingCruiseProjectManager : ICruiseProjectManager
{
private readonly CruiseServerClientBase manager;
private readonly string projectName;
private readonly string projectName;

public RemotingCruiseProjectManager(CruiseServerClientBase manager, string projectName)
{
this.manager = manager;
this.projectName = projectName;
}
{
this.manager = manager;
this.projectName = projectName;
}

public void ForceBuild(string sessionToken, Dictionary<string, string> parameters, string userName)
{
try
{
{
try
{
manager.DisplayName = userName;
manager.SessionToken = sessionToken;
if (parameters != null)
Expand All @@ -35,112 +35,112 @@ public void ForceBuild(string sessionToken, Dictionary<string, string> parameter
{
manager.ForceBuild(projectName);
}
}
// Silently ignore exceptions that occur due to connection problems
catch (System.Net.Sockets.SocketException)
{
}
catch (System.Runtime.Remoting.RemotingException)
{
}
}
}
// Silently ignore exceptions that occur due to connection problems
catch (System.Net.Sockets.SocketException)
{
}
catch (System.Runtime.Remoting.RemotingException)
{
}
}

public void FixBuild(string sessionToken, string fixingUserName)
{
string Fixer;
if (fixingUserName.Trim().Length == 0)
{
Fixer = Environment.UserName;
}
else
{
Fixer = fixingUserName;
}
public void FixBuild(string sessionToken, string fixingUserName)
{
string Fixer;
if (fixingUserName.Trim().Length == 0)
{
Fixer = Environment.UserName;
}
else
{
Fixer = fixingUserName;
}

try
{
string message = string.Format(System.Globalization.CultureInfo.CurrentCulture,"{0} is fixing the build.", Fixer);
try
{
string message = string.Format(System.Globalization.CultureInfo.CurrentCulture, "Fixer: {0}.", Fixer);
manager.SessionToken = sessionToken;
manager.SendMessage(projectName, new Message(message, Message.MessageKind.Fixer));
}
// Silently ignore exceptions that occur due to connection problems
catch (System.Net.Sockets.SocketException)
{
}
catch (System.Runtime.Remoting.RemotingException)
{
}
}
}
// Silently ignore exceptions that occur due to connection problems
catch (System.Net.Sockets.SocketException)
{
}
catch (System.Runtime.Remoting.RemotingException)
{
}
}

public void AbortBuild(string sessionToken, string userName)
{
try
{
{
try
{
manager.DisplayName = userName;
manager.SessionToken = sessionToken;
manager.AbortBuild(projectName);
}
// Silently ignore exceptions that occur due to connection problems
catch (System.Net.Sockets.SocketException)
{
}
catch (System.Runtime.Remoting.RemotingException)
{
}
}
}
// Silently ignore exceptions that occur due to connection problems
catch (System.Net.Sockets.SocketException)
{
}
catch (System.Runtime.Remoting.RemotingException)
{
}
}

public void StopProject(string sessionToken)
{
try
{
{
try
{
manager.SessionToken = sessionToken;
manager.StopProject(projectName);
}
// Silently ignore exceptions that occur due to connection problems
catch (System.Net.Sockets.SocketException)
{
}
catch (System.Runtime.Remoting.RemotingException)
{
}
}
}
// Silently ignore exceptions that occur due to connection problems
catch (System.Net.Sockets.SocketException)
{
}
catch (System.Runtime.Remoting.RemotingException)
{
}
}

public void StartProject(string sessionToken)
{
try
{
{
try
{
manager.SessionToken = sessionToken;
manager.StartProject(projectName);
}
// Silently ignore exceptions that occur due to connection problems
catch (System.Net.Sockets.SocketException)
{
}
catch (System.Runtime.Remoting.RemotingException)
{
}
}
}
// Silently ignore exceptions that occur due to connection problems
catch (System.Net.Sockets.SocketException)
{
}
catch (System.Runtime.Remoting.RemotingException)
{
}
}

public void CancelPendingRequest(string sessionToken)
{
try
{
{
try
{
manager.SessionToken = sessionToken;
manager.CancelPendingRequest(projectName);
}
// Silently ignore exceptions that occur due to connection problems
catch (System.Net.Sockets.SocketException)
{
}
catch (System.Runtime.Remoting.RemotingException)
{
}
}
}
// Silently ignore exceptions that occur due to connection problems
catch (System.Net.Sockets.SocketException)
{
}
catch (System.Runtime.Remoting.RemotingException)
{
}
}

public string ProjectName
{
get { return projectName; }
}
public string ProjectName
{
get { return projectName; }
}

#region RetrieveSnapshot()
/// <summary>
Expand Down Expand Up @@ -187,5 +187,5 @@ public virtual List<ParameterBase> ListBuildParameters()
{
return manager.ListBuildParameters(projectName);
}
}
}
}
4 changes: 2 additions & 2 deletions project/CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.18408
// Runtime Version:4.0.30319.34014
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Expand All @@ -12,7 +12,7 @@

[assembly: AssemblyCompanyAttribute("ThoughtWorks Inc.")]
[assembly: AssemblyProductAttribute("CruiseControl.NET")]
[assembly: AssemblyCopyrightAttribute("Copyright 2003 - 2014 ThoughtWorks Inc.")]
[assembly: AssemblyCopyrightAttribute("Copyright © 2003 - 2016 ThoughtWorks Inc.")]
[assembly: AssemblyTrademarkAttribute("")]
[assembly: AssemblyVersionAttribute("0.0.0.0")]
[assembly: AssemblyFileVersionAttribute("0.0.0.0")]
Expand Down
9 changes: 7 additions & 2 deletions project/Remote/Message.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,12 @@ public enum MessageKind
///
/// </summary>
/// <remarks></remarks>
BuildAbortedBy = 5
BuildAbortedBy = 5,
/// <summary>
///
/// </summary>
/// <remarks></remarks>
ForceBuildPublisherFailed = 6
}

private string message;
Expand Down Expand Up @@ -137,4 +142,4 @@ public override int GetHashCode()
return this.ToString().GetHashCode();
}
}
}
}
Loading