[Ccnet-checkins] ccnet/project/core/sourcecontrol Cvs.cs,1.15,1.16 Vault.cs,1.1,1.2 VaultHistoryPars

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

Update of /cvsroot/ccnet/ccnet/project/core/sourcecontrol
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18194/project/core/sourcecontrol

Modified Files:
	Cvs.cs Vault.cs VaultHistoryParser.cs 
Log Message:
small refactoring of cvs and vault code

Index: Cvs.cs
===================================================================
RCS file: /cvsroot/ccnet/ccnet/project/core/sourcecontrol/Cvs.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Cvs.cs	31 May 2004 10:59:33 -0000	1.15
--- Cvs.cs	31 May 2004 12:01:18 -0000	1.16
***************
*** 15,26 ****
  		public const string GET_SOURCE_COMMAND_FORMAT = @"-q update -d -P";	// build directories, prune empty directories, (get clean copy - use -C)
  		public const string COMMAND_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss 'GMT'";
- 
  		private string _executable = "cvs.exe";
- 		private string _cvsRoot;
  		private string _workingDirectory;
! 		private bool _labelOnSuccess;
!         private string _restrictLogins;
! 		private IUrlBuilder _urlBuilder;
!  
  		public Cvs() : this(new CvsHistoryParser(), new ProcessExecutor()) { }

--- 15,22 ----
  		public const string GET_SOURCE_COMMAND_FORMAT = @"-q update -d -P";	// build directories, prune empty directories, (get clean copy - use -C)
  		public const string COMMAND_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss 'GMT'";
  		private string _executable = "cvs.exe";
  		private string _workingDirectory;
! 		private string _cvsRoot;
! 
  		public Cvs() : this(new CvsHistoryParser(), new ProcessExecutor()) { }

***************
*** 30,35 ****
  		public string Executable
  		{
! 			get { return _executable;}
! 			set { _executable = value;}
  		}

--- 26,31 ----
  		public string Executable
  		{
! 			get { return _executable; }
! 			set { _executable = value; }
  		}

***************
*** 37,71 ****
  		public string CvsRoot
  		{
! 			get { return _cvsRoot;}
! 			set { _cvsRoot = value;}
  		}
! 		
  		[ReflectorProperty("workingDirectory")]
  		public string WorkingDirectory
  		{
! 			get { return _workingDirectory;}
! 			set { _workingDirectory = value;}
! 		}		

  		[ReflectorProperty("labelOnSuccess", Required=false)]
! 		public bool LabelOnSuccess
! 		{
! 			get { return _labelOnSuccess;}
! 			set { _labelOnSuccess = value;}
! 		}

          [ReflectorProperty("restrictLogins", Required=false)]
!         public string RestrictLogins 
! 		{
!             get{ return _restrictLogins; }
!             set{ _restrictLogins = value; }
!         }

  		[ReflectorProperty("webUrlBuilder", InstanceTypeKey="type", Required=false)]
! 		public IUrlBuilder UrlBuilder
! 		{
! 			get { return _urlBuilder; }
! 			set { _urlBuilder = value; }
! 		}

  		[ReflectorProperty("branch", Required=false)]
--- 33,55 ----
  		public string CvsRoot
  		{
! 			get { return _cvsRoot; }
! 			set { _cvsRoot = value; }
  		}
! 
  		[ReflectorProperty("workingDirectory")]
  		public string WorkingDirectory
  		{
! 			get { return _workingDirectory; }
! 			set { _workingDirectory = value; }
! 		}

  		[ReflectorProperty("labelOnSuccess", Required=false)]
! 		public bool LabelOnSuccess;

          [ReflectorProperty("restrictLogins", Required=false)]
!         public string RestrictLogins; 

  		[ReflectorProperty("webUrlBuilder", InstanceTypeKey="type", Required=false)]
! 		public IUrlBuilder UrlBuilder;

  		[ReflectorProperty("branch", Required=false)]
***************
*** 83,89 ****
  		{
  			Modification[] modifications = GetModifications(CreateHistoryProcessInfo(from, to), from, to);
! 			if ( _urlBuilder != null ) 
  			{
! 				_urlBuilder.SetupModification(modifications);
  			}
  			return modifications;
--- 67,73 ----
  		{
  			Modification[] modifications = GetModifications(CreateHistoryProcessInfo(from, to), from, to);
! 			if (UrlBuilder != null ) 
  			{
! 				UrlBuilder.SetupModification(modifications);
  			}
  			return modifications;

Index: VaultHistoryParser.cs
===================================================================
RCS file: /cvsroot/ccnet/ccnet/project/core/sourcecontrol/VaultHistoryParser.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** VaultHistoryParser.cs	31 May 2004 04:50:30 -0000	1.1
--- VaultHistoryParser.cs	31 May 2004 12:01:19 -0000	1.2
***************
*** 8,17 ****
  	public class VaultHistoryParser : IHistoryParser
  	{
- 		public VaultHistoryParser()
- 		{
- 		}
- 
- 		#region IHistoryParser Members
- 
  		public Modification[] Parse(TextReader history, DateTime from, DateTime to)
  		{
--- 8,11 ----
***************
*** 135,140 ****
  		}
  		#endregion
- 
- 		#endregion
  	}
  }
--- 129,132 ----

Index: Vault.cs
===================================================================
RCS file: /cvsroot/ccnet/ccnet/project/core/sourcecontrol/Vault.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Vault.cs	31 May 2004 04:50:30 -0000	1.1
--- Vault.cs	31 May 2004 12:01:18 -0000	1.2
***************
*** 15,118 ****
  		// TODO: might want to make rowlimit configurable?
  		private const string COMMAND_LINE = @"history ""{0}"" -host {1} -user {2} -password {3} -repository {4} -rowlimit 0";
- 		private string _username;
- 		private string _password;
- 		private string _host;
- 		private string _repository;
- 		private string _folder;
- 		private string _executable;
- 		private bool _ssl;

- 		#region Properties
  		[ReflectorProperty("username")]
! 		public string Username
! 		{
! 			get
! 			{
! 				return _username;
! 			}
! 			set
! 			{
! 				_username = value;
! 			}
! 		}

  		[ReflectorProperty("password")]
! 		public string Password
! 		{
! 			get
! 			{
! 				return _password;
! 			}
! 			set
! 			{
! 				_password = value;
! 			}
! 		}

  		[ReflectorProperty("host")]
! 		public string Host
! 		{
! 			get
! 			{
! 				return _host;
! 			}
! 			set
! 			{
! 				_host = value;
! 			}
! 		}

  		[ReflectorProperty("repository")]
! 		public string Repository
! 		{
! 			get
! 			{
! 				return _repository;
! 			}
! 			set
! 			{
! 				_repository = value;
! 			}
! 		}

  		[ReflectorProperty("folder")]
! 		public string Folder
! 		{
! 			get
! 			{
! 				return _folder;
! 			}
! 			set
! 			{
! 				_folder = value;
! 			}
! 		}

  		[ReflectorProperty("executable")]
! 		public string Executable
! 		{
! 			get
! 			{
! 				return _executable;
! 			}
! 			set
! 			{
! 				_executable = value;
! 			}
! 		}

  		[ReflectorProperty("ssl", Required=false)]
! 		public bool Ssl
! 		{
! 			get
! 			{
! 				return _ssl;
! 			}
! 			set
! 			{
! 				_ssl = value;
! 			}
! 		}
! 		#endregion

  		public Vault() : base(new VaultHistoryParser())
--- 15,39 ----
  		// TODO: might want to make rowlimit configurable?
  		private const string COMMAND_LINE = @"history ""{0}"" -host {1} -user {2} -password {3} -repository {4} -rowlimit 0";

  		[ReflectorProperty("username")]
! 		public string Username;

  		[ReflectorProperty("password")]
! 		public string Password;

  		[ReflectorProperty("host")]
! 		public string Host;

  		[ReflectorProperty("repository")]
! 		public string Repository;

  		[ReflectorProperty("folder")]
! 		public string Folder;

  		[ReflectorProperty("executable")]
! 		public string Executable;

  		[ReflectorProperty("ssl", Required=false)]
! 		public bool Ssl = false;

  		public Vault() : base(new VaultHistoryParser())
***************
*** 120,124 ****
  		}

! 		public Vault(IHistoryParser historyParser, ProcessExecutor executor): base(historyParser, executor)
  		{
  		}
--- 41,45 ----
  		}

! 		public Vault(IHistoryParser historyParser, ProcessExecutor executor) : base(historyParser, executor)
  		{
  		}
***************
*** 126,130 ****
  		public ProcessInfo CreateHistoryProcessInfo(DateTime from, DateTime to)
  		{
! 			return CreateHistoryProcessInfo(from, to, _folder);
  		}

--- 47,51 ----
  		public ProcessInfo CreateHistoryProcessInfo(DateTime from, DateTime to)
  		{
! 			return CreateHistoryProcessInfo(from, to, Folder);
  		}

***************
*** 132,136 ****
  		{
  			string args = BuildHistoryProcessArgs(from, to);
! 			return new ProcessInfo(_executable, args);
  		}

--- 53,57 ----
  		{
  			string args = BuildHistoryProcessArgs(from, to);
! 			return new ProcessInfo(Executable, args);
  		}

***************
*** 146,157 ****
  		private string BuildHistoryProcessArgs(DateTime from, DateTime to)
  		{
! 			string args = string.Format(
! 				COMMAND_LINE,
! 				_folder,
! 				_host,
! 				_username,
! 				_password,
! 				_repository);
! 			if(_ssl)
  			{
  				args += " -ssl";
--- 67,72 ----
  		private string BuildHistoryProcessArgs(DateTime from, DateTime to)
  		{
! 			string args = string.Format(COMMAND_LINE, Folder, Host, Username, Password, Repository);
! 			if (Ssl)
  			{
  				args += " -ssl";
***************
*** 160,162 ****
  		}
  	}
! }
--- 75,77 ----
  		}
  	}
! }
\ No newline at end of file

[Ccnet-checkins] ccnet/project/core/sourcecontrol Cvs.cs,1.15,1.16 Vault.cs,1.1,1.2 VaultHistoryPars

An automated continuous integration server for the .NET platform

[Ccnet-checkins] ccnet/project/core/sourcecontrol Cvs.cs,1.15,1.16 Vault.cs,1.1,1.2 VaultHistoryParser.cs,1.1,1.2