directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1051103 - in /directory/shared/branches/shared-AP: ldap-schema/ ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/ ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/ ldap/ ldap/src/...
Date Mon, 20 Dec 2010 13:51:06 GMT
Author: elecharny
Date: Mon Dec 20 13:51:05 2010
New Revision: 1051103

URL: http://svn.apache.org/viewvc?rev=1051103&view=rev
Log:
Merged back the modifications made on trunk into the AP branch

Added:
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/
      - copied from r1051100, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java
      - copied unchanged from r1051100, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/AttributeValueItemTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java
      - copied unchanged from r1051100, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/ClassesItemTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java
      - copied unchanged from r1051100, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxImmSubItemTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java
      - copied unchanged from r1051100, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountItemTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java
      - copied unchanged from r1051100, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByItemTest.java
    directory/shared/branches/shared-AP/ldap/src/test/java/org/apache/directory/shared/ldap/filter/UndefinedNodeTest.java
      - copied unchanged from r1051100, directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/filter/UndefinedNodeTest.java
Modified:
    directory/shared/branches/shared-AP/ldap/   (props changed)
    directory/shared/branches/shared-AP/ldap-schema/   (props changed)
    directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/
  (props changed)
    directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
  (props changed)
    directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.251.ldif
    directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java
    directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java
    directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java
    directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java
  (props changed)
    directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapOperationErrorException.java
    directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapOperationException.java

Propchange: directory/shared/branches/shared-AP/ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:51:05 2010
@@ -2,3 +2,4 @@
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
+/directory/shared/trunk/ldap:1049008-1051100

Propchange: directory/shared/branches/shared-AP/ldap-schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:51:05 2010
@@ -8,3 +8,4 @@
 /directory/shared/branches/shared-subtree/ldap-schema:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema:980350-980351
+/directory/shared/trunk/ldap-schema:1049008-1051100

Propchange: directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:51:05 2010
@@ -7,4 +7,5 @@
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:980350-980351
+/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:1049008-1051100
 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-894844*

Propchange: directory/shared/branches/shared-AP/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:51:05 2010
@@ -7,4 +7,5 @@
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:980350-980351
+/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:1049008-1051100
 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-894844

Modified: directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.251.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.251.ldif?rev=1051103&r1=1051102&r2=1051103&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.251.ldif
(original)
+++ directory/shared/branches/shared-AP/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.251.ldif
Mon Dec 20 13:51:05 2010
@@ -8,7 +8,7 @@ m-supattributetype: ads-compositeElement
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.12
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
 m-name: ads-transports
 creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch

Modified: directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java?rev=1051103&r1=1051102&r2=1051103&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java
(original)
+++ directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/GrantAndDenial.java
Mon Dec 20 13:51:05 2010
@@ -25,93 +25,91 @@ package org.apache.directory.shared.ldap
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public final class GrantAndDenial
+public enum GrantAndDenial
 {
     // Permissions that may be used in conjunction with any component of
     // <tt>ProtectedItem</tt>s.
     /** Grant for {@link MicroOperation#ADD} */
-    public static final GrantAndDenial GRANT_ADD = new GrantAndDenial( MicroOperation.ADD,
0, true );
+    GRANT_ADD ( MicroOperation.ADD, 0, true ),
 
     /** Denial for {@link MicroOperation#ADD} */
-    public static final GrantAndDenial DENY_ADD = new GrantAndDenial( MicroOperation.ADD,
1, false );
+    DENY_ADD ( MicroOperation.ADD, 1, false ),
 
     /** Grant for {@link MicroOperation#DISCLOSE_ON_ERROR} */
-    public static final GrantAndDenial GRANT_DISCLOSE_ON_ERROR = new GrantAndDenial( MicroOperation.DISCLOSE_ON_ERROR,
-        2, true );
+    GRANT_DISCLOSE_ON_ERROR ( MicroOperation.DISCLOSE_ON_ERROR, 2, true ),
 
     /** Denial for {@link MicroOperation#DISCLOSE_ON_ERROR} */
-    public static final GrantAndDenial DENY_DISCLOSE_ON_ERROR = new GrantAndDenial( MicroOperation.DISCLOSE_ON_ERROR,
-        3, false );
+    DENY_DISCLOSE_ON_ERROR ( MicroOperation.DISCLOSE_ON_ERROR, 3, false ),
 
     /** Grant for {@link MicroOperation#READ} */
-    public static final GrantAndDenial GRANT_READ = new GrantAndDenial( MicroOperation.READ,
4, true );
+    GRANT_READ ( MicroOperation.READ, 4, true ),
 
     /** Denial for {@link MicroOperation#READ} */
-    public static final GrantAndDenial DENY_READ = new GrantAndDenial( MicroOperation.READ,
5, false );
+    DENY_READ ( MicroOperation.READ, 5, false ),
 
     /** Grant for {@link MicroOperation#REMOVE} */
-    public static final GrantAndDenial GRANT_REMOVE = new GrantAndDenial( MicroOperation.REMOVE,
6, true );
+    GRANT_REMOVE ( MicroOperation.REMOVE, 6, true ),
 
     /** Denial for {@link MicroOperation#REMOVE} */
-    public static final GrantAndDenial DENY_REMOVE = new GrantAndDenial( MicroOperation.REMOVE,
7, false );
+    DENY_REMOVE ( MicroOperation.REMOVE, 7, false ),
 
     // Permissions that may be used only in conjunction with the entry
     // component.
     /** Grant for {@link MicroOperation#BROWSE} */
-    public static final GrantAndDenial GRANT_BROWSE = new GrantAndDenial( MicroOperation.BROWSE,
8, true );
+    GRANT_BROWSE ( MicroOperation.BROWSE, 8, true ),
 
     /** Denial for {@link MicroOperation#BROWSE} */
-    public static final GrantAndDenial DENY_BROWSE = new GrantAndDenial( MicroOperation.BROWSE,
9, false );
+    DENY_BROWSE ( MicroOperation.BROWSE, 9, false ),
 
     /** Grant for {@link MicroOperation#EXPORT} */
-    public static final GrantAndDenial GRANT_EXPORT = new GrantAndDenial( MicroOperation.EXPORT,
10, true );
+    GRANT_EXPORT ( MicroOperation.EXPORT, 10, true ),
 
     /** Denial for {@link MicroOperation#EXPORT} */
-    public static final GrantAndDenial DENY_EXPORT = new GrantAndDenial( MicroOperation.EXPORT,
11, false );
+    DENY_EXPORT ( MicroOperation.EXPORT, 11, false ),
 
     /** Grant for {@link MicroOperation#IMPORT} */
-    public static final GrantAndDenial GRANT_IMPORT = new GrantAndDenial( MicroOperation.IMPORT,
12, true );
+    GRANT_IMPORT ( MicroOperation.IMPORT, 12, true ),
 
     /** Denial for {@link MicroOperation#IMPORT} */
-    public static final GrantAndDenial DENY_IMPORT = new GrantAndDenial( MicroOperation.IMPORT,
13, false );
+    DENY_IMPORT ( MicroOperation.IMPORT, 13, false ),
 
     /** Grant for {@link MicroOperation#MODIFY} */
-    public static final GrantAndDenial GRANT_MODIFY = new GrantAndDenial( MicroOperation.MODIFY,
14, true );
+    GRANT_MODIFY ( MicroOperation.MODIFY, 14, true ),
 
     /** Denial for {@link MicroOperation#MODIFY} */
-    public static final GrantAndDenial DENY_MODIFY = new GrantAndDenial( MicroOperation.MODIFY,
15, false );
+    DENY_MODIFY ( MicroOperation.MODIFY, 15, false ),
 
     /** Grant for {@link MicroOperation#RENAME} */
-    public static final GrantAndDenial GRANT_RENAME = new GrantAndDenial( MicroOperation.RENAME,
16, true );
+    GRANT_RENAME ( MicroOperation.RENAME, 16, true ),
 
     /** Denial for {@link MicroOperation#RENAME} */
-    public static final GrantAndDenial DENY_RENAME = new GrantAndDenial( MicroOperation.RENAME,
17, false );
+    DENY_RENAME ( MicroOperation.RENAME, 17, false ),
 
     /** Grant for {@link MicroOperation#RETURN_DN} */
-    public static final GrantAndDenial GRANT_RETURN_DN = new GrantAndDenial( MicroOperation.RETURN_DN,
18, true );
+    GRANT_RETURN_DN ( MicroOperation.RETURN_DN, 18, true ),
 
     /** Denial for {@link MicroOperation#RETURN_DN} */
-    public static final GrantAndDenial DENY_RETURN_DN = new GrantAndDenial( MicroOperation.RETURN_DN,
19, false );
+    DENY_RETURN_DN ( MicroOperation.RETURN_DN, 19, false ),
 
     // Permissions that may be used in conjunction with any component,
     // except entry, of <tt>ProtectedItem</tt>s.
     /** Grant for {@link MicroOperation#COMPARE} */
-    public static final GrantAndDenial GRANT_COMPARE = new GrantAndDenial( MicroOperation.COMPARE,
20, true );
+    GRANT_COMPARE ( MicroOperation.COMPARE, 20, true ),
 
     /** Deny for {@link MicroOperation#COMPARE} */
-    public static final GrantAndDenial DENY_COMPARE = new GrantAndDenial( MicroOperation.COMPARE,
21, false );
+    DENY_COMPARE ( MicroOperation.COMPARE, 21, false ),
 
     /** Grant for {@link MicroOperation#FILTER_MATCH} */
-    public static final GrantAndDenial GRANT_FILTER_MATCH = new GrantAndDenial( MicroOperation.FILTER_MATCH,
22, true );
+    GRANT_FILTER_MATCH ( MicroOperation.FILTER_MATCH, 22, true ),
 
     /** Denial for {@link MicroOperation#FILTER_MATCH} */
-    public static final GrantAndDenial DENY_FILTER_MATCH = new GrantAndDenial( MicroOperation.FILTER_MATCH,
23, false );
+    DENY_FILTER_MATCH ( MicroOperation.FILTER_MATCH, 23, false ),
 
     /** Grant for {@link MicroOperation#INVOKE} */
-    public static final GrantAndDenial GRANT_INVOKE = new GrantAndDenial( MicroOperation.INVOKE,
24, true );
+    GRANT_INVOKE ( MicroOperation.INVOKE, 24, true ),
 
     /** Denial for {@link MicroOperation#INVOKE} */
-    public static final GrantAndDenial DENY_INVOKE = new GrantAndDenial( MicroOperation.INVOKE,
25, false );
+    DENY_INVOKE ( MicroOperation.INVOKE, 25, false );
 
     /** The micro operation. */
     private final MicroOperation microOperation;

Modified: directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java?rev=1051103&r1=1051102&r2=1051103&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java
(original)
+++ directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/MaxValueCountElem.java
Mon Dec 20 13:51:05 2010
@@ -70,6 +70,55 @@ public class MaxValueCountElem
         return maxCount;
     }
 
+    
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int hashCode()
+    {
+        int hash = 37;
+        hash = hash * 17 + maxCount;
+        hash = hash * 17 + attributeType.hashCode();
+        return hash;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean equals( Object o )
+    {
+        if (o == null)
+        {
+            return false;
+        }
+        
+        if ( this == o )
+        {
+            return true;
+        }
+        
+        if ( o instanceof MaxValueCountElem )
+        {
+            MaxValueCountElem that = ( MaxValueCountElem ) o;
+            if ( this.maxCount == that.maxCount )
+            {
+                if ( this.attributeType == null )
+                {
+                    return that.attributeType == null;
+                }
+                else
+                {
+                    return this.attributeType.equals( that.attributeType );
+                }
+            }
+        }
+        return false;
+    }
+
 
     /**
      * {@inheritDoc}

Modified: directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java?rev=1051103&r1=1051102&r2=1051103&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java
(original)
+++ directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/aci/protectedItem/RestrictedByElem.java
Mon Dec 20 13:51:05 2010
@@ -75,6 +75,73 @@ public class RestrictedByElem
      * {@inheritDoc}
      */
     @Override
+    public int hashCode()
+    {
+        int hash = 37;
+        hash = hash * 17 + attributeType.hashCode();
+        hash = hash * 17 + valuesIn.hashCode();
+        return hash;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean equals( Object o )
+    {
+        if (o == null)
+        {
+            return false;
+        }
+        
+        if ( this == o )
+        {
+            return true;
+        }
+        
+        if ( o instanceof RestrictedByElem )
+        {
+            RestrictedByElem that = ( RestrictedByElem ) o;
+            if ( this.attributeType == null )
+            {
+                if ( that.attributeType == null )
+                {
+                    if ( this.valuesIn == null )
+                    {
+                        return that.valuesIn == null;
+                    }
+                    else
+                    {
+                        return this.valuesIn.equals( that.valuesIn );
+                    }
+                }
+                return false;
+            }
+            else
+            {
+                if ( this.attributeType.equals( that.attributeType ))
+                {
+                    if ( this.valuesIn == null )
+                    {
+                        return that.valuesIn == null;
+                    }
+                    else
+                    {
+                        return this.valuesIn.equals( that.valuesIn );
+                    }
+                }
+                return false;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public String toString()
     {
         return "{ type " + attributeType.getName() + ", valuesIn " + valuesIn.getName() +
" }";

Propchange: directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 20 13:51:05 2010
@@ -5,4 +5,5 @@
 /directory/shared/branches/shared-subtree/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980350-980351
+/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:1049008-1051100
 /directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:519076-580502

Modified: directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapOperationErrorException.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapOperationErrorException.java?rev=1051103&r1=1051102&r2=1051103&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapOperationErrorException.java
(original)
+++ directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapOperationErrorException.java
Mon Dec 20 13:51:05 2010
@@ -47,6 +47,18 @@ public class LdapOperationErrorException
 
     /**
      * Creates a new instance of LdapOperationErrorException.
+     *
+     * @param message The exception message
+     * @param cause The root cause for this exception
+     */
+    public LdapOperationErrorException( String message, Throwable cause )
+    {
+        super( ResultCodeEnum.OPERATIONS_ERROR, message, cause );
+    }
+    
+    
+    /**
+     * Creates a new instance of LdapOperationErrorException.
      */
     public LdapOperationErrorException()
     {

Modified: directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapOperationException.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapOperationException.java?rev=1051103&r1=1051102&r2=1051103&view=diff
==============================================================================
--- directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapOperationException.java
(original)
+++ directory/shared/branches/shared-AP/ldap/src/main/java/org/apache/directory/shared/ldap/exception/LdapOperationException.java
Mon Dec 20 13:51:05 2010
@@ -37,10 +37,11 @@ public class LdapOperationException exte
 
     /** The operation resultCode */
     protected ResultCodeEnum resultCode;
-    
+
     /** The resolved DN */
     protected DN resolvedDn;
 
+
     /**
      * @return the resolvedDn
      */
@@ -71,7 +72,21 @@ public class LdapOperationException exte
         this.resultCode = resultCode;
     }
 
-    
+
+    /**
+     * Creates a new instance of LdapOperationException.
+     *
+     * @param resultCode The operation resultCode
+     * @param message The exception message
+     * @param cause The root cause for this exception
+     */
+    public LdapOperationException( ResultCodeEnum resultCode, String message, Throwable cause
)
+    {
+        super( message, cause );
+        this.resultCode = resultCode;
+    }
+
+
     /**
      * Creates a new instance of LdapOperationException.
      *
@@ -81,8 +96,8 @@ public class LdapOperationException exte
     {
         super( message );
     }
-    
-    
+
+
     /**
      * Gets the LDAP result code that would be associated with this exception.
      * 



Mime
View raw message