directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r923841 - in /directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema: AttributeTypeHolder.java ObjectClassHolder.java SchemaElement.java SchemaElementImpl.java
Date Tue, 16 Mar 2010 16:26:05 GMT
Author: kayyagari
Date: Tue Mar 16 16:26:05 2010
New Revision: 923841

URL: http://svn.apache.org/viewvc?rev=923841&view=rev
Log:
trashed few more jndi exceptions ;)

Modified:
    directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java
    directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java
    directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElement.java
    directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java

Modified: directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java?rev=923841&r1=923840&r2=923841&view=diff
==============================================================================
--- directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java
(original)
+++ directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/AttributeTypeHolder.java
Tue Mar 16 16:26:05 2010
@@ -20,11 +20,10 @@
 package org.apache.directory.shared.converter.schema;
 
 
-import javax.naming.NamingException;
-
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
@@ -328,7 +327,7 @@ public class AttributeTypeHolder extends
      *            The name of the schema file containing this attributeType
      * @return A ldif formatted string
      */
-    public String toLdif( String schemaName ) throws NamingException
+    public String toLdif( String schemaName ) throws LdapException
     {
         StringBuilder sb = new StringBuilder();
 
@@ -416,7 +415,7 @@ public class AttributeTypeHolder extends
     /* (non-Javadoc)
      * @see org.apache.directory.shared.converter.schema.SchemaElementImpl#dnToLdif(java.lang.String)
      */
-    public String dnToLdif( String schemaName ) throws NamingException
+    public String dnToLdif( String schemaName ) throws LdapException
     {
         StringBuilder sb = new StringBuilder();
 

Modified: directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java?rev=923841&r1=923840&r2=923841&view=diff
==============================================================================
--- directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java
(original)
+++ directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/ObjectClassHolder.java
Tue Mar 16 16:26:05 2010
@@ -23,11 +23,10 @@ package org.apache.directory.shared.conv
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
@@ -148,7 +147,7 @@ public class ObjectClassHolder extends S
      * @param schemaName The name of the schema file containing this objectClass
      * @return A ldif formatted string
      */
-    public String toLdif( String schemaName ) throws NamingException
+    public String toLdif( String schemaName ) throws LdapException
     {
         StringBuilder sb = new StringBuilder();
 
@@ -209,7 +208,7 @@ public class ObjectClassHolder extends S
     /* (non-Javadoc)
      * @see org.apache.directory.shared.converter.schema.SchemaElementImpl#dnToLdif(java.lang.String)
      */
-    public String dnToLdif( String schemaName ) throws NamingException
+    public String dnToLdif( String schemaName ) throws LdapException
     {
         StringBuilder sb = new StringBuilder();
 

Modified: directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElement.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElement.java?rev=923841&r1=923840&r2=923841&view=diff
==============================================================================
--- directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElement.java
(original)
+++ directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElement.java
Tue Mar 16 16:26:05 2010
@@ -21,7 +21,7 @@ package org.apache.directory.shared.conv
 
 import java.util.List;
 
-import javax.naming.NamingException;
+import org.apache.directory.shared.ldap.exception.LdapException;
 
 /**
  * An interface defining the methods to be implemented by the SchemaElement 
@@ -89,7 +89,7 @@ public interface SchemaElement
      * as a ldif string 
      * @param schemaName The schema from which is extracted this schemaElement
      * @return A string representing the schemaElement as a Ldif formated  String 
-     * @throws NamingException If any error occurs.
+     * @throws LdapException If any error occurs.
      */
-    String toLdif( String schemaName ) throws NamingException;
+    String toLdif( String schemaName ) throws LdapException;
 }

Modified: directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java?rev=923841&r1=923840&r2=923841&view=diff
==============================================================================
--- directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
(original)
+++ directory/shared/trunk/ldap-convert/src/main/java/org/apache/directory/shared/converter/schema/SchemaElementImpl.java
Tue Mar 16 16:26:05 2010
@@ -22,12 +22,11 @@ package org.apache.directory.shared.conv
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.naming.NamingException;
-
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
+import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -139,7 +138,7 @@ public abstract class SchemaElementImpl 
     /**
      * @return the Names as Ldif lines
      */
-    private String nameToLdif() throws NamingException
+    private String nameToLdif() throws LdapException
     {
         if ( names.size() == 0 )
         {
@@ -164,7 +163,7 @@ public abstract class SchemaElementImpl 
     /**
      * @return The description as a ldif line
      */
-    private String descToLdif() throws NamingException
+    private String descToLdif() throws LdapException
     {
         if ( StringTools.isEmpty( description ) )
         {
@@ -184,7 +183,7 @@ public abstract class SchemaElementImpl 
     /**
      * @return The dn as a ldif line
      */
-    public abstract String dnToLdif( String schemaName ) throws NamingException;
+    public abstract String dnToLdif( String schemaName ) throws LdapException;
     
     /**
      * Return the extensions formated as Ldif lines
@@ -192,9 +191,9 @@ public abstract class SchemaElementImpl 
      * m-attributeTypeExtension
      * 
      * @return The extensions formated as ldif lines
-     * @throws NamingException If the conversion goes wrong
+     * @throws LdapException If the conversion goes wrong
      */
-    protected String extensionsToLdif( String ID ) throws NamingException
+    protected String extensionsToLdif( String ID ) throws LdapException
     {
         StringBuilder sb = new StringBuilder();
         
@@ -211,7 +210,7 @@ public abstract class SchemaElementImpl 
         return sb.toString();
     }
 
-    protected String schemaToLdif( String schemaName, String type ) throws NamingException
+    protected String schemaToLdif( String schemaName, String type ) throws LdapException
     {
         StringBuilder sb = new StringBuilder();
         



Mime
View raw message