directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r923836 - in /directory/apacheds/trunk: utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java
Date Tue, 16 Mar 2010 16:14:05 GMT
Author: kayyagari
Date: Tue Mar 16 16:14:04 2010
New Revision: 923836

URL: http://svn.apache.org/viewvc?rev=923836&view=rev
Log:
some more jndi exceptions were trashed

Modified:
    directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java

Modified: directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java?rev=923836&r1=923835&r2=923836&view=diff
==============================================================================
--- directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
(original)
+++ directory/apacheds/trunk/utils/src/main/java/org/apache/directory/server/utils/AttributesFactory.java
Tue Mar 16 16:14:04 2010
@@ -22,8 +22,6 @@ package org.apache.directory.server.util
 
 import java.util.List;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.server.core.entry.DefaultServerAttribute;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
@@ -31,6 +29,7 @@ import org.apache.directory.server.i18n.
 import org.apache.directory.shared.ldap.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.DITContentRule;
 import org.apache.directory.shared.ldap.schema.DITStructureRule;
@@ -57,7 +56,7 @@ import org.apache.directory.shared.ldap.
  */
 public class AttributesFactory
 {
-    public ServerEntry getAttributes( SchemaObject obj, Schema schema, SchemaManager schemaManager
) throws NamingException
+    public ServerEntry getAttributes( SchemaObject obj, Schema schema, SchemaManager schemaManager
) throws LdapException
     {
         if ( obj instanceof LdapSyntax )
         {
@@ -96,7 +95,7 @@ public class AttributesFactory
     }
     
     
-    public ServerEntry getAttributes( Schema schema, SchemaManager schemaManager ) throws
NamingException
+    public ServerEntry getAttributes( Schema schema, SchemaManager schemaManager ) throws
LdapException
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager );
 
@@ -142,7 +141,7 @@ public class AttributesFactory
     }
 
     
-    public ServerEntry getAttributes( LdapSyntax syntax, Schema schema, SchemaManager schemaManager
) throws NamingException
+    public ServerEntry getAttributes( LdapSyntax syntax, Schema schema, SchemaManager schemaManager
) throws LdapException
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager );
 
@@ -186,9 +185,9 @@ public class AttributesFactory
      * 
      * @param matchingRule
      * @return Attributes
-     * @throws NamingException
+     * @throws LdapException
      */
-    public ServerEntry getAttributes( MatchingRule matchingRule, Schema schema, SchemaManager
schemaManager ) throws NamingException
+    public ServerEntry getAttributes( MatchingRule matchingRule, Schema schema, SchemaManager
schemaManager ) throws LdapException
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager );
 
@@ -261,9 +260,9 @@ public class AttributesFactory
      * 
      * @param attributeType
      * @return Attributes
-     * @throws NamingException
+     * @throws LdapException
      */
-    public ServerEntry getAttributes( AttributeType attributeType, Schema schema, SchemaManager
schemaManager ) throws NamingException
+    public ServerEntry getAttributes( AttributeType attributeType, Schema schema, SchemaManager
schemaManager ) throws LdapException
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager );
 
@@ -321,9 +320,9 @@ public class AttributesFactory
      * 
      * @param objectClass the objectClass to produce a meta schema entry for
      * @return the attributes of the metaSchema entry representing the objectClass
-     * @throws NamingException if there are any problems
+     * @throws LdapException if there are any problems
      */
-    public ServerEntry getAttributes( ObjectClass objectClass, Schema schema, SchemaManager
schemaManager ) throws NamingException
+    public ServerEntry getAttributes( ObjectClass objectClass, Schema schema, SchemaManager
schemaManager ) throws LdapException
     {
         ServerEntry entry = new DefaultServerEntry( schemaManager );
 
@@ -377,7 +376,7 @@ public class AttributesFactory
     }
     
     
-    private final void injectCommon( SchemaObject object, ServerEntry entry, SchemaManager
schemaManager ) throws NamingException
+    private final void injectCommon( SchemaObject object, ServerEntry entry, SchemaManager
schemaManager ) throws LdapException
     {
         injectNames( object.getNames(), entry, schemaManager );
         entry.put( MetaSchemaConstants.M_OBSOLETE_AT, getBoolean( object.isObsolete() ) );
@@ -390,7 +389,7 @@ public class AttributesFactory
     }
     
     
-    private final void injectNames( List<String> names, ServerEntry entry, SchemaManager
schemaManager ) throws NamingException
+    private final void injectNames( List<String> names, ServerEntry entry, SchemaManager
schemaManager ) throws LdapException
     {
         if ( ( names == null ) || ( names.size() == 0 ) )
         {

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java?rev=923836&r1=923835&r2=923836&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java
(original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java
Tue Mar 16 16:14:04 2010
@@ -23,11 +23,10 @@ package org.apache.directory.server.xdbm
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.entry.client.ClientBinaryValue;
 import org.apache.directory.shared.ldap.entry.client.ClientStringValue;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.AndNode;
 import org.apache.directory.shared.ldap.filter.BranchNode;
 import org.apache.directory.shared.ldap.filter.ExprNode;
@@ -153,7 +152,7 @@ public class FilterNormalizingVisitor im
 
             return normalized;
         }
-        catch ( NamingException ne )
+        catch ( LdapException ne )
         {
             log.warn( "Failed to normalize filter value: {}", ne.getMessage(), ne );
             return null;
@@ -175,7 +174,7 @@ public class FilterNormalizingVisitor im
             node.setAttribute( schemaManager.getAttributeTypeRegistry().getOidByName( node.getAttribute()
) );
             return node;
         }
-        catch ( NamingException ne )
+        catch ( LdapException ne )
         {
             log.warn( "Failed to normalize filter node attribute: {}, error: {}", node.getAttribute(),
ne.getMessage() );
             return null;
@@ -216,7 +215,7 @@ public class FilterNormalizingVisitor im
             node.setValue( normalized );
             return node;
         }
-        catch ( NamingException ne )
+        catch ( LdapException ne )
         {
             log.warn( "Failed to normalize filter node attribute: {}, error: {}", node.getAttribute(),
ne.getMessage() );
             return null;
@@ -314,7 +313,7 @@ public class FilterNormalizingVisitor im
 
             return node;
         }
-        catch ( NamingException ne )
+        catch ( LdapException ne )
         {
             log.warn( "Failed to normalize filter node attribute: {}, error: {}", node.getAttribute(),
ne.getMessage() );
             return null;
@@ -338,7 +337,7 @@ public class FilterNormalizingVisitor im
             node.setAttribute( schemaManager.getAttributeTypeRegistry().getOidByName( node.getAttribute()
) );
             return node;
         }
-        catch ( NamingException ne )
+        catch ( LdapException ne )
         {
             log.warn( "Failed to normalize filter node attribute: {}, error: {}", node.getAttribute(),
ne.getMessage() );
             return null;



Mime
View raw message