Thread: [Ccnet-checkins] SF.net SVN: ccnet: [2528] trunk/project

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 2528
          http://svn.sourceforge.net/ccnet/?rev=2528&view=rev
Author:   dpiessens
Date:     2006-09-02 08:55:26 -0700 (Sat, 02 Sep 2006)

Log Message:
-----------
ccnet-738
Modified ccnet infrastructure to support an optional category attribute including tests

Modified Paths:
--------------
    trunk/project/CCTrayLib/Monitoring/DashboardXmlParser.cs
    trunk/project/Remote/ProjectStatus.cs
    trunk/project/UnitTests/CCTrayLib/Presentation/DetailStringProviderTest.cs
    trunk/project/UnitTests/Core/ProjectStatusFixture.cs
    trunk/project/UnitTests/Core/ProjectTest.cs
    trunk/project/UnitTests/UnitTests.csproj
    trunk/project/UnitTests/WebDashboard/Dashboard/ProjectGridTest.cs
    trunk/project/UnitTests/WebDashboard/Plugins/BuildReport/XmlReportActionSchema.xsd
    trunk/project/UnitTests/WebDashboard/Plugins/BuildReport/XmlReportActionTest.cs
    trunk/project/WebDashboard/Dashboard/ProjectGridRow.cs
    trunk/project/WebDashboard/Plugins/FarmReport/XmlReportAction.cs
    trunk/project/core/IProject.cs
    trunk/project/core/Project.cs
    trunk/project/core/ProjectBase.cs

Added Paths:
-----------
    trunk/project/UnitTests/WebDashboard/Plugins/BuildReport/XmlReportActionSchema.xsx

Modified: trunk/project/CCTrayLib/Monitoring/DashboardXmlParser.cs
===================================================================

--- trunk/project/CCTrayLib/Monitoring/DashboardXmlParser.cs	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/CCTrayLib/Monitoring/DashboardXmlParser.cs	2006-09-02 15:55:26 UTC (rev 2528)
@@ -34,6 +34,9 @@
 
 		[XmlAttribute()]
 		public string webUrl;
+
+		[XmlAttribute()]
+		public string category;
 	}
 
 	public class DashboardXmlParser : IDashboardXmlParser
@@ -52,6 +55,7 @@
 					{
 						return new ProjectStatus(
 							project.name,
+							project.category,
 							new ProjectActivity(project.activity),
 							(IntegrationStatus) Enum.Parse(typeof (IntegrationStatus), project.lastBuildStatus),
 							ProjectIntegratorState.Running,

Modified: trunk/project/Remote/ProjectStatus.cs
===================================================================
--- trunk/project/Remote/ProjectStatus.cs	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/Remote/ProjectStatus.cs	2006-09-02 15:55:26 UTC (rev 2528)
@@ -17,6 +17,7 @@
 		private IntegrationStatus buildStatus;
 		private ProjectActivity activity = ProjectActivity.Sleeping;
 		private string name;
+		private string category;
 		private string webURL;
 		private SerializableDateTime lastBuildDate = SerializableDateTime.Default;
 		private string lastBuildLabel;
@@ -33,12 +34,13 @@
 			this.lastBuildDate = new SerializableDateTime(lastBuildDate);
 		}
 
-		public ProjectStatus(string name, ProjectActivity activity, IntegrationStatus buildStatus, ProjectIntegratorState status, string webURL, DateTime lastBuildDate, string lastBuildLabel, string lastSuccessfulBuildLabel, DateTime nextBuildTime)
+		public ProjectStatus(string name, string category, ProjectActivity activity, IntegrationStatus buildStatus, ProjectIntegratorState status, string webURL, DateTime lastBuildDate, string lastBuildLabel, string lastSuccessfulBuildLabel, DateTime nextBuildTime)
 		{
 			this.status = status;
 			this.buildStatus = buildStatus;
 			this.activity = activity;
 			this.name = name;
+			this.category = category;
 			this.webURL = webURL;
 			this.lastBuildDate = new SerializableDateTime(lastBuildDate);
 			this.lastBuildLabel = lastBuildLabel;
@@ -66,6 +68,11 @@
 			get { return name; }
 		}
 
+		public string Category
+		{
+			get { return category; }
+		}
+
 		public string WebURL
 		{
 			get { return webURL; }

Modified: trunk/project/UnitTests/CCTrayLib/Presentation/DetailStringProviderTest.cs
===================================================================
--- trunk/project/UnitTests/CCTrayLib/Presentation/DetailStringProviderTest.cs	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/UnitTests/CCTrayLib/Presentation/DetailStringProviderTest.cs	2006-09-02 15:55:26 UTC (rev 2528)
@@ -30,7 +30,7 @@
 			DateTime nextBuildTime = new DateTime(2005, 7, 20, 15, 12, 30);
 
 			monitor.ProjectStatus = new ProjectStatus(
-				"NAME",
+				"NAME", "category",
 				ProjectActivity.Sleeping,
 				IntegrationStatus.Unknown,
 				ProjectIntegratorState.Running, "url", DateTime.MinValue, "lastLabel", null, nextBuildTime);
@@ -50,7 +50,7 @@
 			DateTime nextBuildTime = DateTime.MaxValue;
 
 			monitor.ProjectStatus = new ProjectStatus(
-				"NAME",
+				"NAME", "category",
 				ProjectActivity.Sleeping,
 				IntegrationStatus.Unknown,
 				ProjectIntegratorState.Running, "url", DateTime.MinValue, "lastLabel", null, nextBuildTime);

Modified: trunk/project/UnitTests/Core/ProjectStatusFixture.cs
===================================================================
--- trunk/project/UnitTests/Core/ProjectStatusFixture.cs	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/UnitTests/Core/ProjectStatusFixture.cs	2006-09-02 15:55:26 UTC (rev 2528)
@@ -6,6 +6,7 @@
 	public class ProjectStatusFixture
 	{
 		public const string DefaultProject = "project";
+		public const string DefaultCategory = "category";
 		public static readonly ProjectActivity DefaultActivity = ProjectActivity.CheckingModifications;
 		public static readonly DateTime DefaultLastBuildDate = DateTime.Now;
 		public const ProjectIntegratorState DefaultIntegratorState = ProjectIntegratorState.Running;
@@ -51,7 +52,12 @@
 
 		public static ProjectStatus New(string project, ProjectActivity activity, IntegrationStatus integrationStatus, ProjectIntegratorState integratorState, string label, DateTime lastBuildDate)
 		{
-			return new ProjectStatus(project, activity, integrationStatus, integratorState, DefaultUrl, lastBuildDate, label, label, DefaultLastBuildDate);
+			return new ProjectStatus(project, DefaultCategory, activity, integrationStatus, integratorState, DefaultUrl, lastBuildDate, label, label, DefaultLastBuildDate);
 		}
+
+		public static ProjectStatus New(string project, string category, ProjectActivity activity, IntegrationStatus integrationStatus, ProjectIntegratorState integratorState, string label, DateTime lastBuildDate)
+		{
+			return new ProjectStatus(project, category, activity, integrationStatus, integratorState, DefaultUrl, lastBuildDate, label, label, DefaultLastBuildDate);
+		}
 	}
 }
\ No newline at end of file

Modified: trunk/project/UnitTests/Core/ProjectTest.cs
===================================================================
--- trunk/project/UnitTests/Core/ProjectTest.cs	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/UnitTests/Core/ProjectTest.cs	2006-09-02 15:55:26 UTC (rev 2528)
@@ -89,7 +89,7 @@
 		public void LoadFullySpecifiedProjectFromConfiguration()
 		{
 			string xml = @"
-<project name=""foo"" webURL=""http://localhost/ccnet"" modificationDelaySeconds=""60"" publishExceptions=""true"">
+<project name=""foo"" webURL=""http://localhost/ccnet"" modificationDelaySeconds=""60"" publishExceptions=""true"" category=""category1"">
 	<workingDirectory>c:\my\working\directory</workingDirectory>
 	<build type=""nant"" />
 	<sourcecontrol type=""filesystem"">
@@ -119,6 +119,7 @@
 			project = (Project) NetReflector.Read(xml);
 			Assert.AreEqual("foo", project.Name);
 			Assert.AreEqual("http://localhost/ccnet", project.WebURL);
+			Assert.AreEqual("category1", project.Category);
 			Assert.AreEqual(60, project.ModificationDelaySeconds);
 			Assert.AreEqual(true, project.PublishExceptions);
 			Assert.IsTrue(project.Builder is NAntTask);

Modified: trunk/project/UnitTests/UnitTests.csproj
===================================================================
--- trunk/project/UnitTests/UnitTests.csproj	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/UnitTests/UnitTests.csproj	2006-09-02 15:55:26 UTC (rev 2528)
@@ -1466,6 +1466,11 @@
                     BuildAction = "EmbeddedResource"
                 />
                 <File
+                    RelPath = "WebDashboard\Plugins\BuildReport\XmlReportActionSchema.xsx"
+                    DependentUpon = "XmlReportActionSchema.xsd"
+                    BuildAction = "None"
+                />
+                <File
                     RelPath = "WebDashboard\Plugins\BuildReport\XmlReportActionTest.cs"
                     SubType = "Code"
                     BuildAction = "Compile"

Modified: trunk/project/UnitTests/WebDashboard/Dashboard/ProjectGridTest.cs
===================================================================
--- trunk/project/UnitTests/WebDashboard/Dashboard/ProjectGridTest.cs	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/UnitTests/WebDashboard/Dashboard/ProjectGridTest.cs	2006-09-02 15:55:26 UTC (rev 2528)
@@ -186,7 +186,7 @@
 		public void ShouldCopyProjectStatusToProjectRow()
 		{
 			// Setup
-			ProjectStatus projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, 
+			ProjectStatus projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, "category",
 			                                                 ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running, "url", DateTime.Today, "my label", null, DateTime.Today);
 			ProjectStatusOnServer[] statusses = new ProjectStatusOnServer[]
 				{
@@ -202,7 +202,7 @@
 			VerifyAll();
 
 			// Setup
-			projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, 
+			projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, "category",
 			                                   ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Stopped, "url", DateTime.Today, "my label", null, DateTime.Today);
 			statusses = new ProjectStatusOnServer[]
 				{
@@ -222,7 +222,7 @@
 		public void ShouldCopyProjectActivityToProjectRow()
 		{
 			// Setup
-			ProjectStatus projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, 
+			ProjectStatus projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, "category", 
 			                                                 ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running, "url", DateTime.Today, "my label", null, DateTime.Today);
 			ProjectStatusOnServer[] statusses = new ProjectStatusOnServer[]
 				{
@@ -238,7 +238,7 @@
 			VerifyAll();
 
 			// Setup
-			projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, 
+			projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, "category",
 			                                   ProjectActivity.CheckingModifications, IntegrationStatus.Success, ProjectIntegratorState.Stopped, "url", DateTime.Today, "my label", null, DateTime.Today);
 			statusses = new ProjectStatusOnServer[]
 				{
@@ -259,7 +259,7 @@
 		{
 			// Setup
 			DateTime date = DateTime.Today;
-			ProjectStatus projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, 
+			ProjectStatus projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, "category",
 			                                                 ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running, "url", date, "my label", null, DateTime.Today);
 			ProjectStatusOnServer[] statusses = new ProjectStatusOnServer[]
 				{
@@ -279,7 +279,7 @@
 		public void ShouldCreateLinkToProjectReport()
 		{
 			// Setup
-			ProjectStatus projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, 
+			ProjectStatus projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, "category",
 			                                                 ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running, "url", DateTime.Today, "1", null, DateTime.Today);
 			
 			ProjectStatusOnServer[] statusses = new ProjectStatusOnServer[]
@@ -300,7 +300,7 @@
 		public void ShouldCopyProjectMessagesToProjectRow()
 		{
 			// Setup
-			ProjectStatus projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, 
+			ProjectStatus projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, "category",
 				ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running, "url", DateTime.Today, "my label", null, DateTime.Today);
 
 			projectStatus1.Messages = new Message[1] {new Message("Test Message")};
@@ -320,7 +320,7 @@
 			VerifyAll();
 
 			// Setup
-			projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, 
+			projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, "category",
 				ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Stopped, "url", DateTime.Today, "my label", null, DateTime.Today);
 
 			projectStatus1.Messages = new Message[2] {new Message(string.Empty), new Message("Second Message")};
@@ -343,15 +343,55 @@
 		}
 
 		[Test]
+		public void ShouldCopyProjectCategoryToProjectRow()
+		{
+			// Setup
+			ProjectStatus projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, "category",
+				ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running, "url", DateTime.Today, "my label", null, DateTime.Today);
+
+
+			ProjectStatusOnServer[] statusses = new ProjectStatusOnServer[]
+				{
+					new ProjectStatusOnServer(projectStatus1, serverSpecifier)
+				};
+			SetupProjectLinkExpectation();
+
+			// Execute
+			ProjectGridRow[] rows = projectGrid.GenerateProjectGridRows(statusses, "myAction", ProjectGridSortColumn.Name, true);
+
+			// Verify
+			Assert.AreEqual("category", rows[0].Category);
+			VerifyAll();
+
+			// Setup
+			projectStatus1 = new ProjectStatus(projectSpecifier.ProjectName, "category1",
+				ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Stopped, "url", DateTime.Today, "my label", null, DateTime.Today);
+
+
+			statusses = new ProjectStatusOnServer[]
+				{
+					new ProjectStatusOnServer(projectStatus1, serverSpecifier)
+				};
+			SetupProjectLinkExpectation();
+
+			// Execute
+			rows = projectGrid.GenerateProjectGridRows(statusses, "myAction", ProjectGridSortColumn.Name, true);
+
+			// Verify
+			Assert.AreEqual("category1", rows[0].Category);
+			VerifyAll();
+		}
+
+		[Test]
 		public void ShouldReturnProjectsSortedByNameIfNameColumnSpecifiedAsSortSeed()
 		{
 			// Setup
 			IProjectSpecifier projectA = new DefaultProjectSpecifier(serverSpecifier, "a");
 			IProjectSpecifier projectB = new DefaultProjectSpecifier(serverSpecifier, "b");
 
-			ProjectStatus projectStatus1 = new ProjectStatus("a", 
+			ProjectStatus projectStatus1 = new ProjectStatus("a", "category",
 			                                                 ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running, "url", DateTime.Today, "1", null, DateTime.Today);
-			ProjectStatus projectStatus2 = new ProjectStatus("b", 
+			ProjectStatus projectStatus2 = new ProjectStatus("b", "category",
 			                                                 ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running, "url", DateTime.Today, "1", null, DateTime.Today);
 			ProjectStatusOnServer[] statusses = new ProjectStatusOnServer[]
 				{
@@ -391,9 +431,9 @@
 			IProjectSpecifier projectA = new DefaultProjectSpecifier(serverSpecifier, "a");
 			IProjectSpecifier projectB = new DefaultProjectSpecifier(serverSpecifier, "b");
 
-			ProjectStatus projectStatus1 = new ProjectStatus("b", 
+			ProjectStatus projectStatus1 = new ProjectStatus("b", "category",
 			                                                 ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running, "url", DateTime.Today, "1", null, DateTime.Today);
-			ProjectStatus projectStatus2 = new ProjectStatus("a", 
+			ProjectStatus projectStatus2 = new ProjectStatus("a", "category",
 			                                                 ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running, "url", DateTime.Today.AddHours(1), "1", null, DateTime.Today);
 			ProjectStatusOnServer[] statusses = new ProjectStatusOnServer[]
 				{
@@ -432,9 +472,9 @@
 			// Setup
 			IProjectSpecifier projectA = new DefaultProjectSpecifier(serverSpecifier, "a");
 			IProjectSpecifier projectB = new DefaultProjectSpecifier(serverSpecifier, "b");
-			ProjectStatus projectStatus1 = new ProjectStatus("a", 
+			ProjectStatus projectStatus1 = new ProjectStatus("a", "category",
 			                                                 ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running, "url", DateTime.Today, "1", null, DateTime.Today);
-			ProjectStatus projectStatus2 = new ProjectStatus("b", 
+			ProjectStatus projectStatus2 = new ProjectStatus("b", "category",
 			                                                 ProjectActivity.Sleeping, IntegrationStatus.Failure, ProjectIntegratorState.Running, "url", DateTime.Today.AddHours(1), "1", null, DateTime.Today);
 			ProjectStatusOnServer[] statusses = new ProjectStatusOnServer[]
 				{
@@ -476,9 +516,9 @@
 			IProjectSpecifier projectA = new DefaultProjectSpecifier(serverSpecifierA, "a");
 			IProjectSpecifier projectB = new DefaultProjectSpecifier(serverSpecifierB, "b");
 
-			ProjectStatus projectStatus1 = new ProjectStatus("a", 
+			ProjectStatus projectStatus1 = new ProjectStatus("a", "category",
 				ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running, "url", DateTime.Today, "1", null, DateTime.Today);
-			ProjectStatus projectStatus2 = new ProjectStatus("b", 
+			ProjectStatus projectStatus2 = new ProjectStatus("b", "category",
 				ProjectActivity.Sleeping, IntegrationStatus.Failure, ProjectIntegratorState.Running, "url", DateTime.Today.AddHours(1), "1", null, DateTime.Today);
 			ProjectStatusOnServer[] statusses = new ProjectStatusOnServer[]
 				{

Modified: trunk/project/UnitTests/WebDashboard/Plugins/BuildReport/XmlReportActionSchema.xsd
===================================================================
--- trunk/project/UnitTests/WebDashboard/Plugins/BuildReport/XmlReportActionSchema.xsd	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/UnitTests/WebDashboard/Plugins/BuildReport/XmlReportActionSchema.xsd	2006-09-02 15:55:26 UTC (rev 2528)
@@ -30,6 +30,7 @@
 						<xs:attribute name="lastBuildTime" type="xs:dateTime" use="required"/>
 						<xs:attribute name="nextBuildTime" type="xs:dateTime" use="required"/>
 						<xs:attribute name="webUrl" type="xs:string" use="required"/>
+						<xs:attribute name="category" type="xs:string" use="required"/>
 					</xs:complexType>
 				</xs:element>
 			</xs:sequence>

Added: trunk/project/UnitTests/WebDashboard/Plugins/BuildReport/XmlReportActionSchema.xsx
===================================================================
--- trunk/project/UnitTests/WebDashboard/Plugins/BuildReport/XmlReportActionSchema.xsx	                        (rev 0)
+++ trunk/project/UnitTests/WebDashboard/Plugins/BuildReport/XmlReportActionSchema.xsx	2006-09-02 15:55:26 UTC (rev 2528)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--This file is auto-generated by the XML Schema Designer. It holds layout information for components on the designer surface.-->
+<XSDDesignerLayout layoutVersion="2" viewPortLeft="-3646" viewPortTop="0" zoom="100">
+    <Projects_XmlElement left="317" top="254" width="5292" height="2963" selected="0" zOrder="1" index="0" expanded="1">
+        <Project_XmlElement left="317" top="3725" width="5292" height="2963" selected="0" zOrder="2" index="0" expanded="1">
+            <activity_XmlAttribute left="-2646" top="7196" width="5292" height="847" selected="0" zOrder="5" index="1" expanded="1">
+                <_x0028_activity_x0029__XmlSimpleType left="-2646" top="8551" width="5292" height="2963" selected="0" zOrder="8" index="0" expanded="1" />
+            </activity_XmlAttribute>
+            <lastBuildStatus_XmlAttribute left="3280" top="7196" width="5292" height="847" selected="0" zOrder="11" index="2" expanded="1">
+                <_x0028_lastBuildStatus_x0029__XmlSimpleType left="3280" top="8551" width="5292" height="2963" selected="0" zOrder="14" index="0" expanded="1" />
+            </lastBuildStatus_XmlAttribute>
+        </Project_XmlElement>
+    </Projects_XmlElement>
+</XSDDesignerLayout>
\ No newline at end of file

Modified: trunk/project/UnitTests/WebDashboard/Plugins/BuildReport/XmlReportActionTest.cs
===================================================================
--- trunk/project/UnitTests/WebDashboard/Plugins/BuildReport/XmlReportActionTest.cs	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/UnitTests/WebDashboard/Plugins/BuildReport/XmlReportActionTest.cs	2006-09-02 15:55:26 UTC (rev 2528)
@@ -80,6 +80,7 @@
 			AssertXPathMatches(doc, "/Projects/Project/@lastBuildTime", XmlConvert.ToString(LastBuildTime));
 			AssertXPathMatches(doc, "/Projects/Project/@nextBuildTime", XmlConvert.ToString(NextBuildTime));
 			AssertXPathMatches(doc, "/Projects/Project/@webUrl", "http://blah");
+			AssertXPathMatches(doc, "/Projects/Project/@category", "category");
 
 			mockFarmService.Verify();
 
@@ -125,7 +126,7 @@
 		private ProjectStatus CreateProjectStatus()
 		{
 			return
-				new ProjectStatus("HelloWorld", ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running,
+				new ProjectStatus("HelloWorld", "category", ProjectActivity.Sleeping, IntegrationStatus.Success, ProjectIntegratorState.Running,
 				                  "http://blah", LastBuildTime, "build_8", "build_7",
 				                  NextBuildTime);
 		}

Modified: trunk/project/WebDashboard/Dashboard/ProjectGridRow.cs
===================================================================
--- trunk/project/WebDashboard/Dashboard/ProjectGridRow.cs	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/WebDashboard/Dashboard/ProjectGridRow.cs	2006-09-02 15:55:26 UTC (rev 2528)
@@ -28,6 +28,11 @@
 			get { return serverSpecifier.ServerName; }
 		}
 
+		public string Category
+		{
+			get { return status.Category; }
+		}
+
 		public string BuildStatus
 		{
 			get { return status.BuildStatus.ToString(); }

Modified: trunk/project/WebDashboard/Plugins/FarmReport/XmlReportAction.cs
===================================================================
--- trunk/project/WebDashboard/Plugins/FarmReport/XmlReportAction.cs	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/WebDashboard/Plugins/FarmReport/XmlReportAction.cs	2006-09-02 15:55:26 UTC (rev 2528)
@@ -41,6 +41,7 @@
 
 			xmlWriter.WriteStartElement("Project");
 			xmlWriter.WriteAttributeString("name", status.Name);
+			xmlWriter.WriteAttributeString("category", status.Category);
 			xmlWriter.WriteAttributeString("activity", status.Activity.ToString());
 			xmlWriter.WriteAttributeString("lastBuildStatus", status.BuildStatus.ToString());
 			xmlWriter.WriteAttributeString("lastBuildLabel", status.LastSuccessfulBuildLabel);

Modified: trunk/project/core/IProject.cs
===================================================================
--- trunk/project/core/IProject.cs	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/core/IProject.cs	2006-09-02 15:55:26 UTC (rev 2528)
@@ -18,6 +18,14 @@
 		}
 
 		/// <summary>
+		/// An optional category that groups the project
+		/// </summary>
+		string Category
+		{
+			get;
+		}
+
+		/// <summary>
 		/// A component to trigger integrations for this project.
 		/// TODO: remove
 		/// </summary>

Modified: trunk/project/core/Project.cs
===================================================================
--- trunk/project/core/Project.cs	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/core/Project.cs	2006-09-02 15:55:26 UTC (rev 2528)
@@ -249,7 +249,7 @@
 
 		public ProjectStatus CreateProjectStatus(IProjectIntegrator integrator)
 		{
-			ProjectStatus status = new ProjectStatus(Name, CurrentActivity, LatestBuildStatus, integrator.State, WebURL,
+			ProjectStatus status = new ProjectStatus(Name, Category, CurrentActivity, LatestBuildStatus, integrator.State, WebURL,
 			                                         LastIntegrationResult.StartTime, LastIntegrationResult.Label, LastIntegrationResult.LastSuccessfulIntegrationLabel, 
 			                                         Triggers.NextBuild);
 			status.Messages = (Message[])messages.ToArray(typeof(Message));

Modified: trunk/project/core/ProjectBase.cs
===================================================================
--- trunk/project/core/ProjectBase.cs	2006-09-01 05:51:18 UTC (rev 2527)
+++ trunk/project/core/ProjectBase.cs	2006-09-02 15:55:26 UTC (rev 2528)
@@ -12,6 +12,7 @@
 		public static readonly string DefaultArtifactSubDirectory = "Artifacts";
 
 		private string name;
+		private string category = "";
 		private string configuredWorkingDirectory = "";
 		private string configuredArtifactDirectory = "";
 		private ITrigger triggers = new MultipleTrigger(new ITrigger[] {new IntervalTrigger() } );
@@ -24,6 +25,13 @@
 			set { name = value; }
 		}
 
+		[ReflectorProperty("category", Required=false)]
+		public virtual string Category
+		{
+			get { return category; }
+			set { category = value; }
+		}
+
 		[ReflectorProperty("triggers", InstanceType=typeof(MultipleTrigger), Required=false)]
 		public ITrigger Triggers
 		{


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Ccnet-checkins] SF.net SVN: ccnet: [2528] trunk/project

An automated continuous integration server for the .NET platform

ccnet-checkins