directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r474613 [2/2] - in /directory/branches/apacheds-schema/apacheds: core-plugin/src/main/antlr/ core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ core-shared/src/main/java/org/apache/directory/server/core/schema/bootstra...
Date Tue, 14 Nov 2006 00:54:05 GMT
Modified: directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyHandler.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyHandler.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyHandler.java
(original)
+++ directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/ModifyHandler.java
Mon Nov 13 16:54:03 2006
@@ -118,8 +118,8 @@
             result.setErrorMessage( msg );
             
             if ( ( e.getResolvedName() != null )
-                && ( ( code == ResultCodeEnum.NOSUCHOBJECT ) || ( code == ResultCodeEnum.ALIASPROBLEM
)
-                    || ( code == ResultCodeEnum.INVALIDDNSYNTAX ) || ( code == ResultCodeEnum.ALIASDEREFERENCINGPROBLEM
) ) )
+                && ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM
)
+                    || ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM
) ) )
             {
                 result.setMatchedDn( (LdapDN)e.getResolvedName() );
             }

Modified: directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/PersistentSearchListener.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/PersistentSearchListener.java
(original)
+++ directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/PersistentSearchListener.java
Mon Nov 13 16:54:03 2006
@@ -159,8 +159,8 @@
         result.setErrorMessage( msg );
         
         if ( ( evt.getException().getResolvedName() != null )
-            && ( ( code == ResultCodeEnum.NOSUCHOBJECT ) || ( code == ResultCodeEnum.ALIASPROBLEM
)
-                || ( code == ResultCodeEnum.INVALIDDNSYNTAX ) || ( code == ResultCodeEnum.ALIASDEREFERENCINGPROBLEM
) ) )
+            && ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM
)
+                || ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM
) ) )
         {
             result.setMatchedDn( (LdapDN)evt.getException().getResolvedName() );
         }

Modified: directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
(original)
+++ directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchHandler.java
Mon Nov 13 16:54:03 2006
@@ -37,7 +37,6 @@
 import org.apache.directory.server.core.jndi.ServerLdapContext;
 import org.apache.directory.server.core.partition.PartitionNexus;
 import org.apache.directory.server.ldap.SessionRegistry;
-import org.apache.directory.shared.ldap.codec.util.LdapResultEnum;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.OperationAbandonedException;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
@@ -130,7 +129,7 @@
     private static boolean isRootDSESearch( SearchRequest req )
     {
         boolean isBaseIsRoot = req.getBase().isEmpty();
-        boolean isBaseScope = req.getScope() == ScopeEnum.BASEOBJECT;
+        boolean isBaseScope = req.getScope() == ScopeEnum.BASE_OBJECT;
         boolean isRootDSEFilter = false;
         if ( req.getFilter() instanceof PresenceNode )
         {
@@ -206,7 +205,7 @@
                 Control[] controls = ( Control[] ) req.getControls().values().toArray( new
Control[0] );
                 ctx.setRequestControls( controls );
             }
-            ctx.addToEnvironment( DEREFALIASES_KEY, req.getDerefAliases().getName() );
+            ctx.addToEnvironment( DEREFALIASES_KEY, req.getDerefAliases() );
             if ( req.getControls().containsKey( ManageDsaITControl.CONTROL_OID ) )
             {
                 ctx.addToEnvironment( Context.REFERRAL, "ignore" );
@@ -226,7 +225,7 @@
             if ( isAnonymousUser && !allowAnonymousBinds && !isRootDSESearch
)
             {
                 LdapResult result = req.getResultResponse().getLdapResult();
-                result.setResultCode( ResultCodeEnum.INSUFFICIENTACCESSRIGHTS );
+                result.setResultCode( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS );
                 String msg = "Bind failure: Anonymous binds have been disabled!";
                 result.setErrorMessage( msg );
                 session.write( req.getResultResponse() );
@@ -284,7 +283,7 @@
                             {
                                 // ok if normal search beforehand failed somehow quickly
abandon psearch
                                 ResultCodeEnum rcode = ( ( SearchResponseDone ) resp ).getLdapResult().getResultCode();
-                                if ( rcode.getValue() != LdapResultEnum.SUCCESS )
+                                if ( rcode != ResultCodeEnum.SUCCESS )
                                 {
                                     session.write( resp );
                                     return;
@@ -406,8 +405,8 @@
             result.setErrorMessage( msg );
 
             if ( ( e.getResolvedName() != null )
-                && ( ( code == ResultCodeEnum.NOSUCHOBJECT ) || ( code == ResultCodeEnum.ALIASPROBLEM
)
-                    || ( code == ResultCodeEnum.INVALIDDNSYNTAX ) || ( code == ResultCodeEnum.ALIASDEREFERENCINGPROBLEM
) ) )
+                && ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM
)
+                    || ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM
) ) )
             {
                 result.setMatchedDn( (LdapDN)e.getResolvedName() );
             }

Modified: directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchResponseIterator.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchResponseIterator.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchResponseIterator.java
(original)
+++ directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/SearchResponseIterator.java
Mon Nov 13 16:54:03 2006
@@ -430,8 +430,8 @@
             NamingException ne = ( NamingException ) e;
             
             if ( ( ne.getResolvedName() != null )
-                && ( ( code == ResultCodeEnum.NOSUCHOBJECT ) || ( code == ResultCodeEnum.ALIASPROBLEM
)
-                    || ( code == ResultCodeEnum.INVALIDDNSYNTAX ) || ( code == ResultCodeEnum.ALIASDEREFERENCINGPROBLEM
) ) )
+                && ( ( code == ResultCodeEnum.NO_SUCH_OBJECT ) || ( code == ResultCodeEnum.ALIAS_PROBLEM
)
+                    || ( code == ResultCodeEnum.INVALID_DN_SYNTAX ) || ( code == ResultCodeEnum.ALIAS_DEREFERENCING_PROBLEM
) ) )
             {
                 resp.getLdapResult().setMatchedDn( (LdapDN)ne.getResolvedName() );
             }

Modified: directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java
(original)
+++ directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/GracefulShutdownHandler.java
Mon Nov 13 16:54:03 2006
@@ -90,7 +90,7 @@
         {
             log.error( "Encountered session context which was not a ServerLdapContext" );
             GracefulShutdownResponse msg = new GracefulShutdownResponse( req.getMessageId(),
-                ResultCodeEnum.OPERATIONSERROR );
+                ResultCodeEnum.OPERATIONS_ERROR );
             msg.getLdapResult().setErrorMessage( "The session context was not a ServerLdapContext"
);
             requestor.write( msg );
             return;
@@ -107,7 +107,7 @@
             }
 
             requestor
-                .write( new GracefulShutdownResponse( req.getMessageId(), ResultCodeEnum.INSUFFICIENTACCESSRIGHTS
) );
+                .write( new GracefulShutdownResponse( req.getMessageId(), ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS
) );
             return;
         }
 

Modified: directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
(original)
+++ directory/branches/apacheds-schema/apacheds/protocol-ldap/src/main/java/org/apache/directory/server/ldap/support/extended/LaunchDiagnosticUiHandler.java
Mon Nov 13 16:54:03 2006
@@ -85,7 +85,7 @@
             if ( !slc.getPrincipal().getName().equalsIgnoreCase( PartitionNexus.ADMIN_PRINCIPAL_NORMALIZED
) )
             {
                 requestor.write( new LaunchDiagnosticUiResponse( req.getMessageId(),
-                    ResultCodeEnum.INSUFFICIENTACCESSRIGHTS ) );
+                    ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS ) );
                 return;
             }
 
@@ -124,7 +124,7 @@
             return;
         }
 
-        requestor.write( new LaunchDiagnosticUiResponse( req.getMessageId(), ResultCodeEnum.OPERATIONSERROR
) );
+        requestor.write( new LaunchDiagnosticUiResponse( req.getMessageId(), ResultCodeEnum.OPERATIONS_ERROR
) );
     }
 
 

Modified: directory/branches/apacheds-schema/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/dumpcmd/DumpCommandExecutor.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/dumpcmd/DumpCommandExecutor.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/dumpcmd/DumpCommandExecutor.java
(original)
+++ directory/branches/apacheds-schema/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/dumpcmd/DumpCommandExecutor.java
Mon Nov 13 16:54:03 2006
@@ -363,7 +363,7 @@
             }
 
             AttributeType type = registry.lookup( attr.getID() );
-            boolean isOperational = type.getUsage() != UsageEnum.USERAPPLICATIONS;
+            boolean isOperational = type.getUsage() != UsageEnum.USER_APPLICATIONS;
             if ( exclusions.contains( attr.getID() ) || ( isOperational && ( !includeOperational
) ) )
             {
                 toRemove.add( attr.getID() );

Modified: directory/branches/apacheds-schema/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java
URL: http://svn.apache.org/viewvc/directory/branches/apacheds-schema/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java?view=diff&rev=474613&r1=474612&r2=474613
==============================================================================
--- directory/branches/apacheds-schema/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java
(original)
+++ directory/branches/apacheds-schema/apacheds/server-tools/src/main/java/org/apache/directory/server/tools/commands/importcmd/ImportCommandExecutor.java
Mon Nov 13 16:54:03 2006
@@ -68,9 +68,9 @@
 import org.apache.directory.shared.ldap.codec.modify.ModifyRequest;
 import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequest;
 import org.apache.directory.shared.ldap.codec.unbind.UnBindRequest;
-import org.apache.directory.shared.ldap.codec.util.LdapResultEnum;
 import org.apache.directory.shared.ldap.ldif.Entry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -179,7 +179,7 @@
                         BindResponse resp = ( ( LdapMessageContainer ) ldapMessageContainer
).getLdapMessage()
                             .getBindResponse();
 
-                        if ( resp.getLdapResult().getResultCode() != 0 )
+                        if ( resp.getLdapResult().getResultCode().getResultCode() != 0 )
                         {
                             notifyOutputListener( "Error : " + resp.getLdapResult().getErrorMessage()
);
                         }
@@ -189,7 +189,7 @@
                         ExtendedResponse resp = ( ( LdapMessageContainer ) ldapMessageContainer
).getLdapMessage()
                             .getExtendedResponse();
 
-                        if ( resp.getLdapResult().getResultCode() != 0 )
+                        if ( resp.getLdapResult().getResultCode().getResultCode() != 0 )
                         {
                             notifyOutputListener( "Error : " + resp.getLdapResult().getErrorMessage()
);
                         }
@@ -267,7 +267,7 @@
 
         LdapResult result = response.getAddResponse().getLdapResult();
 
-        if ( result.getResultCode() == LdapResultEnum.SUCCESS )
+        if ( result.getResultCode() == ResultCodeEnum.SUCCESS )
         {
             if ( isDebugEnabled() )
             {
@@ -327,7 +327,7 @@
 
         LdapResult result = response.getDelResponse().getLdapResult();
 
-        if ( result.getResultCode() == LdapResultEnum.SUCCESS )
+        if ( result.getResultCode() == ResultCodeEnum.SUCCESS )
         {
             if ( isDebugEnabled() )
             {
@@ -393,7 +393,7 @@
 
         LdapResult result = response.getModifyDNResponse().getLdapResult();
 
-        if ( result.getResultCode() == LdapResultEnum.SUCCESS )
+        if ( result.getResultCode() == ResultCodeEnum.SUCCESS )
         {
             if ( isDebugEnabled() )
             {
@@ -486,7 +486,7 @@
 
         LdapResult result = response.getModifyResponse().getLdapResult();
 
-        if ( result.getResultCode() == LdapResultEnum.SUCCESS )
+        if ( result.getResultCode() == ResultCodeEnum.SUCCESS )
         {
             if ( isDebugEnabled() )
             {
@@ -578,7 +578,7 @@
 
         LdapResult result = response.getBindResponse().getLdapResult();
 
-        if ( result.getResultCode() == LdapResultEnum.SUCCESS )
+        if ( result.getResultCode() == ResultCodeEnum.SUCCESS )
         {
             if ( isDebugEnabled() )
             {



Mime
View raw message