Getting rid of unused stuff.
git-svn-id: https://svn.apache.org/repos/asf/directory/apacheds/branches/server-config-annotations@1043866 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java b/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java
index 3603580..d483e1c 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/ConfigWriter.java
@@ -378,7 +378,7 @@
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 @@
// 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() ) );
}
diff --git a/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java b/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java
index f946f8a..3a5514f 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/ConfigurationElement.java
@@ -51,15 +51,6 @@
/**
- * 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 @@
* 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;
/**
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
index 3345cba..300ff74 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
@@ -31,7 +31,7 @@
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 */
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
index 18d80ca..755c8e5 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
@@ -34,7 +34,7 @@
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 */
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java
index 702f6ca..db148bc 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java
@@ -31,7 +31,7 @@
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 */
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java
index 31786fa..171689c 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java
@@ -31,7 +31,7 @@
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 */
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java
index be05830..a89c896 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java
@@ -31,7 +31,7 @@
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;
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java
index 7845790..8815aa2 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java
@@ -31,7 +31,7 @@
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 */
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java
index 8279f6a..c7a9f74 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java
@@ -31,7 +31,7 @@
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 */
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
index 35ca0c8..10dfe1d 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
@@ -35,7 +35,7 @@
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 */
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java
index d37a80f..812d5b6 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/PasswordPolicyBean.java
@@ -36,7 +36,7 @@
/**
* 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.
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
index b9d2589..7a74232 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
@@ -32,7 +32,7 @@
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 */
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java
index 1841cf9..c66ebdd 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/ReplProviderBean.java
@@ -32,7 +32,7 @@
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 */
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java
index e780d13..7691067 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechHandlerBean.java
@@ -31,7 +31,7 @@
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 */
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java
index 12cedb6..027f6ab 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java
@@ -34,7 +34,7 @@
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 */
diff --git a/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java b/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
index 2a43f52..8164a4d 100644
--- a/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
+++ b/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
@@ -37,7 +37,7 @@
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 */
