directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1096045 - in /directory/studio/trunk/plugins: connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/ ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/
Date Fri, 22 Apr 2011 21:15:23 GMT
Author: elecharny
Date: Fri Apr 22 21:15:22 2011
New Revision: 1096045

URL: http://svn.apache.org/viewvc?rev=1096045&view=rev
Log:
o Changed the get/setErrorMessage to get/setDiagnosticMessage, as define din the RFC 4511

Modified:
    directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
    directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java

Modified: directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java?rev=1096045&r1=1096044&r2=1096045&view=diff
==============================================================================
--- directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
(original)
+++ directory/studio/trunk/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/DirectoryApiConnectionWrapper.java
Fri Apr 22 21:15:22 2011
@@ -1225,13 +1225,13 @@ public class DirectoryApiConnectionWrapp
                 // NOT_ALLOWED_ON_NON_LEAF error (thrown when deleting a entry with children
                 if ( ResultCodeEnum.NOT_ALLOWED_ON_NON_LEAF.equals( ldapResult.getResultCode()
) )
                 {
-                    throw new ContextNotEmptyException( ldapResult.getErrorMessage() );
+                    throw new ContextNotEmptyException( ldapResult.getDiagnosticMessage()
);
                 }
                 // Different from SUCCESS, we throw a generic exception
                 else if ( !ResultCodeEnum.SUCCESS.equals( ldapResult.getResultCode() ) )
                 {
                     throw new Exception( NLS.bind( "[LDAP: error code {0} - {1}]", new String[]
-                        { ldapResult.getResultCode().getResultCode() + "", ldapResult.getErrorMessage()
} ) );
+                        { ldapResult.getResultCode().getResultCode() + "", ldapResult.getDiagnosticMessage()
} ) );
                 }
             }
         }

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java?rev=1096045&r1=1096044&r2=1096045&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
Fri Apr 22 21:15:22 2011
@@ -44,9 +44,9 @@ import org.apache.directory.shared.dsmlv
 import org.apache.directory.shared.dsmlv2.request.BatchRequestDsml;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecServiceFactory;
+import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.AttributeUtils;
 import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
@@ -331,7 +331,7 @@ public class ExportDsmlRunnable implemen
             // Setting the error message if there's one
             if ( t.getMessage() != null )
             {
-                ldapResult.setErrorMessage( t.getMessage() );
+                ldapResult.setDiagnosticMessage( t.getMessage() );
             }
         }
         sr.addResponse( new SearchResultDoneDsml( codec, srd ) );

Modified: directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java?rev=1096045&r1=1096044&r2=1096045&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
(original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
Fri Apr 22 21:15:22 2011
@@ -337,7 +337,7 @@ public class ImportDsmlRunnable implemen
             BindResponseDsml authResponseDsml = new BindResponseDsml( codec );
             LdapResult ldapResult = authResponseDsml.getLdapResult();
             ldapResult.setResultCode( ResultCodeEnum.UNWILLING_TO_PERFORM );
-            ldapResult.setErrorMessage( "This kind of request is not yet supported." );
+            ldapResult.setDiagnosticMessage( "This kind of request is not yet supported."
);
             batchResponseDsml.addResponse( authResponseDsml );
         }
     }
@@ -408,7 +408,7 @@ public class ImportDsmlRunnable implemen
             CompareResponseDsml compareResponseDsml = new CompareResponseDsml( codec );
             LdapResult ldapResult = compareResponseDsml.getLdapResult();
             ldapResult.setResultCode( ResultCodeEnum.UNWILLING_TO_PERFORM );
-            ldapResult.setErrorMessage( "This kind of request is not yet supported." );
+            ldapResult.setDiagnosticMessage( "This kind of request is not yet supported."
);
             batchResponseDsml.addResponse( compareResponseDsml );
         }
     }
@@ -476,7 +476,7 @@ public class ImportDsmlRunnable implemen
             ExtendedResponseDsml extendedResponseDsml = new ExtendedResponseDsml( codec );
             LdapResult ldapResult = extendedResponseDsml.getLdapResult();
             ldapResult.setResultCode( ResultCodeEnum.UNWILLING_TO_PERFORM );
-            ldapResult.setErrorMessage( "This kind of request is not yet supported." );
+            ldapResult.setDiagnosticMessage( "This kind of request is not yet supported."
);
             batchResponseDsml.addResponse( extendedResponseDsml );
         }
     }
@@ -767,7 +767,7 @@ public class ImportDsmlRunnable implemen
             // Setting the error message if there's one
             if ( t.getMessage() != null )
             {
-                ldapResult.setErrorMessage( t.getMessage() );
+                ldapResult.setDiagnosticMessage( t.getMessage() );
             }
         }
     }



Mime
View raw message