directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gokt...@apache.org
Subject svn commit: r1188706 - in /directory/apacheds/branches/apacheds-osgi: service-osgi/src/main/java/org/apache/directory/server/ service/src/main/java/org/apache/directory/server/ xdbm-partition/src/main/java/org/apache/directory/server/xdbm/
Date Tue, 25 Oct 2011 15:21:07 GMT
Author: gokturk
Date: Tue Oct 25 15:21:07 2011
New Revision: 1188706

URL: http://svn.apache.org/viewvc?rev=1188706&view=rev
Log:
Minor modifications, and bugfixes.

Modified:
    directory/apacheds/branches/apacheds-osgi/service-osgi/src/main/java/org/apache/directory/server/ApacheDsService.java
    directory/apacheds/branches/apacheds-osgi/service/src/main/java/org/apache/directory/server/ApacheDsService.java
    directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java

Modified: directory/apacheds/branches/apacheds-osgi/service-osgi/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service-osgi/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1188706&r1=1188705&r2=1188706&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service-osgi/src/main/java/org/apache/directory/server/ApacheDsService.java
(original)
+++ directory/apacheds/branches/apacheds-osgi/service-osgi/src/main/java/org/apache/directory/server/ApacheDsService.java
Tue Oct 25 15:21:07 2011
@@ -75,7 +75,6 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
-import org.apache.directory.shared.ldap.schemamanager.impl.OSGISchemaManager;
 import org.apache.directory.shared.util.DateUtils;
 import org.apache.directory.shared.util.exception.Exceptions;
 import org.slf4j.Logger;
@@ -154,7 +153,7 @@ public class ApacheDsService
             LOG.info( "partition directory doesn't exist, creating {}", partitionsDir.getAbsolutePath()
);
             if ( !partitionsDir.mkdirs() )
             {
-                throw new IOException(I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, partitionsDir
) );
+                throw new IOException( I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY,
partitionsDir ) );
             }
         }
 
@@ -220,7 +219,7 @@ public class ApacheDsService
         }
 
         SchemaLoader loader = new LdifSchemaLoader( schemaPartitionDirectory );
-        schemaManager = new OSGISchemaManager( loader );
+        schemaManager = new DefaultSchemaManager( loader );
 
         // We have to load the schema now, otherwise we won't be able
         // to initialize the Partitions, as we won't be able to parse 

Modified: directory/apacheds/branches/apacheds-osgi/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1188706&r1=1188705&r2=1188706&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/service/src/main/java/org/apache/directory/server/ApacheDsService.java
(original)
+++ directory/apacheds/branches/apacheds-osgi/service/src/main/java/org/apache/directory/server/ApacheDsService.java
Tue Oct 25 15:21:07 2011
@@ -101,7 +101,6 @@ public class ApacheDsService
     //    private DnsServer dnsServer;
 
     /** The Change Password server instance *
-    private ChangePasswordServer changePwdServer;/
 
     /** The Kerberos server instance */
     private KdcServer kdcServer;

Modified: directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java?rev=1188706&r1=1188705&r2=1188706&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
(original)
+++ directory/apacheds/branches/apacheds-osgi/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
Tue Oct 25 15:21:07 2011
@@ -36,13 +36,6 @@ import org.apache.felix.ipojo.annotation
 @Provides
 public class ParentIdAndRdnComparator<ID extends Comparable<ID>> extends SerializableComparator<ParentIdAndRdn<ID>>
 {
-    /**
-     * Property to specify factory type.
-     * TODO:This is temporary. Will be vanished after introducing custom annotations
-     */
-    @Property(name = "ads.comp.type", value = "comparator")
-    public String compType;
-
     /** The serial version UID */
     private static final long serialVersionUID = 2L;
 



Mime
View raw message