You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by tr...@apache.org on 2005/06/10 09:22:29 UTC

svn commit: r189912 - in /directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration: Configuration.java ContextPartitionConfiguration.java ShutdownConfiguration.java StartupConfiguration.java SyncConfiguration.java

Author: trustin
Date: Fri Jun 10 00:22:27 2005
New Revision: 189912

URL: http://svn.apache.org/viewcvs?rev=189912&view=rev
Log:
* Added ContextPartitionConfiguration (copied from ContextPartitionConfig)
* Modified keyword substitution attribute
* Addeding some properties.. (I'm committing this to show this to others and validate my idea)

Added:
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java   (with props)
Modified:
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java   (contents, props changed)
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java   (contents, props changed)
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java   (contents, props changed)
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java   (contents, props changed)

Modified: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java?rev=189912&r1=189911&r2=189912&view=diff
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java (original)
+++ directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java Fri Jun 10 00:22:27 2005
@@ -26,7 +26,7 @@
  * to configure ApacheDS.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev: 189903 $, $Date$
+ * @version $Rev$, $Date$
  */
 public abstract class Configuration implements Cloneable, Serializable
 {

Propchange: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/Configuration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Added: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java?rev=189912&view=auto
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java (added)
+++ directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java Fri Jun 10 00:22:27 2005
@@ -0,0 +1,107 @@
+/*
+ *   @(#) $Id$
+ *
+ *   Copyright 2004 The Apache Software Foundation
+ *
+ *   Licensed 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.ldap.server.configuration;
+
+
+import javax.naming.directory.Attributes;
+
+
+/**
+ * A configuration bean for ContextPartitions.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Id$
+ */
+public class ContextPartitionConfiguration
+{
+    private String suffix;
+    private String id;
+    private String[] indices;
+    private Attributes attributes;
+    private String partitionClass;
+    private String properties;
+
+
+    public String getSuffix()
+    {
+        return suffix;
+    }
+
+
+    public void setSuffix( String suffix )
+    {
+        this.suffix = suffix;
+    }
+
+
+    public String getId()
+    {
+        return id;
+    }
+
+
+    public void setId( String id )
+    {
+        this.id = id;
+    }
+
+
+    public String[] getIndices()
+    {
+        return indices;
+    }
+
+
+    public void setIndices( String[] indices )
+    {
+        this.indices = indices;
+    }
+
+
+    public Attributes getAttributes()
+    {
+        return attributes;
+    }
+
+
+    public void setAttributes( Attributes attributes )
+    {
+        this.attributes = attributes;
+    }
+
+    public String getPartitionClass()
+    {
+        return partitionClass;
+    }
+
+    public void setPartitionClass( String partitionClass )
+    {
+        this.partitionClass = partitionClass;
+    }
+
+    public String getProperties()
+    {
+        return properties;
+    }
+
+    public void setProperties( String properties )
+    {
+        this.properties = properties;
+    }
+}

Propchange: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ContextPartitionConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java?rev=189912&r1=189911&r2=189912&view=diff
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java (original)
+++ directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java Fri Jun 10 00:22:27 2005
@@ -22,7 +22,7 @@
  * A {@link Configuration} that shuts down ApacheDS.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev: 189903 $, $Date$
+ * @version $Rev$, $Date$
  */
 public class ShutdownConfiguration extends Configuration
 {

Propchange: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/ShutdownConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java?rev=189912&r1=189911&r2=189912&view=diff
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java (original)
+++ directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java Fri Jun 10 00:22:27 2005
@@ -19,18 +19,36 @@
 package org.apache.ldap.server.configuration;
 
 import java.io.File;
+import java.util.Set;
+
+import org.apache.ldap.server.interceptor.InterceptorChain;
+import org.apache.mina.registry.ServiceRegistry;
 
 /**
  * A {@link Configuration} that starts up ApacheDS.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev: 189903 $, $Date$
+ * @version $Rev$, $Date$
  */
 public class StartupConfiguration extends Configuration
 {
     private static final long serialVersionUID = 4826762196566871677L;
 
+    protected File homeDirectory;
     protected File workingDirectory;
+    protected boolean enableAnonymousAccess;
+    protected Set authenticators; // Set<Authenticator> and their properties>?
+    protected InterceptorChain interceptors; // and their properties?
+    protected ServiceRegistry minaServiceRegistry;
+    protected int ldapPort = 389;
+    protected int ldapsPort = 636;
+    protected boolean enableKerberos;
     
+    protected Set bootstrapSchemas; // Set<BootstrapSchema>
+    protected Set contextParitions; // Set<suffix, partition, indices, attributes, and properties>?
+    protected Set testEntries; // Set<Attributes?>
     
+    protected StartupConfiguration()
+    {
+    }
 }

Propchange: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/StartupConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision

Modified: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java?rev=189912&r1=189911&r2=189912&view=diff
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java (original)
+++ directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java Fri Jun 10 00:22:27 2005
@@ -22,7 +22,7 @@
  * A {@link Configuration} that syncs ApacheDS backend storage with disk.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
- * @version $Rev: 189903 $, $Date$
+ * @version $Rev$, $Date$
  */
 public class SyncConfiguration extends Configuration
 {

Propchange: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/configuration/SyncConfiguration.java
------------------------------------------------------------------------------
    svn:keywords = HeadURL Id LastChangedBy LastChangedDate LastChangedRevision