From c888ad173543559089d2e0a93b6c1bfc8c1868dc Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Tue, 24 Apr 2007 22:40:57 +0000
Subject: [PATCH] Make several significant changes to the OpenDS code base, including:

---
 opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java b/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
index ae1fb0d..0bfa896 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/extensions/FileBasedTrustManagerProvider.java
@@ -185,7 +185,7 @@
 
       msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_FILE;
       String message = getMessage(msgID, String.valueOf(configEntryDN),
-                                  stackTraceToSingleLineString(e));
+                                  getExceptionMessage(e));
       throw new InitializationException(msgID, message, e);
     }
 
@@ -221,7 +221,7 @@
           msgID = MSGID_FILE_TRUSTMANAGER_INVALID_TYPE;
           String message = getMessage(msgID, String.valueOf(typeStr),
                                       String.valueOf(configEntryDN),
-                                      stackTraceToSingleLineString(kse));
+                                      getExceptionMessage(kse));
           throw new InitializationException(msgID, message);
         }
       }
@@ -244,7 +244,7 @@
 
       msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_TYPE;
       String message = getMessage(msgID, String.valueOf(configEntryDN),
-                                  stackTraceToSingleLineString(e));
+                                  getExceptionMessage(e));
       throw new InitializationException(msgID, message, e);
     }
 
@@ -311,7 +311,7 @@
 
         msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_PIN_PROPERTY;
         String message = getMessage(msgID, String.valueOf(configEntryDN),
-                                    stackTraceToSingleLineString(e));
+                                    getExceptionMessage(e));
         throw new InitializationException(msgID, message, e);
       }
 
@@ -361,7 +361,7 @@
 
         msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_PIN_ENVAR;
         String message = getMessage(msgID, String.valueOf(configEntryDN),
-                                    stackTraceToSingleLineString(e));
+                                    getExceptionMessage(e));
         throw new InitializationException(msgID, message, e);
       }
 
@@ -401,7 +401,7 @@
               msgID = MSGID_FILE_TRUSTMANAGER_PIN_FILE_CANNOT_READ;
               String message = getMessage(msgID, String.valueOf(fileName),
                                           String.valueOf(configEntryDN),
-                                          stackTraceToSingleLineString(ioe));
+                                          getExceptionMessage(ioe));
               throw new InitializationException(msgID, message, ioe);
             }
 
@@ -439,7 +439,7 @@
 
         msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_PIN_FILE;
         String message = getMessage(msgID, String.valueOf(configEntryDN),
-                                    stackTraceToSingleLineString(e));
+                                    getExceptionMessage(e));
         throw new InitializationException(msgID, message, e);
       }
 
@@ -467,7 +467,7 @@
 
         msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR;
         String message = getMessage(msgID, String.valueOf(configEntryDN),
-                                    stackTraceToSingleLineString(e));
+                                    getExceptionMessage(e));
         throw new InitializationException(msgID, message, e);
       }
     }
@@ -521,7 +521,7 @@
 
       int msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_LOAD;
       String message = getMessage(msgID, trustStoreFile,
-                                  stackTraceToSingleLineString(e));
+                                  getExceptionMessage(e));
       throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                    message, msgID, e);
     }
@@ -544,7 +544,7 @@
 
       int msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_CREATE_FACTORY;
       String message = getMessage(msgID, trustStoreFile,
-                                  stackTraceToSingleLineString(e));
+                                  getExceptionMessage(e));
       throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                    message, msgID, e);
     }
@@ -703,7 +703,7 @@
 
       msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_FILE;
       String message = getMessage(msgID, String.valueOf(configEntryDN),
-                                  stackTraceToSingleLineString(e));
+                                  getExceptionMessage(e));
       unacceptableReasons.add(message);
       return false;
     }
@@ -738,7 +738,7 @@
           msgID = MSGID_FILE_TRUSTMANAGER_INVALID_TYPE;
           String message = getMessage(msgID, String.valueOf(typeStr),
                                       String.valueOf(configEntryDN),
-                                      stackTraceToSingleLineString(kse));
+                                      getExceptionMessage(kse));
           unacceptableReasons.add(message);
           return false;
         }
@@ -753,7 +753,7 @@
 
       msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_TYPE;
       String message = getMessage(msgID, String.valueOf(configEntryDN),
-                                  stackTraceToSingleLineString(e));
+                                  getExceptionMessage(e));
       unacceptableReasons.add(message);
       return false;
     }
@@ -800,7 +800,7 @@
 
         msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_PIN_PROPERTY;
         String message = getMessage(msgID, String.valueOf(configEntryDN),
-                                    stackTraceToSingleLineString(e));
+                                    getExceptionMessage(e));
         unacceptableReasons.add(message);
         return false;
       }
@@ -841,7 +841,7 @@
 
         msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_PIN_ENVAR;
         String message = getMessage(msgID, String.valueOf(configEntryDN),
-                                    stackTraceToSingleLineString(e));
+                                    getExceptionMessage(e));
         unacceptableReasons.add(message);
         return false;
       }
@@ -883,7 +883,7 @@
               msgID = MSGID_FILE_TRUSTMANAGER_PIN_FILE_CANNOT_READ;
               String message = getMessage(msgID, String.valueOf(fileName),
                                           String.valueOf(configEntryDN),
-                                          stackTraceToSingleLineString(ioe));
+                                          getExceptionMessage(ioe));
               unacceptableReasons.add(message);
               return false;
             }
@@ -912,7 +912,7 @@
 
         msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_PIN_FILE;
         String message = getMessage(msgID, String.valueOf(configEntryDN),
-                                    stackTraceToSingleLineString(e));
+                                    getExceptionMessage(e));
         unacceptableReasons.add(message);
         return false;
       }
@@ -940,7 +940,7 @@
 
         msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR;
         String message = getMessage(msgID, String.valueOf(configEntryDN),
-                                    stackTraceToSingleLineString(e));
+                                    getExceptionMessage(e));
         unacceptableReasons.add(message);
         return false;
       }
@@ -1029,7 +1029,7 @@
 
       msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_FILE;
       messages.add(getMessage(msgID, String.valueOf(configEntryDN),
-                              stackTraceToSingleLineString(e)));
+                              getExceptionMessage(e)));
 
       if (resultCode == ResultCode.SUCCESS)
       {
@@ -1068,7 +1068,7 @@
           msgID = MSGID_FILE_TRUSTMANAGER_INVALID_TYPE;
           messages.add(getMessage(msgID, String.valueOf(newTrustStoreType),
                                   String.valueOf(configEntryDN),
-                                  stackTraceToSingleLineString(kse)));
+                                  getExceptionMessage(kse)));
 
           if (resultCode == ResultCode.SUCCESS)
           {
@@ -1086,7 +1086,7 @@
 
       msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_TYPE;
       messages.add(getMessage(msgID, String.valueOf(configEntryDN),
-                              stackTraceToSingleLineString(e)));
+                              getExceptionMessage(e)));
 
       if (resultCode == ResultCode.SUCCESS)
       {
@@ -1147,7 +1147,7 @@
 
         msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_PIN_PROPERTY;
         messages.add(getMessage(msgID, String.valueOf(configEntryDN),
-                                stackTraceToSingleLineString(e)));
+                                getExceptionMessage(e)));
 
         if (resultCode == ResultCode.SUCCESS)
         {
@@ -1200,7 +1200,7 @@
 
         msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_PIN_ENVAR;
         messages.add(getMessage(msgID, String.valueOf(configEntryDN),
-                                stackTraceToSingleLineString(e)));
+                                getExceptionMessage(e)));
 
         if (resultCode == ResultCode.SUCCESS)
         {
@@ -1252,7 +1252,7 @@
               msgID = MSGID_FILE_TRUSTMANAGER_PIN_FILE_CANNOT_READ;
               messages.add(getMessage(msgID, String.valueOf(fileName),
                                       String.valueOf(configEntryDN),
-                                      stackTraceToSingleLineString(ioe)));
+                                      getExceptionMessage(ioe)));
 
               if (resultCode == ResultCode.SUCCESS)
               {
@@ -1293,7 +1293,7 @@
 
         msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_PIN_FILE;
         messages.add(getMessage(msgID, String.valueOf(configEntryDN),
-                                stackTraceToSingleLineString(e)));
+                                getExceptionMessage(e)));
 
         if (resultCode == ResultCode.SUCCESS)
         {
@@ -1327,7 +1327,7 @@
 
         msgID = MSGID_FILE_TRUSTMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR;
         messages.add(getMessage(msgID, String.valueOf(configEntryDN),
-                                stackTraceToSingleLineString(e)));
+                                getExceptionMessage(e)));
 
         if (resultCode == ResultCode.SUCCESS)
         {

--
Gitblit v1.10.0