directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1024065 - /directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/
Date Mon, 18 Oct 2010 23:49:57 GMT
Author: elecharny
Date: Mon Oct 18 23:49:56 2010
New Revision: 1024065

URL: http://svn.apache.org/viewvc?rev=1024065&view=rev
Log:
Updated the beans used to store the config, added some missing ones, removed some useless
ones, and modified the contents of many of them
Not 100% done yet

Added:
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ConfigBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
      - copied, changed from r1023445, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryBackedServiceBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java
      - copied, changed from r1023445, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerExtendedOpHandlerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java
      - copied, changed from r1023445, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsIndexBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechanisHandlerBean.java
      - copied, changed from r1023445, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerSaslMechanisHandlerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java
      - copied, changed from r1023445, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsServerBean.java
Removed:
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsIndexBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/CatalogBasedServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryBackedServiceBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerExtendedOpHandlerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerSaslMechanisHandlerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ProtocolServiceBean.java
Modified:
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DhcpServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DnsServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
    directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java

Added: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java?rev=1024065&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java
(added)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsBaseBean.java
Mon Oct 18 23:49:56 2010
@@ -0,0 +1,80 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.apache.directory.server.config.beans;
+
+/**
+ * A class used to store the Base ADS configuration. It can't be instanciated
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public abstract class AdsBaseBean 
+{
+    /** The enabled flag */
+    private boolean enabled = false;
+    
+    /** The description */
+    private String description;
+
+    /**
+     * Create a new BaseBean instance
+     */
+    protected AdsBaseBean()
+    {
+    }
+    
+    
+    /**
+     * @return <code>true</code> if the component is enabled
+     */
+    public boolean isEnabled()
+    {
+        return enabled;
+    }
+    
+    
+    /**
+     * Enable or disable the component
+     * @param enabled if <code>true</code>, the component is enabled.
+     */
+    public void setEnabled( boolean enabled )
+    {
+        this.enabled = enabled;
+    }
+    
+    
+    /**
+     * @return the description for this component
+     */
+    public String getDescription() 
+    {
+        return description;
+    }
+    
+    
+    /**
+     * Sets the component description
+     * 
+     * @param description The description
+     */
+    public void setDescription( String description )
+    {
+        this.description = description;
+    }
+}

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangeLogBean.java
Mon Oct 18 23:49:56 2010
@@ -24,8 +24,11 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ChangeLogBean extends BaseAdsBean
+public class ChangeLogBean extends AdsBaseBean
 {
+    /** The ChangeLog unique ID */
+    private String changeLogId;
+
     /** Tells if the ChangeLog is exposed to the users */
     private boolean changeLogExposed;
 
@@ -40,6 +43,24 @@ public class ChangeLogBean extends BaseA
         // Not enabled by default
         setEnabled( false );
     }
+
+
+    /**
+     * @return the changeLogId
+     */
+    public String getChangeLogId()
+    {
+        return changeLogId;
+    }
+
+
+    /**
+     * @param changeLogId the changeLogId to set
+     */
+    public void setChangeLogId( String changeLogId )
+    {
+        this.changeLogId = changeLogId;
+    }
     
     
     /**

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ChangePasswordServerBean.java
Mon Oct 18 23:49:56 2010
@@ -28,7 +28,7 @@ import java.util.Set;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ChangePasswordServerBean extends CatalogBasedServerBean
+public class ChangePasswordServerBean extends DSBasedServerBean
 {
     /** The allowable clock skew. */
     private long krbAllowableClockSkew;

Added: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ConfigBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ConfigBean.java?rev=1024065&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ConfigBean.java
(added)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ConfigBean.java
Mon Oct 18 23:49:56 2010
@@ -0,0 +1,72 @@
+/*
+ *   Licensed to the Apache Software Foundation (ASF) under one
+ *   or more contributor license agreements.  See the NOTICE file
+ *   distributed with this work for additional information
+ *   regarding copyright ownership.  The ASF licenses this file
+ *   to you under the Apache License, Version 2.0 (the
+ *   "License"); you may not use this file except in compliance
+ *   with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.apache.directory.server.config.beans;
+
+import java.util.Set;
+
+/**
+ * The base class containing all the configuration hierarchy. This hierarchy
+ * starts with the DirectoryService elements.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public abstract class ConfigBean 
+{
+    /** The DirectoryService beans */
+    private Set<DirectoryServiceBean> directoryServiceBeans;
+
+    /**
+     * Create a new ConfigBean instance
+     */
+    protected ConfigBean()
+    {
+    }
+    
+    
+    /**
+     * Add underlying DirectoryServiceBean
+     * @param directoryServiceBeans The DirectoryServiceBeans
+     */
+    public void addDirectoryService( DirectoryServiceBean... directoryServiceBeans )
+    {
+        for ( DirectoryServiceBean directoryServiceBean : directoryServiceBeans )
+        {
+            this.directoryServiceBeans.add( directoryServiceBean );
+        }
+    }
+
+
+    /**
+     * @return the directoryServiceBeans
+     */
+    public Set<DirectoryServiceBean> getDirectoryServiceBeans()
+    {
+        return directoryServiceBeans;
+    }
+
+
+    /**
+     * @param directoryServiceBeans the directoryServiceBeans to set
+     */
+    public void setDirectoryServiceBeans( Set<DirectoryServiceBean> directoryServiceBeans
)
+    {
+        this.directoryServiceBeans = directoryServiceBeans;
+    }
+}

Copied: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
(from r1023445, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryBackedServiceBean.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java?p2=directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java&p1=directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryBackedServiceBean.java&r1=1023445&r2=1024065&rev=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryBackedServiceBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DSBasedServerBean.java
Mon Oct 18 23:49:56 2010
@@ -26,7 +26,7 @@ import org.apache.directory.server.const
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DirectoryBackedServiceBean extends ProtocolServiceBean
+public class DSBasedServerBean extends ServerBean
 {
     /**
      * The single location where entries are stored.  If this service
@@ -39,7 +39,7 @@ public class DirectoryBackedServiceBean 
     /**
      * Create a new JournalBean instance
      */
-    public DirectoryBackedServiceBean()
+    public DSBasedServerBean()
     {
     }
     

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DhcpServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DhcpServerBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DhcpServerBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DhcpServerBean.java
Mon Oct 18 23:49:56 2010
@@ -25,7 +25,7 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DhcpServerBean extends CatalogBasedServerBean
+public class DhcpServerBean extends DSBasedServerBean
 {
     /**
      * Create a new DhcpServerBean instance

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DirectoryServiceBean.java
Mon Oct 18 23:49:56 2010
@@ -30,7 +30,7 @@ import org.apache.directory.server.core.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DirectoryServiceBean extends BaseAdsBean
+public class DirectoryServiceBean extends AdsBaseBean
 {
     /** The DS instance Id */
     private String directoryServiceId;
@@ -65,8 +65,8 @@ public class DirectoryServiceBean extend
     /** The journal component */
     private JournalBean dsJournal;
 
-    /** The replication component */
-    //private ReplicationBean dsReplication;
+    /** The servers */
+    private Set<ServerBean> servers;
 
     /** The list of declared interceptors */
     private Set<InterceptorBean> interceptors;

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DnsServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DnsServerBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DnsServerBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/DnsServerBean.java
Mon Oct 18 23:49:56 2010
@@ -25,7 +25,7 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DnsServerBean extends CatalogBasedServerBean
+public class DnsServerBean extends DSBasedServerBean
 {
     /**
      * Create a new DnsServerBean instance

Copied: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java
(from r1023445, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerExtendedOpHandlerBean.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java?p2=directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java&p1=directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerExtendedOpHandlerBean.java&r1=1023445&r2=1024065&rev=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerExtendedOpHandlerBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ExtendedOpHandlerBean.java
Mon Oct 18 23:49:56 2010
@@ -25,18 +25,18 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class LdapServerExtendedOpHandlerBean extends AdsServerBean
+public class ExtendedOpHandlerBean
 {
     /** The Extended Operation ID */
     private String extendedOpId;
     
     /** The Extended Operation FQCN */
-    private String ldapServerExtendedOpHandlerClass;
+    private String extendedOpHandlerClass;
 
     /**
      * Create a new LdapServerExtendedOpHandlerBean instance
      */
-    public LdapServerExtendedOpHandlerBean()
+    public ExtendedOpHandlerBean()
     {
         super();
     }
@@ -63,17 +63,17 @@ public class LdapServerExtendedOpHandler
     /**
      * @return the ldapServerExtendedOpHandlerClass
      */
-    public String getLdapServerExtendedOpHandlerClass()
+    public String getExtendedOpHandlerClass()
     {
-        return ldapServerExtendedOpHandlerClass;
+        return extendedOpHandlerClass;
     }
 
     
     /**
-     * @param ldapServerExtendedOpHandlerClass the ldapServerExtendedOpHandlerClass to set
+     * @param extendedOpHandlerClass the ExtendedOpHandlerClass to set
      */
-    public void setLdapServerExtendedOpHandlerClass( String ldapServerExtendedOpHandlerClass
)
+    public void setExtendedOpHandlerClass( String extendedOpHandlerClass )
     {
-        this.ldapServerExtendedOpHandlerClass = ldapServerExtendedOpHandlerClass;
+        this.extendedOpHandlerClass = extendedOpHandlerClass;
     }
 }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpServerBean.java
Mon Oct 18 23:49:56 2010
@@ -20,19 +20,14 @@
 package org.apache.directory.server.config.beans;
 
 
+
 /**
  * A class used to store the HttpServer configuration.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class HttpServerBean extends AdsServerBean
+public class HttpServerBean extends ServerBean
 {
-    /** The server identifier */
-    private String serverId;
-    
-    /** The port */
-    private int systemPort;
-    
     /** The configuration file */
     private String httpConfFile;
 
@@ -49,42 +44,6 @@ public class HttpServerBean extends AdsS
 
     
     /**
-     * @return the serverId
-     */
-    public String getServerId()
-    {
-        return serverId;
-    }
-
-    
-    /**
-     * @param serverId the serverId to set
-     */
-    public void setServerId( String serverId )
-    {
-        this.serverId = serverId;
-    }
-
-    
-    /**
-     * @return the systemPort
-     */
-    public int getSystemPort()
-    {
-        return systemPort;
-    }
-
-    
-    /**
-     * @param systemPort the systemPort to set
-     */
-    public void setSystemPort( int systemPort )
-    {
-        this.systemPort = systemPort;
-    }
-
-    
-    /**
      * @return the httpConfFile
      */
     public String getHttpConfFile()

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/HttpWebAppBean.java
Mon Oct 18 23:49:56 2010
@@ -25,7 +25,7 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class HttpWebAppBean extends BaseAdsBean
+public class HttpWebAppBean extends AdsBaseBean
 {
     /** The server identifier */
     private String id;

Copied: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java
(from r1023445, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsIndexBean.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java?p2=directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java&p1=directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsIndexBean.java&r1=1023445&r2=1024065&rev=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsIndexBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/IndexBean.java
Mon Oct 18 23:49:56 2010
@@ -24,7 +24,7 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class AdsIndexBean extends BaseAdsBean
+public abstract class IndexBean extends AdsBaseBean
 {
     /** The index unique identifier */
     private String indexAttributeId;
@@ -32,7 +32,7 @@ public abstract class AdsIndexBean exten
     /**
      * Create a new IndexBean instance
      */
-    protected AdsIndexBean()
+    protected IndexBean()
     {
     }
 

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmIndexBean.java
Mon Oct 18 23:49:56 2010
@@ -25,7 +25,7 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class JdbmIndexBean<K, E> extends AdsIndexBean
+public class JdbmIndexBean<K, E> extends IndexBean
 {
     /** The default cache size */
     private static final int DEFAULT_INDEX_CACHE_SIZE = 100;

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JdbmPartitionBean.java
Mon Oct 18 23:49:56 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
 public class JdbmPartitionBean extends PartitionBean
 {
     /** The Entry cache size for this partition */
-    protected int partitionCacheSize = -1;
+    private int partitionCacheSize = -1;
 
     /** Tells if the optimizer is enabled or not */
     private boolean jdbmPartitionOptimizerEnabled = true;

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/JournalBean.java
Mon Oct 18 23:49:56 2010
@@ -24,8 +24,11 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class JournalBean extends BaseAdsBean
+public class JournalBean extends AdsBaseBean
 {
+    /** The journal unique Id */
+    private String journalId;
+    
     /** The journal file name */
     private String journalFileName;
     
@@ -46,6 +49,24 @@ public class JournalBean extends BaseAds
         // Not enabled by default
         setEnabled( false );
     }
+
+
+    /**
+     * @return the journalId
+     */
+    public String getJournalId()
+    {
+        return journalId;
+    }
+
+
+    /**
+     * @param journalId the journalId to set
+     */
+    public void setJournalId( String journalId )
+    {
+        this.journalId = journalId;
+    }
     
     
     /**

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/KdcServerBean.java
Mon Oct 18 23:49:56 2010
@@ -30,7 +30,7 @@ import org.apache.directory.server.kerbe
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class KdcServerBean extends CatalogBasedServerBean
+public class KdcServerBean extends DSBasedServerBean
 {
     /** The default allowable clockskew */
     private static final long DEFAULT_ALLOWABLE_CLOCKSKEW = 5 * 60000;

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerBean.java
Mon Oct 18 23:49:56 2010
@@ -28,7 +28,7 @@ import java.util.Set;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class LdapServerBean extends CatalogBasedServerBean
+public class LdapServerBean extends DSBasedServerBean
 {
     /** */
     private boolean ldapServerConfidentialityRequired;
@@ -54,17 +54,14 @@ public class LdapServerBean extends Cata
     /** The certificate password */
     private String ldapServerCertificatePassword;
     
-    /** The ReplicationProvider configuration */
-    //private ReplicationProviderBean replProviderImpl;
-    
     /** tells if the replication is enabled */
     private boolean enableReplProvider; 
     
     /** The list of supported mechanisms */
-    private Set<LdapServerSaslMechanisHandlerBean> saslMechHandlers = new HashSet<LdapServerSaslMechanisHandlerBean>();
+    private Set<SaslMechanisHandlerBean> saslMechHandlers = new HashSet<SaslMechanisHandlerBean>();
     
     /** The list of supported extedned operations */
-    private Set<LdapServerExtendedOpHandlerBean> extendedOps = new HashSet<LdapServerExtendedOpHandlerBean>();
+    private Set<ExtendedOpHandlerBean> extendedOps = new HashSet<ExtendedOpHandlerBean>();
 
     /**
      * Create a new LdapServerBean instance
@@ -273,7 +270,7 @@ public class LdapServerBean extends Cata
     /**
      * @return the saslMechHandlers
      */
-    public Set<LdapServerSaslMechanisHandlerBean> getSaslMechHandlers()
+    public Set<SaslMechanisHandlerBean> getSaslMechHandlers()
     {
         return saslMechHandlers;
     }
@@ -282,7 +279,7 @@ public class LdapServerBean extends Cata
     /**
      * @param saslMechHandlers the saslMechHandlers to set
      */
-    public void setSaslMechHandlers( Set<LdapServerSaslMechanisHandlerBean> saslMechHandlers
)
+    public void setSaslMechHandlers( Set<SaslMechanisHandlerBean> saslMechHandlers
)
     {
         this.saslMechHandlers = saslMechHandlers;
     }
@@ -291,9 +288,9 @@ public class LdapServerBean extends Cata
     /**
      * @param saslMechHandlers the saslMechHandlers to add
      */
-    public void setSaslMechHandlers( LdapServerSaslMechanisHandlerBean... saslMechHandlers
)
+    public void setSaslMechHandlers( SaslMechanisHandlerBean... saslMechHandlers )
     {
-        for ( LdapServerSaslMechanisHandlerBean saslMechHandler : saslMechHandlers )
+        for ( SaslMechanisHandlerBean saslMechHandler : saslMechHandlers )
         {
             this.saslMechHandlers.add( saslMechHandler );
         }
@@ -303,7 +300,7 @@ public class LdapServerBean extends Cata
     /**
      * @return the extendedOps
      */
-    public Set<LdapServerExtendedOpHandlerBean> getExtendedOps()
+    public Set<ExtendedOpHandlerBean> getExtendedOps()
     {
         return extendedOps;
     }
@@ -312,7 +309,7 @@ public class LdapServerBean extends Cata
     /**
      * @param extendedOps the extendedOps to set
      */
-    public void setExtendedOps( Set<LdapServerExtendedOpHandlerBean> extendedOps )
+    public void setExtendedOps( Set<ExtendedOpHandlerBean> extendedOps )
     {
         this.extendedOps = extendedOps;
     }
@@ -321,9 +318,9 @@ public class LdapServerBean extends Cata
     /**
      * @param extendedOps the extendedOps to add
      */
-    public void addExtendedOps( LdapServerExtendedOpHandlerBean... extendedOps )
+    public void addExtendedOps( ExtendedOpHandlerBean... extendedOps )
     {
-        for ( LdapServerExtendedOpHandlerBean extendedOp : extendedOps )
+        for ( ExtendedOpHandlerBean extendedOp : extendedOps )
         {   
             this.extendedOps.add( extendedOp );
         }

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/NtpServerBean.java
Mon Oct 18 23:49:56 2010
@@ -25,7 +25,7 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class NtpServerBean extends AdsServerBean
+public class NtpServerBean extends ServerBean
 {
     /**
      * Create a new NtpServerBean instance

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/PartitionBean.java
Mon Oct 18 23:49:56 2010
@@ -26,7 +26,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class PartitionBean extends BaseAdsBean
+public abstract class PartitionBean extends AdsBaseBean
 {
     /** The Partition identifier */
     private String partitionId;

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ReplConsumerBean.java
Mon Oct 18 23:49:56 2010
@@ -25,7 +25,7 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ReplConsumerBean extends BaseAdsBean
+public class ReplConsumerBean extends AdsBaseBean
 {
     /** The replicaConsumer unique ID */
     private String dsReplicaId;

Copied: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechanisHandlerBean.java
(from r1023445, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerSaslMechanisHandlerBean.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechanisHandlerBean.java?p2=directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechanisHandlerBean.java&p1=directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerSaslMechanisHandlerBean.java&r1=1023445&r2=1024065&rev=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/LdapServerSaslMechanisHandlerBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/SaslMechanisHandlerBean.java
Mon Oct 18 23:49:56 2010
@@ -25,21 +25,21 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class LdapServerSaslMechanisHandlerBean extends BaseAdsBean
+public class SaslMechanisHandlerBean extends AdsBaseBean
 {
     /** The SASL mechanism handler */
-    private String ldapServerSaslMechName;
+    private String saslMechName;
     
     /** The SASL mechanism handler FQCN */
-    private String ldapServerSaslMechClassName;
+    private String saslMechClassName;
     
     /** The NTLM provider */
-    private String ldapServerNtlmMechProvider;
+    private String ntlmMechProvider;
 
     /**
      * Create a new LdapServerSaslMechanisHandlerBean instance
      */
-    public LdapServerSaslMechanisHandlerBean()
+    public SaslMechanisHandlerBean()
     {
         super();
     }
@@ -47,53 +47,53 @@ public class LdapServerSaslMechanisHandl
     /**
      * @return the ldapServerSaslMechName
      */
-    public String getLdapServerSaslMechName()
+    public String getSaslMechName()
     {
-        return ldapServerSaslMechName;
+        return saslMechName;
     }
     
 
     /**
-     * @param ldapServerSaslMechName the ldapServerSaslMechName to set
+     * @param saslMechName the SaslMechName to set
      */
-    public void setLdapServerSaslMechName( String ldapServerSaslMechName )
+    public void setSaslMechName( String saslMechName )
     {
-        this.ldapServerSaslMechName = ldapServerSaslMechName;
+        this.saslMechName = saslMechName;
     }
 
     
     /**
-     * @return the ldapServerSaslMechClassName
+     * @return the SaslMechClassName
      */
-    public String getLdapServerSaslMechClassName()
+    public String getSaslMechClassName()
     {
-        return ldapServerSaslMechClassName;
+        return saslMechClassName;
     }
 
     
     /**
-     * @param ldapServerSaslMechClassName the ldapServerSaslMechClassName to set
+     * @param SaslMechClassName the SaslMechClassName to set
      */
-    public void setLdapServerSaslMechClassName( String ldapServerSaslMechClassName )
+    public void setSaslMechClassName( String saslMechClassName )
     {
-        this.ldapServerSaslMechClassName = ldapServerSaslMechClassName;
+        this.saslMechClassName = saslMechClassName;
     }
 
     
     /**
-     * @return the ldapServerNtlmMechProvider
+     * @return the NtlmMechProvider
      */
-    public String getLdapServerNtlmMechProvider()
+    public String getNtlmMechProvider()
     {
-        return ldapServerNtlmMechProvider;
+        return ntlmMechProvider;
     }
 
     
     /**
-     * @param ldapServerNtlmMechProvider the ldapServerNtlmMechProvider to set
+     * @param NtlmMechProvider the NtlmMechProvider to set
      */
-    public void setLdapServerNtlmMechProvider( String ldapServerNtlmMechProvider )
+    public void setNtlmMechProvider( String ntlmMechProvider )
     {
-        this.ldapServerNtlmMechProvider = ldapServerNtlmMechProvider;
+        this.ntlmMechProvider = ntlmMechProvider;
     }
 }

Copied: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java
(from r1023445, directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsServerBean.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java?p2=directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java&p1=directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsServerBean.java&r1=1023445&r2=1024065&rev=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/AdsServerBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/ServerBean.java
Mon Oct 18 23:49:56 2010
@@ -27,7 +27,7 @@ import java.util.Set;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public abstract class AdsServerBean extends BaseAdsBean
+public abstract class ServerBean extends AdsBaseBean
 {
     /** The server unique identifier */
     private String serverId;
@@ -38,7 +38,7 @@ public abstract class AdsServerBean exte
     /**
      * Create a new ServerBean instance
      */
-    protected AdsServerBean()
+    protected ServerBean()
     {
     }
     

Modified: directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java?rev=1024065&r1=1024064&r2=1024065&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
(original)
+++ directory/apacheds/branches/apacheds-config/server-config/src/main/java/org/apache/directory/server/config/beans/TransportBean.java
Mon Oct 18 23:49:56 2010
@@ -24,13 +24,13 @@ package org.apache.directory.server.conf
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class TransportBean extends BaseAdsBean
+public class TransportBean extends AdsBaseBean
 {
     /** The default backlog queue size */
-    protected static final int DEFAULT_BACKLOG_NB = 50;
+    private static final int DEFAULT_BACKLOG_NB = 50;
     
     /** The default number of threads */
-    protected static final int DEFAULT_NB_THREADS = 3;
+    private static final int DEFAULT_NB_THREADS = 3;
 
     /** The unique identifier for this transport */
     private String transportId;
@@ -41,7 +41,6 @@ public class TransportBean extends BaseA
     /** The port number */
     private int systemPort = -1;
     
-
     /** A flag set if SSL is enabled */
     private boolean transportEnableSSL = false;
     
@@ -51,7 +50,6 @@ public class TransportBean extends BaseA
     /** The backlog for the transport services */
     private int transportBacklog = DEFAULT_BACKLOG_NB;
     
-
     /**
      * Create a new TransportBean instance
      */



Mime
View raw message