directory-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alex Karasulu <akaras...@apache.org>
Subject Re: svn commit: r1150064 - in /directory/apacheds/trunk: core/src/main/java/org/apache/directory/server/core/changelog/ core/src/main/java/org/apache/directory/server/core/exception/ core/src/main/java/org/apache/directory/server/core/schema/ service
Date Sat, 23 Jul 2011 10:29:37 GMT
Quick question... Still not back from vacation but did we remove the
SchemaService interface?

Thanks,
Alex

On Sat, Jul 23, 2011 at 11:33 AM,  <elecharny@apache.org> wrote:
> Author: elecharny
> Date: Sat Jul 23 08:33:33 2011
> New Revision: 1150064
>
> URL: http://svn.apache.org/viewvc?rev=1150064&view=rev
> Log:
> Renamed the DefaultSchemaSrvice class to SchemaService
>
> Added:
>    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
>      - copied, changed from r1149683, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
> Removed:
>    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
> Modified:
>    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
>    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
>    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
>    directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
>
> Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
> URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=1150064&r1=1150063&r2=1150064&view=diff
> ==============================================================================
> --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
(original)
> +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
Sat Jul 23 08:33:33 2011
> @@ -38,7 +38,7 @@ import org.apache.directory.server.core.
>  import org.apache.directory.server.core.interceptor.context.OperationContext;
>  import org.apache.directory.server.core.interceptor.context.RenameOperationContext;
>  import org.apache.directory.server.core.partition.ByPassConstants;
> -import org.apache.directory.server.core.schema.DefaultSchemaService;
> +import org.apache.directory.server.core.schema.SchemaService;
>  import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
>  import org.apache.directory.shared.ldap.model.entry.Attribute;
>  import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
> @@ -196,7 +196,7 @@ public class ChangeLogInterceptor extend
>         // @todo make sure we're not putting in operational attributes that cannot
be user modified
>         if ( dn.equals( ServerDNConstants.CN_SCHEMA_DN ) )
>         {
> -            return DefaultSchemaService.getSubschemaEntryCloned( directoryService
);
> +            return SchemaService.getSubschemaEntryCloned( directoryService );
>         }
>         else
>         {
>
> Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
> URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=1150064&r1=1150063&r2=1150064&view=diff
> ==============================================================================
> --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
(original)
> +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
Sat Jul 23 08:33:33 2011
> @@ -40,7 +40,7 @@ import org.apache.directory.server.core.
>  import org.apache.directory.server.core.partition.ByPassConstants;
>  import org.apache.directory.server.core.partition.Partition;
>  import org.apache.directory.server.core.partition.PartitionNexus;
> -import org.apache.directory.server.core.schema.DefaultSchemaService;
> +import org.apache.directory.server.core.schema.SchemaService;
>  import org.apache.directory.server.i18n.I18n;
>  import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
>  import org.apache.directory.shared.ldap.model.cursor.EmptyCursor;
> @@ -242,7 +242,7 @@ public class ExceptionInterceptor extend
>
>         if ( dn.equals( subschemSubentryDn ) )
>         {
> -            Entry serverEntry = DefaultSchemaService.getSubschemaEntry( directoryService,
lookupContext.getAttrsIdArray() );
> +            Entry serverEntry = SchemaService.getSubschemaEntry( directoryService,
lookupContext.getAttrsIdArray() );
>             serverEntry.setDn( dn );
>
>             return serverEntry;
>
> Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
> URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1150064&r1=1150063&r2=1150064&view=diff
> ==============================================================================
> --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
(original)
> +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
Sat Jul 23 08:33:33 2011
> @@ -702,7 +702,7 @@ public class SchemaInterceptor extends B
>                         .equals( SchemaConstants.SUBSCHEMA_OC_OID ) ) &&
( node instanceof EqualityNode ) )
>                 {
>                     // call.setBypass( true );
> -                    Entry serverEntry = DefaultSchemaService.getSubschemaEntry(
directoryService, searchCtls.getReturningAttributes() );
> +                    Entry serverEntry = SchemaService.getSubschemaEntry( directoryService,
searchCtls.getReturningAttributes() );
>                     serverEntry.setDn( base );
>                     return new BaseEntryFilteringCursor( new SingletonCursor<Entry>(
serverEntry ), searchContext );
>                 }
> @@ -719,7 +719,7 @@ public class SchemaInterceptor extends B
>                 if ( node.getAttributeType().equals( OBJECT_CLASS_AT ) )
>                 {
>                     // call.setBypass( true );
> -                    Entry serverEntry = DefaultSchemaService.getSubschemaEntry(
directoryService, searchCtls.getReturningAttributes() );
> +                    Entry serverEntry = SchemaService.getSubschemaEntry( directoryService,
searchCtls.getReturningAttributes() );
>                     serverEntry.setDn( base );
>                     EntryFilteringCursor cursor = new BaseEntryFilteringCursor(
>                         new SingletonCursor<Entry>( serverEntry ),
searchContext );
>
> Copied: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
(from r1149683, directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java)
> URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?p2=directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java&p1=directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java&r1=1149683&r2=1150064&rev=1150064&view=diff
> ==============================================================================
> --- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/DefaultSchemaService.java
(original)
> +++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Sat Jul 23 08:33:33 2011
> @@ -55,7 +55,7 @@ import org.apache.directory.shared.util.
>  *
>  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
>  */
> -public class DefaultSchemaService
> +public class SchemaService
>  {
>     /** cached version of the schema subentry with all attributes in it */
>     private static Entry schemaSubentry;
>
> Modified: directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
> URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1150064&r1=1150063&r2=1150064&view=diff
> ==============================================================================
> --- directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
(original)
> +++ directory/apacheds/trunk/service/src/main/java/org/apache/directory/server/ApacheDsService.java
Sat Jul 23 08:33:33 2011
> @@ -45,7 +45,7 @@ import org.apache.directory.server.core.
>  import org.apache.directory.server.core.partition.Partition;
>  import org.apache.directory.server.core.partition.ldif.LdifPartition;
>  import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
> -import org.apache.directory.server.core.schema.DefaultSchemaService;
> +import org.apache.directory.server.core.schema.SchemaService;
>  import org.apache.directory.server.core.schema.SchemaPartition;
>  import org.apache.directory.server.i18n.I18n;
>  import org.apache.directory.server.integration.http.HttpServer;
>
>
>



-- 
Best Regards,
-- Alex

Mime
View raw message