You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2004/12/11 06:51:36 UTC
svn commit: r111579 - in incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common: exception ldif
Author: akarasulu
Date: Fri Dec 10 21:51:32 2004
New Revision: 111579
URL: http://svn.apache.org/viewcvs?view=rev&rev=111579
Log:
Changes ...
o moved to using Ldap prefix instead of Eve prefix but some still had Eve
prefix and were being used so we have to blow em away
o modified classes that used the old exceptions
o remove interface for old exceptions
o remove exceptions with Eve prefix
Removed:
incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveAttributeInUseException.java
incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveConfigurationException.java
incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveException.java
incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveNamingException.java
incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveNoPermissionException.java
Modified:
incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/LdapServiceUnavailableException.java
incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/ldif/LdifParserImpl.java
Deleted: /incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveAttributeInUseException.java
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveAttributeInUseException.java?view=auto&rev=111578
==============================================================================
Deleted: /incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveConfigurationException.java
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveConfigurationException.java?view=auto&rev=111578
==============================================================================
Deleted: /incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveException.java
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveException.java?view=auto&rev=111578
==============================================================================
Deleted: /incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveNamingException.java
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveNamingException.java?view=auto&rev=111578
==============================================================================
Deleted: /incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveNoPermissionException.java
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/EveNoPermissionException.java?view=auto&rev=111578
==============================================================================
Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/LdapServiceUnavailableException.java
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/LdapServiceUnavailableException.java?view=diff&rev=111579&p1=incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/LdapServiceUnavailableException.java&r1=111578&p2=incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/LdapServiceUnavailableException.java&r2=111579
==============================================================================
--- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/LdapServiceUnavailableException.java (original)
+++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/exception/LdapServiceUnavailableException.java Fri Dec 10 21:51:32 2004
@@ -19,7 +19,6 @@
import javax.naming.ServiceUnavailableException;
-import org.apache.eve.exception.EveException;
import org.apache.ldap.common.message.ResultCodeEnum;
@@ -31,7 +30,7 @@
* @version $Rev$
*/
public class LdapServiceUnavailableException extends ServiceUnavailableException
- implements EveException
+ implements LdapException
{
/** the LDAP result code to be checked */
private final ResultCodeEnum resultCode;
Modified: incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/ldif/LdifParserImpl.java
Url: http://svn.apache.org/viewcvs/incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/ldif/LdifParserImpl.java?view=diff&rev=111579&p1=incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/ldif/LdifParserImpl.java&r1=111578&p2=incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/ldif/LdifParserImpl.java&r2=111579
==============================================================================
--- incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/ldif/LdifParserImpl.java (original)
+++ incubator/directory/ldap/trunk/common/src/java/org/apache/ldap/common/ldif/LdifParserImpl.java Fri Dec 10 21:51:32 2004
@@ -41,7 +41,7 @@
import org.apache.ldap.common.util.Base64;
import org.apache.ldap.common.message.ResultCodeEnum;
-import org.apache.eve.exception.EveNamingException;
+import org.apache.ldap.common.exception.LdapNamingException;
/**
@@ -99,7 +99,7 @@
// Try to advance to ':' if one exists.
if ( ( index = line.indexOf( ':' ) ) == -1 )
{
- throw new EveNamingException( "Line " + lineCount + " ["
+ throw new LdapNamingException( "Line " + lineCount + " ["
+ line + "] does not correspond to an LDIF entry "
+ "attribute value pair.\n{" + ldif + "}",
ResultCodeEnum.OTHER );
@@ -149,7 +149,7 @@
catch ( IOException e )
{
// Does not really occur: we follow form by transforming w/ rethrow
- throw new EveNamingException( ResultCodeEnum.OTHER );
+ throw new LdapNamingException( ResultCodeEnum.OTHER );
}
}
@@ -190,7 +190,7 @@
{
if ( l_currentModOp == -1 )
{
- throw new EveNamingException( "A modification"
+ throw new LdapNamingException( "A modification"
+ " type must be supplied for a change "
+ "type of modify",
ResultCodeEnum.OTHER );
@@ -219,7 +219,7 @@
// Try to advance to ':' if one exists.
if ( ( l_index = l_line.indexOf( ':' ) ) == -1 )
{
- throw new EveNamingException( "Line " + l_lineCount + " ["
+ throw new LdapNamingException( "Line " + l_lineCount + " ["
+ l_line + "] does not correspond to an LDIF entry "
+ "attribute value pair.\n{" + an_ldif + "}",
ResultCodeEnum.OTHER );
@@ -274,7 +274,7 @@
{
if ( !l_entry.getModType().equalsIgnoreCase( "modify" ) )
{
- throw new EveNamingException( "Cannot use modification "
+ throw new LdapNamingException( "Cannot use modification "
+ l_attrName + " identifier on "
+ l_entry.getModType()
+ " change type",
@@ -286,7 +286,7 @@
{
if ( !l_entry.getModType().equalsIgnoreCase( "modify" ) )
{
- throw new EveNamingException( "Cannot use modification "
+ throw new LdapNamingException( "Cannot use modification "
+ l_attrName + " identifier on "
+ l_entry.getModType()
+ " change type",
@@ -298,7 +298,7 @@
{
if ( !l_entry.getModType().equalsIgnoreCase( "modify" ) )
{
- throw new EveNamingException( "Cannot use modification "
+ throw new LdapNamingException( "Cannot use modification "
+ l_attrName + " identifier on "
+ l_entry.getModType()
+ " change type",
@@ -316,7 +316,7 @@
{
if ( l_currentModOp == -1 )
{
- throw new EveNamingException( "A modification type must"
+ throw new LdapNamingException( "A modification type must"
+ " be supplied for a change type of modify",
ResultCodeEnum.OTHER );
}
@@ -343,7 +343,7 @@
catch ( IOException e )
{
// Does not really occur: we follow form by transforming w/ rethrow
- throw new EveNamingException( e.getMessage(), ResultCodeEnum.OTHER );
+ throw new LdapNamingException( e.getMessage(), ResultCodeEnum.OTHER );
}
}
}