You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/12/09 09:48:00 UTC
svn commit: r1043866 - in
/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config:
./ beans/
Author: pamarcelot
Date: Thu Dec 9 08:47:59 2010
New Revision: 1043866
URL: http://svn.apache.org/viewvc?rev=1043866&view=rev
Log:
Getting rid of unused stuff.
Modified:
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java
directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java Thu Dec 9 08:47:59 2010
@@ -378,7 +378,7 @@ public class ConfigWriter
else
{
// Is it the field value used as RDN and do we need to insert a value in the parent entry?
- if ( ( configurationElement.isRDN() ) && ( parentEntry != null )
+ if ( ( configurationElement.isRdn() ) && ( parentEntry != null )
&& ( attributeTypeForParentEntry != null ) )
{
// Adding the field value to the parent entry
@@ -502,7 +502,7 @@ public class ConfigWriter
// Looking for the @ConfigurationElement annotation and
// if the field is the RDN
ConfigurationElement configurationElement = field.getAnnotation( ConfigurationElement.class );
- if ( ( configurationElement != null ) && ( configurationElement.isRDN() ) )
+ if ( ( configurationElement != null ) && ( configurationElement.isRdn() ) )
{
return baseDN.add( new RDN( configurationElement.attributeType(), field.get( bean ).toString() ) );
}
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java Thu Dec 9 08:47:59 2010
@@ -51,15 +51,6 @@ public @interface ConfigurationElement
/**
- * Returns the object class.
- *
- * @return
- * the object class
- */
- String objectClass() default "";
-
-
- /**
* Returns true if of the qualified field (attribute type and value)
* is the RDN of the entry.
*
@@ -68,17 +59,7 @@ public @interface ConfigurationElement
* is the RDN of the entry,
* <code>false</code> if not.
*/
- boolean isRDN() default false;
-
-
- /**
- * Returns true if the qualified field contains multiple values.
- *
- * @return
- * <code>true</code> if the qualified field contains multiple values,
- * <code>false</code> if not.
- */
- boolean isMultiple() default false;
+ boolean isRdn() default false;
/**
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java Thu Dec 9 08:47:59 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.confi
public class ChangeLogBean extends AdsBaseBean
{
/** The ChangeLog unique ID */
- @ConfigurationElement(attributeType = "ads-changeLogId", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-changeLogId", isRdn = true)
private String changeLogId;
/** Tells if the ChangeLog is exposed to the users */
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java Thu Dec 9 08:47:59 2010
@@ -34,7 +34,7 @@ import org.apache.directory.server.confi
public class DirectoryServiceBean extends AdsBaseBean
{
/** The DS instance Id */
- @ConfigurationElement(attributeType = "ads-directoryServiceId", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-directoryServiceId", isRdn = true)
private String directoryServiceId;
/** The directory instance replication ID */
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java Thu Dec 9 08:47:59 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.confi
public class ExtendedOpHandlerBean extends AdsBaseBean
{
/** The Extended Operation ID */
- @ConfigurationElement(attributeType = "ads-extendedOpId", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-extendedOpId", isRdn = true)
private String extendedOpId;
/** The Extended Operation FQCN */
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java Thu Dec 9 08:47:59 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.confi
public class HttpWebAppBean extends AdsBaseBean
{
/** The server identifier */
- @ConfigurationElement(attributeType = "ads-id", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-id", isRdn = true)
private String id;
/** The context path */
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java Thu Dec 9 08:47:59 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.confi
public abstract class IndexBean extends AdsBaseBean
{
/** The index unique identifier */
- @ConfigurationElement(attributeType = "ads-indexAttributeId", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-indexAttributeId", isRdn = true)
private String indexAttributeId;
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java Thu Dec 9 08:47:59 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.confi
public class InterceptorBean extends AdsBaseBean implements Comparable<InterceptorBean>
{
/** The Interceptor ID */
- @ConfigurationElement(attributeType = "ads-interceptorId", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-interceptorId", isRdn = true)
private String interceptorId;
/** The interceptor FQCN */
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java Thu Dec 9 08:47:59 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.confi
public class JournalBean extends AdsBaseBean
{
/** The journal unique Id */
- @ConfigurationElement(attributeType = "ads-journalId", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-journalId", isRdn = true)
private String journalId;
/** The journal file name */
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java Thu Dec 9 08:47:59 2010
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
public abstract class PartitionBean extends AdsBaseBean
{
/** The Partition identifier */
- @ConfigurationElement(attributeType = "ads-partitionId", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-partitionId", isRdn = true)
private String partitionId;
/** The Partition suffix */
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java Thu Dec 9 08:47:59 2010
@@ -36,7 +36,7 @@ public class PasswordPolicyBean extends
/**
* The PasswordPolicy unique identifier
*/
- @ConfigurationElement(attributeType = "ads-pwdId", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-pwdId", isRdn = true)
private String pwdId;
/** the name of the attribute to which the password policy is applied.
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java Thu Dec 9 08:47:59 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
public class ReplConsumerBean extends AdsBaseBean
{
/** The consumer id */
- @ConfigurationElement(attributeType = "ads-replConsumerId", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-replConsumerId", isRdn = true)
private String replConsumerId;
/** The replication unique ID */
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java Thu Dec 9 08:47:59 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
public class ReplProviderBean extends AdsBaseBean
{
/** The provider id */
- @ConfigurationElement(attributeType = "ads-replProviderId", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-replProviderId", isRdn = true)
private String replProviderId;
/** The replication unique ID */
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java Thu Dec 9 08:47:59 2010
@@ -31,7 +31,7 @@ import org.apache.directory.server.confi
public class SaslMechHandlerBean extends AdsBaseBean
{
/** The SASL mechanism handler */
- @ConfigurationElement(attributeType = "ads-saslMechName", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-saslMechName", isRdn = true)
private String saslMechName;
/** The SASL mechanism handler FQCN */
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java Thu Dec 9 08:47:59 2010
@@ -34,7 +34,7 @@ import org.apache.directory.server.confi
public abstract class ServerBean extends AdsBaseBean
{
/** The server unique identifier */
- @ConfigurationElement(attributeType = "ads-serverId", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-serverId", isRdn = true)
private String serverId;
/** The set of transports to use for this server */
Modified: directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java?rev=1043866&r1=1043865&r2=1043866&view=diff
==============================================================================
--- directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java (original)
+++ directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java Thu Dec 9 08:47:59 2010
@@ -37,7 +37,7 @@ public class TransportBean extends AdsBa
private static final int DEFAULT_NB_THREADS = 3;
/** The unique identifier for this transport */
- @ConfigurationElement(attributeType = "ads-transportId", isRDN = true)
+ @ConfigurationElement(attributeType = "ads-transportId", isRdn = true)
private String transportId;
/** The transport address */