webdav: OSL_TRACE -> SAL_INFO

Change-Id: Id5947de4c64e8128073f39c9a2871676f2a117ff

6 files changed, 22 insertions, 35 deletions

diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 530bc01db6f5..113560533e0a 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -550,7 +550,7 @@ void DAVResourceAccess::abort()
     // 17.11.09 (tkr): abort currently disabled caused by issue i106766
     // initialize();
     // m_xSession->abort();
-    OSL_TRACE( "Not implemented. -> #i106766#" );
+    SAL_INFO("ucb.ucp.webdav",  "Not implemented. -> #i106766#" );
 }
 
 
diff --git a/ucb/source/ucp/webdav/SerfLockStore.cxx b/ucb/source/ucp/webdav/SerfLockStore.cxx
index 9d56d973e5d1..82468ececf3d 100644
--- a/ucb/source/ucp/webdav/SerfLockStore.cxx
+++ b/ucb/source/ucp/webdav/SerfLockStore.cxx
@@ -51,7 +51,7 @@ protected:
 
 void TickerThread::run()
 {
-    OSL_TRACE( "TickerThread: start." );
+    SAL_INFO("ucb.ucp.webdav",  "TickerThread: start." );
 
     // we have to go through the loop more often to be able to finish ~quickly
     const int nNth = 25;
@@ -71,7 +71,7 @@ void TickerThread::run()
         wait( aTV );
     }
 
-    OSL_TRACE( "TickerThread: stop." );
+    SAL_INFO("ucb.ucp.webdav",  "TickerThread: stop." );
 }
 
 
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
index e20cffcda99b..57093d4c304d 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx
@@ -92,7 +92,7 @@ void SerfRequestProcessorImpl::setRequestHeaders( serf_bucket_t* inoutSerfHeader
         const OString aValue = OUStringToOString( (*aHeaderIter).second,
                                                             RTL_TEXTENCODING_UTF8 );
 
-        OSL_TRACE( "Request Header - \"%s: %s\"", aHeader.getStr(), aValue.getStr() );
+        SAL_INFO("ucb.ucp.webdav",  "Request Header - \"" << aHeader << ": " << aValue << "\"");
         if ( !bHasUserAgent )
             bHasUserAgent = aHeaderIter->first == "User-Agent";
 
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index a124d107321a..1203889af5b1 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -1015,7 +1015,7 @@ namespace
             }
             else
             {
-                OSL_TRACE( "No chance to refresh lock before timeout!" );
+                SAL_INFO("ucb.ucp.webdav",  "No chance to refresh lock before timeout!" );
             }
         }
         return lastChanceToSendRefreshRequest;
@@ -1104,18 +1104,15 @@ void SerfSession::LOCK( const OUString & inPath,
         aTokens[ 0 ] = OUString::createFromAscii( theLock->token );
         rLock.LockTokens = aTokens;
 
-        OSL_TRACE( "SerfSession::LOCK: created lock for %s. token: %s",
-                   OUStringToOString( makeAbsoluteURL( inPath ),
-                                           RTL_TEXTENCODING_UTF8 ).getStr(),
-                   theLock->token );
+        SAL_INFO("ucb.ucp.webdav",  "SerfSession::LOCK: created lock for "
+                    << makeAbsoluteURL( inPath ) << ". token: " << theLock->token );
     }
     else
     {
         ne_lock_destroy( theLock );
 
-        OSL_TRACE( "SerfSession::LOCK: obtaining lock for %s failed!",
-                   OUStringToOString( makeAbsoluteURL( inPath ),
-                                           RTL_TEXTENCODING_UTF8 ).getStr() );
+        SAL_INFO("ucb.ucp.webdav",  "SerfSession::LOCK: obtaining lock for "
+                    << makeAbsoluteURL( inPath ) << " failed!");
     }
 
     HandleError( theRetVal, inPath, rEnv );
@@ -1183,12 +1180,12 @@ bool SerfSession::LOCK( SerfLock * /*pLock*/,
         rlastChanceToSendRefreshRequest
             = lastChanceToSendRefreshRequest( startCall, pLock->timeout );
 
-        OSL_TRACE( "Lock successfully refreshed." );
+        SAL_INFO("ucb.ucp.webdav",  "Lock successfully refreshed." );
         return true;
     }
     else
     {
-        OSL_TRACE( "Lock not refreshed!" );
+        SAL_INFO("ucb.ucp.webdav",  "Lock not refreshed!" );
         return false;
     }
     */
@@ -1221,9 +1218,8 @@ void SerfSession::UNLOCK( const OUString & /*inPath*/,
     }
     else
     {
-        OSL_TRACE( "SerfSession::UNLOCK: unlocking of %s failed.",
-                   OUStringToOString( makeAbsoluteURL( inPath ),
-                                           RTL_TEXTENCODING_UTF8 ).getStr() );
+        SAL_INFO("ucb.ucp.webdav",  "SerfSession::UNLOCK: unlocking of "
+                    << makeAbsoluteURL( inPath ) << " failed.");
     }
 
     HandleError( theRetVal, inPath, rEnv );
@@ -1241,12 +1237,12 @@ bool SerfSession::UNLOCK( SerfLock * /*pLock*/ )
     /*
     if ( ne_unlock( m_pHttpSession, pLock ) == NE_OK )
     {
-        OSL_TRACE( "UNLOCK succeeded." );
+        SAL_INFO("ucb.ucp.webdav",  "UNLOCK succeeded." );
         return true;
     }
     else
     {
-        OSL_TRACE( "UNLOCK failed!" );
+        SAL_INFO("ucb.ucp.webdav",  "UNLOCK failed!" );
         return false;
     }
     */
@@ -1356,11 +1352,8 @@ bool SerfSession::removeExpiredLocktoken( const OUString & /*inURL*/,
 
         // No lockdiscovery prop in propfind result / locktoken not found
         // in propfind result -> not locked
-        OSL_TRACE( "SerfSession::removeExpiredLocktoken: Removing "
-                   " expired lock token for %s. token: %s",
-                   OUStringToOString( inURL,
-                                           RTL_TEXTENCODING_UTF8 ).getStr(),
-                   theLock->token );
+        SAL_INFO("ucb.ucp.webdav",  "SerfSession::removeExpiredLocktoken: Removing "
+                   " expired lock token for " << inURL << ". token: " << theLock->token );
 
         m_aSerfLockStore.removeLock( theLock );
         ne_lock_destroy( theLock );
@@ -1484,7 +1477,7 @@ void SerfSession::HandleError( boost::shared_ptr<SerfRequestProcessor> rReqProc
         }
         default:
         {
-            OSL_TRACE( "SerfSession::HandleError : Unknown Serf error code!" );
+            SAL_INFO("ucb.ucp.webdav",  "SerfSession::HandleError : Unknown Serf error code!" );
             throw DAVException( DAVException::DAV_HTTP_ERROR,
                                 OUString::createFromAscii(
                                     ne_get_error( m_pHttpSession ) ) );
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index e49ba2daa850..21d38550be66 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -496,10 +496,8 @@ uno::Any SAL_CALL Content::execute(
            ucb::CommandAbortedException,
            uno::RuntimeException )
 {
-    OSL_TRACE( ">>>>> Content::execute: start: command: %s, env: %s",
-               OUStringToOString( aCommand.Name,
-                                       RTL_TEXTENCODING_UTF8 ).getStr(),
-               Environment.is() ? "present" : "missing" );
+    SAL_INFO("ucb.ucp.webdav",  ">>>>> Content::execute: start: command: " << aCommand.Name
+            << ", env: " << (Environment.is() ? "present" : "missing") );
 
     uno::Any aRet;
 
@@ -807,10 +805,7 @@ uno::Any SAL_CALL Content::execute(
         // Unreachable
     }
 
-    OSL_TRACE( "<<<<< Content::execute: end: command: %s",
-               OUStringToOString( aCommand.Name,
-                                       RTL_TEXTENCODING_UTF8 ).getStr() );
-
+    SAL_INFO("ucb.ucp.webdav",  "<<<<< Content::execute: end: command: " << aCommand.Name);
     return aRet;
 }
 
diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx
index f3bca2edd967..ecc3c9af959a 100644
--- a/ucb/source/ucp/webdav/webdavprovider.cxx
+++ b/ucb/source/ucp/webdav/webdavprovider.cxx
@@ -108,8 +108,7 @@ ContentProvider::ContentProvider(
     }
     catch ( const uno::Exception &e )
     {
-        OSL_TRACE( "ContentProvider -caught exception! %s",
-                   OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+        SAL_INFO("ucb.ucp.webdav",  "ContentProvider -caught exception! : " << e.Message);
         (void) e;
     }
 }