directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r586992 - in /directory/apacheds/branches/bigbang: ./ constants/ core-constants/ core-entry/ core-entry/src/ core-entry/src/main/ core-entry/src/main/java/ core-entry/src/main/java/org/ core-entry/src/main/java/org/apache/ core-entry/src/ma...
Date Mon, 22 Oct 2007 04:33:14 GMT
Author: akarasulu
Date: Sun Oct 21 21:33:05 2007
New Revision: 586992

URL: http://svn.apache.org/viewvc?rev=586992&view=rev
Log:
moved constants to core constants and started work on entries for the server

Added:
    directory/apacheds/branches/bigbang/core-constants/
      - copied from r586990, directory/apacheds/branches/bigbang/constants/
    directory/apacheds/branches/bigbang/core-entry/   (with props)
    directory/apacheds/branches/bigbang/core-entry/pom.xml
    directory/apacheds/branches/bigbang/core-entry/src/
    directory/apacheds/branches/bigbang/core-entry/src/main/
    directory/apacheds/branches/bigbang/core-entry/src/main/java/
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/
    directory/apacheds/branches/bigbang/core-entry/src/main/java/org/apache/directory/server/core/entry/
    directory/apacheds/branches/bigbang/core-entry/src/test/
    directory/apacheds/branches/bigbang/core-entry/src/test/java/
    directory/apacheds/branches/bigbang/core-entry/src/test/java/org/
    directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/
    directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/
    directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/
    directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/
    directory/apacheds/branches/bigbang/core-entry/src/test/java/org/apache/directory/server/core/entry/
    directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DirectoryBackedService.java
  (contents, props changed)
      - copied, changed from r584949, directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java
Removed:
    directory/apacheds/branches/bigbang/constants/
    directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java
Modified:
    directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/JndiPrincipalStoreImpl.java
    directory/apacheds/branches/bigbang/pom.xml
    directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
    directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
    directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
    directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
    directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java
    directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractProtocolService.java

Propchange: directory/apacheds/branches/bigbang/core-entry/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 21 21:33:05 2007
@@ -0,0 +1,16 @@
+target
+.clover
+.wtpmodules
+.settings
+.deployables
+apache.org
+.metadata
+*.md5
+*.log
+*.iml
+*.ipr
+*.iws
+.project
+.classpath
+nbproject
+schema

Added: directory/apacheds/branches/bigbang/core-entry/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-entry/pom.xml?rev=586992&view=auto
==============================================================================
--- directory/apacheds/branches/bigbang/core-entry/pom.xml (added)
+++ directory/apacheds/branches/bigbang/core-entry/pom.xml Sun Oct 21 21:33:05 2007
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+<!-- $Rev:  $ $Date:  $ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.server</groupId>
+    <artifactId>apacheds-parent</artifactId>
+    <version>1.5.2-SNAPSHOT</version>
+  </parent>
+  <artifactId>apacheds-core-entry</artifactId>
+  <name>ApacheDS Core Entry</name>
+
+  <description>
+    Server side LDAP entry classes.
+  </description>
+
+  <packaging>jar</packaging>
+</project>
+

Modified: directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/JndiPrincipalStoreImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/JndiPrincipalStoreImpl.java?rev=586992&r1=586991&r2=586992&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/JndiPrincipalStoreImpl.java
(original)
+++ directory/apacheds/branches/bigbang/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/JndiPrincipalStoreImpl.java
Sun Oct 21 21:33:05 2007
@@ -23,8 +23,6 @@
 import org.apache.directory.server.core.DirectoryService;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
-import org.apache.directory.server.protocol.shared.ServiceConfiguration;
-
 
 /**
  * A JNDI-backed implementation of the PrincipalStore interface.  This PrincipalStore uses

Modified: directory/apacheds/branches/bigbang/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/pom.xml?rev=586992&r1=586991&r2=586992&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/pom.xml (original)
+++ directory/apacheds/branches/bigbang/pom.xml Sun Oct 21 21:33:05 2007
@@ -320,12 +320,13 @@
     <module>utils</module>
     <module>schema-registries</module>
     <module>jdbm-store</module>
-    <module>constants</module>
     <module>btree-base</module>
     <module>core</module>
+    <module>core-constants</module>
     <module>core-shared</module>
     <module>core-plugin</module>
     <module>core-unit</module>
+    <module>core-entry</module>
     <module>protocol-shared</module>
     <module>protocol-ntp</module>
     <module>protocol-ldap</module>

Modified: directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java?rev=586992&r1=586991&r2=586992&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-changepw/src/main/java/org/apache/directory/server/changepw/ChangePasswordServer.java
Sun Oct 21 21:33:05 2007
@@ -31,7 +31,7 @@
 import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
 import org.apache.directory.server.kerberos.shared.store.JndiPrincipalStoreImpl;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
-import org.apache.directory.server.protocol.shared.ServiceConfiguration;
+import org.apache.directory.server.protocol.shared.DirectoryBackedService;
 import org.apache.mina.transport.socket.nio.DatagramAcceptorConfig;
 import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
 
@@ -44,7 +44,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class ChangePasswordServer extends ServiceConfiguration
+public class ChangePasswordServer extends DirectoryBackedService
 {
     @SuppressWarnings ( { "UnusedDeclaration" } )
     private static final long serialVersionUID = 3509208713288140629L;

Modified: directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java?rev=586992&r1=586991&r2=586992&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-dns/src/main/java/org/apache/directory/server/dns/DnsServer.java
Sun Oct 21 21:33:05 2007
@@ -26,7 +26,7 @@
 import org.apache.directory.server.dns.protocol.DnsProtocolHandler;
 import org.apache.directory.server.dns.store.RecordStore;
 import org.apache.directory.server.dns.store.jndi.JndiRecordStoreImpl;
-import org.apache.directory.server.protocol.shared.ServiceConfiguration;
+import org.apache.directory.server.protocol.shared.DirectoryBackedService;
 import org.apache.mina.transport.socket.nio.DatagramAcceptorConfig;
 import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
 
@@ -39,7 +39,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class DnsServer extends ServiceConfiguration
+public class DnsServer extends DirectoryBackedService
 {
     @SuppressWarnings ( { "UnusedDeclaration" } )
     private static final long serialVersionUID = 6943138644427163149L;

Modified: directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java?rev=586992&r1=586991&r2=586992&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcServer.java
Sun Oct 21 21:33:05 2007
@@ -31,7 +31,7 @@
 import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
 import org.apache.directory.server.kerberos.shared.store.JndiPrincipalStoreImpl;
 import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
-import org.apache.directory.server.protocol.shared.ServiceConfiguration;
+import org.apache.directory.server.protocol.shared.DirectoryBackedService;
 import org.apache.mina.transport.socket.nio.DatagramAcceptorConfig;
 import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
 
@@ -44,7 +44,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class KdcServer extends ServiceConfiguration
+public class KdcServer extends DirectoryBackedService
 {
     @SuppressWarnings ( { "UnusedDeclaration" } )
     private static final long serialVersionUID = 522567370475574165L;

Modified: directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java?rev=586992&r1=586991&r2=586992&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
Sun Oct 21 21:33:05 2007
@@ -59,7 +59,7 @@
 import org.apache.directory.server.ldap.support.SearchHandler;
 import org.apache.directory.server.ldap.support.UnbindHandler;
 import org.apache.directory.server.ldap.support.ssl.LdapsInitializer;
-import org.apache.directory.server.protocol.shared.ServiceConfiguration;
+import org.apache.directory.server.protocol.shared.DirectoryBackedService;
 import org.apache.directory.server.protocol.shared.ServiceConfigurationException;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.asn1.codec.Asn1CodecDecoder;
@@ -122,7 +122,7 @@
  * @version $Rev$
  * @org.apache.xbean.XBean
  */
-public class LdapServer extends ServiceConfiguration
+public class LdapServer extends DirectoryBackedService
 {
     private static final long serialVersionUID = 3757127143811666817L;
 

Modified: directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java?rev=586992&r1=586991&r2=586992&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-ntp/src/main/java/org/apache/directory/server/ntp/NtpServer.java
Sun Oct 21 21:33:05 2007
@@ -24,7 +24,7 @@
 import java.net.InetSocketAddress;
 
 import org.apache.directory.server.ntp.protocol.NtpProtocolHandler;
-import org.apache.directory.server.protocol.shared.ServiceConfiguration;
+import org.apache.directory.server.protocol.shared.DirectoryBackedService;
 import org.apache.mina.transport.socket.nio.DatagramAcceptorConfig;
 import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
 
@@ -36,7 +36,7 @@
  * @version $Rev$, $Date$
  * @org.apache.xbean.XBean
  */
-public class NtpServer extends ServiceConfiguration
+public class NtpServer extends DirectoryBackedService
 {
     private static final long serialVersionUID = 2961795205765175775L;
 

Modified: directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractProtocolService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractProtocolService.java?rev=586992&r1=586991&r2=586992&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractProtocolService.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractProtocolService.java
Sun Oct 21 21:33:05 2007
@@ -42,9 +42,22 @@
     private String ipAddress;
     private int ipPort = -1;
     private Set<TransportProtocol> transportProtocols;
-    private DirectoryService directoryService;
     private DatagramAcceptor datagramAcceptor;
     private SocketAcceptor socketAcceptor;
+    /** directory service core where protocol data is backed */
+    private DirectoryService directoryService;
+
+
+    public DirectoryService getDirectoryService()
+    {
+        return directoryService;
+    }
+
+
+    public void setDirectoryService( DirectoryService directoryService )
+    {
+        this.directoryService = directoryService;
+    }
 
 
     public boolean isStarted()
@@ -135,18 +148,6 @@
         Set<TransportProtocol> copy = new HashSet<TransportProtocol>( transportProtocols.size()
);
         copy.addAll( transportProtocols );
         this.transportProtocols = Collections.unmodifiableSet( copy );
-    }
-
-
-    public DirectoryService getDirectoryService()
-    {
-        return directoryService;
-    }
-
-
-    public void setDirectoryService( DirectoryService directoryService )
-    {
-        this.directoryService = directoryService;
     }
 
 

Copied: directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DirectoryBackedService.java
(from r584949, directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DirectoryBackedService.java?p2=directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DirectoryBackedService.java&p1=directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java&r1=584949&r2=586992&rev=586992&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DirectoryBackedService.java
Sun Oct 21 21:33:05 2007
@@ -26,14 +26,18 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public abstract class ServiceConfiguration extends AbstractProtocolService
+public abstract class DirectoryBackedService extends AbstractProtocolService
 {
     /**
-     * The single location where entries are stored.  If this
-     * property is not set the store will search the system
-     * partition configuration for catalog entries.
+     * The single location where entries are stored.  If this service
+     * is catalog based the store will search the system partition
+     * configuration for catalog entries.  Otherwise it will use this
+     * search base as a single point of searching the DIT.
      */
     private String searchBaseDn = "ou=users,dc=example,dc=com";
+    /** determines if the search base is pointer to a catelog or a single entry point */
+    private boolean catelogBased;
+
 
     /**
      * Returns the search base DN.
@@ -52,5 +56,29 @@
     public void setSearchBaseDn( String searchBaseDn )
     {
         this.searchBaseDn = searchBaseDn;
+    }
+
+
+    /**
+     * Gets true if this service uses a catelog for searching different
+     * regions of the DIT for its data.
+     *
+     * @return true if the search base dn is for a catelog, false otherwise
+     */
+    public boolean isCatelogBased()
+    {
+        return catelogBased;
+    }
+
+
+    /**
+     * Set true if this service uses a catelog for searching different
+     * regions of the DIT for its data.
+     *
+     * @param  catelogBased if the search base dn is for a catelog, false otherwise
+     */
+    public void setCatelogBased( boolean catelogBased )
+    {
+        this.catelogBased = catelogBased;
     }
 }

Propchange: directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DirectoryBackedService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/apacheds/branches/bigbang/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/DirectoryBackedService.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Oct 21 21:33:05 2007
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id



Mime
View raw message