You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2007/04/12 15:06:57 UTC
svn commit: r527924 - in
/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message:
DerefAliasesEnum.java MessageDecoder.java
Author: elecharny
Date: Thu Apr 12 06:06:56 2007
New Revision: 527924
URL: http://svn.apache.org/viewvc?view=rev&rev=527924
Log:
Modifed the code to use the newly created JndiPropertyConstants class
Modified:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DerefAliasesEnum.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DerefAliasesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DerefAliasesEnum.java?view=diff&rev=527924&r1=527923&r2=527924
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DerefAliasesEnum.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DerefAliasesEnum.java Thu Apr 12 06:06:56 2007
@@ -22,6 +22,8 @@
import java.util.Map;
+import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
+
/**
* Type-safe derefAliases search parameter enumeration which determines the mode
@@ -69,21 +71,6 @@
return value;
}
- /** java.naming.ldap.derefAliases JNDI property */
- public static final String JNDI_DEREF_ALIAS_PROP = "java.naming.ldap.derefAliases";
-
- /** Alias handling mode name that treats aliases like entries */
- //public static final String NEVER_DEREF_ALIASES_NAME = "never";
-
- /** Alias handling mode name that dereferences only when searching */
- //public static final String DEREF_IN_SEARCHING_NAME = "searching";
-
- /** Alias handling mode name that dereferences only in finding the base */
- //public static final String DEREF_FINDING_BASE_OBJ_NAME = "finding";
-
- /** Alias handling mode name that dereferences always */
- //public static final String DEREF_ALWAYS_NAME = "always";
-
/**
* Gets the enumeration from by extracting the value for the JNDI LDAP
* specific environment property, java.naming.ldap.derefAliases, from the
@@ -96,7 +83,7 @@
*/
public static DerefAliasesEnum getEnum( Map<String, DerefAliasesEnum> env )
{
- DerefAliasesEnum property = env.get( JNDI_DEREF_ALIAS_PROP );
+ DerefAliasesEnum property = env.get( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES );
if ( null == property )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java?view=diff&rev=527924&r1=527923&r2=527924
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java Thu Apr 12 06:06:56 2007
@@ -32,6 +32,7 @@
import org.apache.directory.shared.asn1.codec.stateful.DecoderMonitor;
import org.apache.directory.shared.asn1.codec.stateful.StatefulDecoder;
import org.apache.directory.shared.ldap.codec.ResponseCarryingException;
+import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
import org.apache.directory.shared.ldap.message.spi.Provider;
import org.apache.directory.shared.ldap.message.spi.ProviderDecoder;
import org.apache.directory.shared.ldap.message.spi.TransformerSpi;
@@ -51,7 +52,7 @@
{
private static final Logger log = LoggerFactory.getLogger( MessageDecoder.class );
- private static final String BINARY_KEY = "java.naming.ldap.attributes.binary";
+ private static final String BINARY_KEY = JndiPropertyConstants.JNDI_LDAP_ATTRIBUTES_BINARY;
/** Environment parameters stored here */
private final Hashtable env;