Wed Feb 13 12:54:59 CST 2008

Update of /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode
In directory escher:/tmp/cvs-serv7178/SVNCode

Modified Files:
	Client.cpp Client.h ClientUtil.h CmdClient.cpp CmdClient.h 
	HiClient.cpp HiClient.h Path.cpp Path.h Pool.cpp Pool.h 
	Prompter.cpp Prompter.h Revision.cpp Revision.h Targets.cpp 
	Targets.h ThreadData.cpp ThreadData.h Util.cpp Util.h 
Added Files:
	CallLogger.cpp CallLogger.h 
Log Message:
Improvements/Changes.

CVS User: Zoltan Molnar, ISIS (zolmol)

Index: Util.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Util.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Util.h	7 Feb 2008 20:01:39 -0000	1.1
--- Util.h	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 16,21 ****
   * @endcopyright
   *
!  * @file JNIUtil.h
!  * @brief Interface of the class JNIUtil
   */

--- 16,22 ----
   * @endcopyright
   *
!  */
! /**
!  * Modified by Zoltan Molnar, Vanderbilt University, 2008
   */

Index: Client.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Client.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Client.h	7 Feb 2008 20:01:39 -0000	1.1
--- Client.h	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 1,2 ****
--- 1,24 ----
+ /**
+  * @copyright
+  * ====================================================================
+  * Copyright (c) 2003 CollabNet.  All rights reserved.
+  *
+  * This software is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution.  The terms
+  * are also available at http://subversion.tigris.org/license-1.html.
+  * If newer versions of this license are posted there, you may use a
+  * newer version instead, at your option.
+  *
+  * This software consists of voluntary contributions made by many
+  * individuals.  For exact contribution history, see the revision
+  * history and logs, available at http://subversion.tigris.org/.
+  * ====================================================================
+  * @endcopyright
+  *
+  */
+ /**
+  * Modified by Zoltan Molnar, Vanderbilt University, 2008
+  */
+ 
  #pragma once

Index: ThreadData.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/ThreadData.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ThreadData.cpp	7 Feb 2008 20:01:39 -0000	1.1
--- ThreadData.cpp	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 1,2 ****
--- 1,25 ----
+ /**
+  * @copyright
+  * ====================================================================
+  * Copyright (c) 2003 CollabNet.  All rights reserved.
+  *
+  * This software is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution.  The terms
+  * are also available at http://subversion.tigris.org/license-1.html.
+  * If newer versions of this license are posted there, you may use a
+  * newer version instead, at your option.
+  *
+  * This software consists of voluntary contributions made by many
+  * individuals.  For exact contribution history, see the revision
+  * history and logs, available at http://subversion.tigris.org/.
+  * ====================================================================
+  * @endcopyright
+  *
+  */
+ /**
+  * Modified by Zoltan Molnar, Vanderbilt University, 2008
+  */
+ 
+ 
  #include "StdAfx.h"

Index: HiClient.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/HiClient.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HiClient.cpp	7 Feb 2008 20:01:39 -0000	1.1
--- HiClient.cpp	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 4,19 ****

  #if(USESVN)
- 
- //#include "Revision.h" // these should not be here at all
  #include "Pool.h"
- //#include "Util.h"
- //#include "Prompter.h" // end
- 
- extern std::string g_userName;
- extern std::string g_passWord;

  HiClient::HiClient( const std::string& p_userName, const std::string& p_passWord)
  	: Client( p_userName, p_passWord)
! 	, m_logEnabled( true)
  {
  }
--- 4,12 ----

  #if(USESVN)
  #include "Pool.h"

  HiClient::HiClient( const std::string& p_userName, const std::string& p_passWord)
  	: Client( p_userName, p_passWord)
! 	, CallLogger()
  {
  }
***************
*** 23,48 ****
  }

! bool HiClient::isItUs( const std::string& p_userName)
! {
! 	log( "isItUs", p_userName);
! 	return m_userName == p_userName;//strcmp( m_userName.c_str(), ( p_userName?p_userName:"")) == 0; // equal means yes
! }
! 
! bool HiClient::isLocked            ( const std::string& p_path)
  {
! 	log( "isLocked", p_path);
! 	return isLockedByUser( p_path, std::string());
  }

! bool HiClient::isLockedByUs        ( const std::string& p_path)
  {
! 	bool lkd, l_us, l_else;
! 
! 	log( "isLockedByUs", p_path);
! 	lkd = isLockedByWhom( p_path, &l_us, &l_else);
! 
! 	return lkd && l_us;
  }

  bool HiClient::isLockedByOthers    ( const std::string& p_path)
  {
--- 16,46 ----
  }

! void HiClient::replaceUserName( const std::string& p_userName)
  {
! 	m_userName = p_userName;
  }

! bool HiClient::isItUs( const std::string& p_userName)
  {
! 	log( "isItUs", p_userName);
! 	return m_userName == p_userName;//strcmp( m_userName.c_str(), ( p_userName?p_userName:"")) == 0; // equal means yes
  }

+ //bool HiClient::isLocked            ( const std::string& p_path)
+ //{
+ //	log( "isLocked", p_path);
+ //	return isLockedByUser( p_path, std::string());
+ //}
+ //
+ //bool HiClient::isLockedByUs        ( const std::string& p_path)
+ //{
+ //	bool lkd, l_us, l_else;
+ //
+ //	log( "isLockedByUs", p_path);
+ //	lkd = isLockedByWhom( p_path, &l_us, &l_else);
+ //
+ //	return lkd && l_us;
+ //}
+ //
  bool HiClient::isLockedByOthers    ( const std::string& p_path)
  {
***************
*** 347,401 ****
  }

! #if(0)
! 			msg = "After issuing 'svn info "; msg += ClientUtil::charstar2str( p_path.c_str(), "Url"); msg += "'";
! 			for( ClientUtil::InfoHelp::InfoVecConIter it = inf.begin(), en = inf.end(); it != en; ++it)
! 			{
! 				msg.append( "\nI know about: '");
! 				msg.append( ClientUtil::charstar2str( it->m_path, "Path"));
! 				msg.append( "' the following:");
! 				if( it->m_info)
! 				{
! 					if( !aut.empty()) aut.append( ", "); // if multiple entries in inf, then separate authors by ,
! 
! 					msg.append( "\n\tLast Changed Author: "); 
! 					aut.append( ClientUtil::charstar2str( it->m_info->last_changed_author, "Author"));
! 					msg.append( ClientUtil::charstar2str( it->m_info->last_changed_author, "Author"));
! 
! 					msg.append( "\n\tVersioned as (URL): "); 
! 					msg.append( ClientUtil::charstar2str( it->m_info->URL, "Url"));
! 					
! 					if( it->m_info->lock)
! 					{
! 						msg.append( "\n\tLocked by "); 
! 						if( !own.empty()) own.append( ", "); // if multiple entries in inf, then separate owners by ,
! 
! 						own.append( ClientUtil::charstar2str( it->m_info->lock->owner, "LockOwner"));
! 						msg.append( ClientUtil::charstar2str( it->m_info->lock->owner, "LockOwner"));
! 					}
! 					else
! 						msg.append( "\n\tNot Locked");
! 				}
! 				else 
! 					msg.append( "No detailed info present for item");
! 			}
! #endif
! 
! void HiClient::log( const std::string& p_command, const std::string& p_par)
! {
! 	if( !m_logEnabled) return;
! 
! 	std::ofstream fs;
! 	fs.open( "c:\\svnlog.txt", std::ios_base::ate | std::ios_base::app); // append
! 	if( fs)
! 	{
! 		fs << p_command << " " << p_par << std::endl;
! 		fs.close();
! 	}
! }
! 
! void HiClient::setLog( bool p_val)
! {
! 	m_logEnabled = p_val;
! }

  #endif
--- 345,381 ----
  }

! //#if(0)
! //			msg = "After issuing 'svn info "; msg += ClientUtil::charstar2str( p_path.c_str(), "Url"); msg += "'";
! //			for( ClientUtil::InfoHelp::InfoVecConIter it = inf.begin(), en = inf.end(); it != en; ++it)
! //			{
! //				msg.append( "\nI know about: '");
! //				msg.append( ClientUtil::charstar2str( it->m_path, "Path"));
! //				msg.append( "' the following:");
! //				if( it->m_info)
! //				{
! //					if( !aut.empty()) aut.append( ", "); // if multiple entries in inf, then separate authors by ,
! //
! //					msg.append( "\n\tLast Changed Author: "); 
! //					aut.append( ClientUtil::charstar2str( it->m_info->last_changed_author, "Author"));
! //					msg.append( ClientUtil::charstar2str( it->m_info->last_changed_author, "Author"));
! //
! //					msg.append( "\n\tVersioned as (URL): "); 
! //					msg.append( ClientUtil::charstar2str( it->m_info->URL, "Url"));
! //					
! //					if( it->m_info->lock)
! //					{
! //						msg.append( "\n\tLocked by "); 
! //						if( !own.empty()) own.append( ", "); // if multiple entries in inf, then separate owners by ,
! //
! //						own.append( ClientUtil::charstar2str( it->m_info->lock->owner, "LockOwner"));
! //						msg.append( ClientUtil::charstar2str( it->m_info->lock->owner, "LockOwner"));
! //					}
! //					else
! //						msg.append( "\n\tNot Locked");
! //				}
! //				else 
! //					msg.append( "No detailed info present for item");
! //			}
! //#endif

  #endif

--- NEW FILE: CallLogger.h ---
#pragma once
#include <string>

class CallLogger
{
protected:
	bool                m_logEnabled;
	std::string         m_logFile;

	void                log( const std::string& p_command, const std::string& p_parameter);

public:
	CallLogger(void);
	~CallLogger(void);

	void setLog( bool p_val, const std::string& p_logFile);
};

Index: Path.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Path.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Path.cpp	7 Feb 2008 20:01:39 -0000	1.1
--- Path.cpp	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 16,21 ****
   * @endcopyright
   *
!  * @file Path.cpp
!  * @brief Implementation of the class Path
   */

--- 16,22 ----
   * @endcopyright
   *
!  */
! /**
!  * Modified by Zoltan Molnar, Vanderbilt University, 2008
   */

Index: Targets.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Targets.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Targets.h	7 Feb 2008 20:01:39 -0000	1.1
--- Targets.h	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 16,21 ****
   * @endcopyright
   *
!  * @file Targets.h
!  * @brief Interface of the class Targets
   */

--- 16,22 ----
   * @endcopyright
   *
!  */
! /**
!  * Modified by Zoltan Molnar, Vanderbilt University, 2008
   */

Index: Prompter.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Prompter.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Prompter.cpp	7 Feb 2008 20:01:39 -0000	1.1
--- Prompter.cpp	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 16,21 ****
   * @endcopyright
   *
!  * @file Prompter.cpp
!  * @brief Implementation of the class Prompter
   */

--- 16,22 ----
   * @endcopyright
   *
!  */
! /**
!  * Modified by Zoltan Molnar, Vanderbilt University, 2008
   */

***************
*** 76,90 ****
  	// assumes that prompt() was called before, 
  	// and the m_uName field was filled already 
- 
  	if( m_credsFilled && m_uName.size() > 0 && m_uName != "-")  // the default value
  		return m_uName;

  	ASSERT(0);
! 	CCredentialDlg dlg( true, m_uName);
  	if( dlg.DoModal() == IDOK)
  	{
  		m_uName = dlg.name();
! 		m_pWord = dlg.word();
! 		m_credsFilled = true;
  	}

--- 77,90 ----
  	// assumes that prompt() was called before, 
  	// and the m_uName field was filled already 
  	if( m_credsFilled && m_uName.size() > 0 && m_uName != "-")  // the default value
  		return m_uName;

  	ASSERT(0);
! 	CCredentialDlg dlg( true, false, false, m_uName, (const char*) 0);
  	if( dlg.DoModal() == IDOK)
  	{
  		m_uName = dlg.name();
! 		//m_pWord = dlg.word();
! 		//m_credsFilled = true;
  	}

***************
*** 98,102 ****

  	ASSERT(0);
! 	CCredentialDlg dlg( true, m_uName);
  	if( dlg.DoModal() == IDOK)
  	{
--- 98,102 ----

  	ASSERT(0);
! 	CCredentialDlg dlg( false, false, false, m_uName, (const char*) 0);
  	if( dlg.DoModal() == IDOK)
  	{
***************
*** 172,179 ****
  {
  	std::string u_name( p_username?p_username: "<<nousername>>");
! 	std::string msg = "Realm: " + std::string( p_realm?p_realm:"<<norealm>>") + "\n -Username-: '" + u_name + "'\nChange user credentials?";
! 	if( IDYES == AfxMessageBox( msg.c_str(), MB_YESNO))
  	{
! 		CCredentialDlg dlg( p_maySave, u_name);
  		if( dlg.DoModal() == IDOK)
  		{
--- 172,180 ----
  {
  	std::string u_name( p_username?p_username: "<<nousername>>");
! 	//std::string msg = "Realm: \t'" + std::string( p_realm?p_realm:"<<norealm>>") + "'\nUser: \t'" + u_name + "'\nChange user credentials?";
! 	//if( IDYES == AfxMessageBox( msg.c_str(), MB_YESNO))
! 	if( 1)
  	{
! 		CCredentialDlg dlg( false, true, p_maySave, u_name, p_realm);
  		if( dlg.DoModal() == IDOK)
  		{
***************
*** 196,202 ****
  		}
  	}
! 	else
  	{
! 		//m_uName = p_username;
  		//m_pWord = "-";
  	}
--- 197,203 ----
  		}
  	}
! 	else // User selected not to change user credentials
  	{
! 		m_uName = p_username;
  		//m_pWord = "-";
  	}

Index: Revision.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Revision.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Revision.h	7 Feb 2008 20:01:39 -0000	1.1
--- Revision.h	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 16,21 ****
   * @endcopyright
   *
!  * @file Revision.h
!  * @brief Interface of the class Revision
   */

--- 16,22 ----
   * @endcopyright
   *
!  */
! /**
!  * Modified by Zoltan Molnar, Vanderbilt University, 2008
   */

Index: Path.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Path.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Path.h	7 Feb 2008 20:01:39 -0000	1.1
--- Path.h	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 16,21 ****
   * @endcopyright
   *
!  * @file Path.h
!  * @brief Interface of the C++ class Path.
   */

--- 16,22 ----
   * @endcopyright
   *
!  */
! /**
!  * Modified by Zoltan Molnar, Vanderbilt University, 2008
   */

--- NEW FILE: CallLogger.cpp ---
#include "stdafx.h"
#include ".\CallLogger.h"
#include <fstream>

CallLogger::CallLogger(void)
	: m_logEnabled( false)
	, m_logFile( "c:\\svnlog.txt")
{
}

CallLogger::~CallLogger(void)
{
}

void CallLogger::setLog( bool p_val, const std::string& p_logFile)
{
	m_logEnabled = p_val;
	if( !p_logFile.empty())
		m_logFile = p_logFile;
}

void CallLogger::log( const std::string& p_command, const std::string& p_par)
{
	if( !m_logEnabled) return;

	std::ofstream fs;
	fs.open( m_logFile.c_str(), std::ios_base::ate | std::ios_base::app); // append
	if( fs)
	{
		fs << p_command << " " << p_par << std::endl;
		fs.close();
	}
}

Index: HiClient.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/HiClient.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HiClient.h	7 Feb 2008 20:01:39 -0000	1.1
--- HiClient.h	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 1,30 ****
  #pragma once
- //#include "SvnConfig.h"
- 
- #if(USESVN)
  #include "Client.h"
! #endif

- #if(USESVN)
- class HiClient : protected Client // implementation inherited from Client
- #else
  class HiClient
! #endif
  {
- 	bool m_logEnabled;
- 	void log( const std::string& p_command, const std::string& p_parameter);
  public:
  	HiClient( const std::string& p_userName, const std::string& p_passWord);
  	~HiClient(void);

! 	void setLog( bool p_val);

  	// public :
  	bool isItUs              ( const std::string& p_userName);
! 	bool isLocked            ( const std::string& p_path);
! 	bool isLockedByUs        ( const std::string& p_path);
  	bool isLockedByOthers    ( const std::string& p_path);
  	bool isLockedByWhom      ( const std::string& p_path, bool * p_us, bool * p_else);
! 	//bool isLockedBy          ( const char * p_path, char * p_res, int p_len);
  	bool isLockedByUser      ( const std::string& p_path, std::string& p_holder);
  	bool isVersioned         ( const std::string& p_path, bool p_isADir = false, bool p_suppressErrorMsg = false);
--- 1,24 ----
  #pragma once
  #include "Client.h"
! #include "CallLogger.h"

  class HiClient
! 	: protected Client // implementation inherited from Client
! 	, public CallLogger
  {
  public:
  	HiClient( const std::string& p_userName, const std::string& p_passWord);
  	~HiClient(void);

! 	void replaceUserName( const std::string& p_userName);
! 

  	// public :
  	bool isItUs              ( const std::string& p_userName);
! 	//bool isLocked            ( const std::string& p_path);
! 	//bool isLockedByUs        ( const std::string& p_path);
  	bool isLockedByOthers    ( const std::string& p_path);
  	bool isLockedByWhom      ( const std::string& p_path, bool * p_us, bool * p_else);
! 	////bool isLockedBy          ( const char * p_path, char * p_res, int p_len);
  	bool isLockedByUser      ( const std::string& p_path, std::string& p_holder);
  	bool isVersioned         ( const std::string& p_path, bool p_isADir = false, bool p_suppressErrorMsg = false);
***************
*** 43,44 ****
--- 37,39 ----
  	bool mkDirOnServer       ( const std::string& p_path);
  };
+ 

Index: Pool.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Pool.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Pool.h	7 Feb 2008 20:01:39 -0000	1.1
--- Pool.h	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 16,21 ****
   * @endcopyright
   *
!  * @file Pool.h
!  * @brief Interface of the class Pool
   */

--- 16,22 ----
   * @endcopyright
   *
!  */
! /**
!  * Modified by Zoltan Molnar, Vanderbilt University, 2008
   */

Index: Prompter.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Prompter.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Prompter.h	7 Feb 2008 20:01:39 -0000	1.1
--- Prompter.h	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 16,21 ****
   * @endcopyright
   *
!  * @file Prompter.h
!  * @brief Interface of the class Prompter
   */

--- 16,22 ----
   * @endcopyright
   *
!  */
! /**
!  * Modified by Zoltan Molnar, Vanderbilt University, 2008
   */

Index: Targets.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Targets.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Targets.cpp	7 Feb 2008 20:01:39 -0000	1.1
--- Targets.cpp	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 16,21 ****
   * @endcopyright
   *
!  * @file Targets.cpp
!  * @brief Implementation of the class Targets
   */

--- 16,22 ----
   * @endcopyright
   *
!  */
! /**
!  * Modified by Zoltan Molnar, Vanderbilt University, 2008
   */

Index: Pool.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Pool.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Pool.cpp	7 Feb 2008 20:01:39 -0000	1.1
--- Pool.cpp	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 16,21 ****
   * @endcopyright
   *
!  * @file Pool.cpp
!  * @brief Implementation of the class Pool
   */

--- 16,22 ----
   * @endcopyright
   *
!  */
! /**
!  * Modified by Zoltan Molnar, Vanderbilt University, 2008
   */

Index: CmdClient.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/CmdClient.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CmdClient.cpp	7 Feb 2008 20:01:39 -0000	1.1
--- CmdClient.cpp	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 1,11 ****
  #include "StdAfx.h"
  #include "CmdClient.h"
- #include "CoreXmlFile.h"
  #include "FileHelp.h"
  #include "MsgConsole.h"
! //#include <stdlib.h>
  #include <direct.h>

- #if(USESVN)
  // statics
  const char * CmdClient::m_cs_checkout            = "co"; // a light checkout, with no consequences on locks!
--- 1,9 ----
  #include "StdAfx.h"
  #include "CmdClient.h"
  #include "FileHelp.h"
  #include "MsgConsole.h"
! #include <fstream>
  #include <direct.h>

  // statics
  const char * CmdClient::m_cs_checkout            = "co"; // a light checkout, with no consequences on locks!
***************
*** 28,31 ****
--- 26,30 ----
  	, m_redirectOutput( p_redirectOutput)
  	, m_svnPath( "svn")
+ 	, CallLogger()
  {
  }
***************
*** 655,674 ****
  }

- void CmdClient::log( const std::string& p_command, const std::string& p_par)
- {
- 	if( !m_logEnabled) return;
- 
- 	std::ofstream fs;
- 	fs.open( "c:\\svnlog.txt", std::ios_base::ate | std::ios_base::app); // append
- 	if( fs)
- 	{
- 		fs << p_command << " " << p_par << std::endl;
- 		fs.close();
- 	}
- }
- 
- void CmdClient::setLog( bool p_val)
- {
- 	m_logEnabled = p_val;
- }
- #endif
\ No newline at end of file
--- 654,655 ----

Index: ThreadData.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/ThreadData.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ThreadData.h	7 Feb 2008 20:01:39 -0000	1.1
--- ThreadData.h	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 1,2 ****
--- 1,25 ----
+ /**
+  * @copyright
+  * ====================================================================
+  * Copyright (c) 2003 CollabNet.  All rights reserved.
+  *
+  * This software is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution.  The terms
+  * are also available at http://subversion.tigris.org/license-1.html.
+  * If newer versions of this license are posted there, you may use a
+  * newer version instead, at your option.
+  *
+  * This software consists of voluntary contributions made by many
+  * individuals.  For exact contribution history, see the revision
+  * history and logs, available at http://subversion.tigris.org/.
+  * ====================================================================
+  * @endcopyright
+  *
+  */
+ /**
+  * Modified by Zoltan Molnar, Vanderbilt University, 2008
+  */
+ 
+ 
  #pragma once
  #include "svn_client.h"

Index: CmdClient.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/CmdClient.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CmdClient.h	7 Feb 2008 20:01:39 -0000	1.1
--- CmdClient.h	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 1,11 ****
  #pragma once
- 
  #include <string>

  class CmdClient
  {
- 	bool m_logEnabled;
- 	void log( const std::string& p_command, const std::string& p_parameter);
- 
  	const char   * m_stdo; // "stdo.tmp"
  	const char   * m_stde; // "stde.tmp"
--- 1,9 ----
  #pragma once
  #include <string>
+ #include "CallLogger.h"

  class CmdClient
+ 	: public CallLogger
  {
  	const char   * m_stdo; // "stdo.tmp"
  	const char   * m_stde; // "stde.tmp"

Index: Client.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Client.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Client.cpp	7 Feb 2008 20:01:39 -0000	1.1
--- Client.cpp	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 1,2 ****
--- 1,24 ----
+ /**
+  * @copyright
+  * ====================================================================
+  * Copyright (c) 2003 CollabNet.  All rights reserved.
+  *
+  * This software is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution.  The terms
+  * are also available at http://subversion.tigris.org/license-1.html.
+  * If newer versions of this license are posted there, you may use a
+  * newer version instead, at your option.
+  *
+  * This software consists of voluntary contributions made by many
+  * individuals.  For exact contribution history, see the revision
+  * history and logs, available at http://subversion.tigris.org/.
+  * ====================================================================
+  * @endcopyright
+  *
+  */
+ /**
+  * Modified by Zoltan Molnar, Vanderbilt University, 2008
+  */
+ 
  #include "StdAfx.h"

***************
*** 5,9 ****
  #include ".\client.h"
  #include <crtdbg.h> // for ASSERT
! #include <iostream> // remove this later
  #include "Pool.h"
  #include "Util.h"
--- 27,31 ----
  #include ".\client.h"
  #include <crtdbg.h> // for ASSERT
! //#include <iostream> // remove this later
  #include "Pool.h"
  #include "Util.h"
***************
*** 570,577 ****
  		for (int i = 0; i < size; i++)
  		{
! 			if( statusBaton.m_statusVect[i].m_status->locked)
! 				std::cout << "Stat " << "Locked" << std::endl;
! 			else
! 				std::cout << "Stat " << "NotLocked" << std::endl;
  			ClientUtil::StatusExtInfo r = statusBaton.m_statusVect[i];
  			res.push_back( r);
--- 592,599 ----
  		for (int i = 0; i < size; i++)
  		{
! 			//if( statusBaton.m_statusVect[i].m_status->locked)
! 			//	std::cout << "Stat " << "Locked" << std::endl;
! 			//else
! 			//	std::cout << "Stat " << "NotLocked" << std::endl;
  			ClientUtil::StatusExtInfo r = statusBaton.m_statusVect[i];
  			res.push_back( r);
***************
*** 671,679 ****
  	auth_baton's run-time parameter hash.  ### Same with --no-auth-cache? */
  	if (!m_userName.empty())
! 		svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME,
! 		m_userName.c_str());
  	if (!m_passWord.empty())
! 		svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD,
! 		m_passWord.c_str());
  	//svn_auth_set_parameter(ab, SVN_AUTH_CRED_SSL_CLIENT_CERT, 

--- 693,705 ----
  	auth_baton's run-time parameter hash.  ### Same with --no-auth-cache? */
  	if (!m_userName.empty())
! 		svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME, m_userName.c_str());
! 	else if( !g_userName.empty()) // g_userName is NOT empty => g_userName != m_userName
! 		svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME, g_userName.c_str()); // this might have been filled by prompt()
! 	
  	if (!m_passWord.empty())
! 		svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD, m_passWord.c_str());
! 	else if( !g_passWord.empty()) // g_passWord is NOT empty => g_passWord != m_passWord
! 		svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD, g_passWord.c_str()); // this might have been filled by prompt()
! 
  	//svn_auth_set_parameter(ab, SVN_AUTH_CRED_SSL_CLIENT_CERT, 

Index: ClientUtil.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/ClientUtil.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClientUtil.h	7 Feb 2008 20:01:39 -0000	1.1
--- ClientUtil.h	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 1,2 ****
--- 1,23 ----
+ /**
+  * @copyright
+  * ====================================================================
+  * Copyright (c) 2003 CollabNet.  All rights reserved.
+  *
+  * This software is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution.  The terms
+  * are also available at http://subversion.tigris.org/license-1.html.
+  * If newer versions of this license are posted there, you may use a
+  * newer version instead, at your option.
+  *
+  * This software consists of voluntary contributions made by many
+  * individuals.  For exact contribution history, see the revision
+  * history and logs, available at http://subversion.tigris.org/.
+  * ====================================================================
+  * @endcopyright
+  *
+  */
+ /**
+  * Modified by Zoltan Molnar, Vanderbilt University, 2008
+  */
  #pragma once
  #include "Revision.h"

Index: Revision.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Revision.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Revision.cpp	7 Feb 2008 20:01:39 -0000	1.1
--- Revision.cpp	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 16,21 ****
   * @endcopyright
   *
!  * @file Revision.cpp
!  * @brief Implementation of the class Revision
   */

--- 16,22 ----
   * @endcopyright
   *
!  */
! /**
!  * Modified by Zoltan Molnar, Vanderbilt University, 2008
   */

Index: Util.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/SVNCode/Util.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Util.cpp	7 Feb 2008 20:01:39 -0000	1.1
--- Util.cpp	13 Feb 2008 18:54:57 -0000	1.2
***************
*** 1,2 ****
--- 1,24 ----
+ /**
+  * @copyright
+  * ====================================================================
+  * Copyright (c) 2003 CollabNet.  All rights reserved.
+  *
+  * This software is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution.  The terms
+  * are also available at http://subversion.tigris.org/license-1.html.
+  * If newer versions of this license are posted there, you may use a
+  * newer version instead, at your option.
+  *
+  * This software consists of voluntary contributions made by many
+  * individuals.  For exact contribution history, see the revision
+  * history and logs, available at http://subversion.tigris.org/.
+  * ====================================================================
+  * @endcopyright
+  *
+  */
+ /**
+  * Modified by Zoltan Molnar, Vanderbilt University, 2008
+  */
+ 
  #include "StdAfx.h"