Changeset 30374

Show
Ignore:
Timestamp:
02/20/08 17:31:28 (9 months ago)
Author:
gracinet
Message:

NXP-2098: moved MemoryDirectory? to the directory-core

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-directory-core/src/main/java/org/nuxeo/ecm/directory/memory/MemoryDirectory.java

    r29556 r30374  
    1818 */ 
    1919 
    20 package org.nuxeo.ecm.directory.multi; 
     20package org.nuxeo.ecm.directory.memory; 
    2121 
    2222import java.util.Map; 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-directory-core/src/main/java/org/nuxeo/ecm/directory/memory/MemoryDirectoryFactory.java

    r29587 r30374  
    1818 */ 
    1919 
    20 package org.nuxeo.ecm.directory.multi; 
     20package org.nuxeo.ecm.directory.memory; 
    2121 
    2222import java.util.ArrayList; 
    …… 
    2626 
    2727import org.nuxeo.ecm.directory.Directory; 
     28import org.nuxeo.ecm.directory.DirectoryException; 
    2829import org.nuxeo.ecm.directory.DirectoryFactory; 
    2930import org.nuxeo.ecm.directory.api.DirectoryService; 
     31import org.nuxeo.runtime.api.Framework; 
    3032 
    3133/** 
    …… 
    3941    private final DirectoryService directoryService; 
    4042 
    41     protected MemoryDirectoryFactory() { 
     43    public MemoryDirectoryFactory() throws DirectoryException { 
    4244        directories = new HashMap<String, MemoryDirectory>(); 
    43 //        directoryService=(DirectoryService) Framework.getRuntime().getComponent(DirectoryService.NAME); 
    44         directoryService=MultiDirectoryFactory.getDirectoryService(); 
     45        // GR now NXRuntime provides the local one by default 
     46        try { 
     47        directoryService=(DirectoryService) Framework.getService(DirectoryService.class); 
     48        } catch (Exception e) { 
     49            throw new DirectoryException("Error in Directory Service lookup"); 
     50        } 
     51//        directoryService=MultiDirectoryFactory.getDirectoryService(); 
    4552    } 
    4653 
    …… 
    4956    } 
    5057 
    51     protected void registerDirectory(MemoryDirectory directory) { 
     58    public void registerDirectory(MemoryDirectory directory) { 
    5259        String directoryName = directory.getName(); 
    5360        directories.put(directoryName, directory); 
    …… 
    5562    } 
    5663 
    57     protected void unregisterDirectory(MemoryDirectory directory) { 
     64    public void unregisterDirectory(MemoryDirectory directory) { 
    5865        String directoryName = directory.getName(); 
    5966        directoryService.unregisterDirectory(directoryName, this); 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-directory-core/src/main/java/org/nuxeo/ecm/directory/memory/MemoryDirectorySession.java

    r28482 r30374  
    1818 */ 
    1919 
    20 package org.nuxeo.ecm.directory.multi; 
     20package org.nuxeo.ecm.directory.memory; 
    2121 
    2222import java.util.ArrayList; 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-directory-core/src/test/java/org/nuxeo/ecm/directory/memory/TestMemoryDirectory.java

    r29587 r30374  
    1818 */ 
    1919 
    20 package org.nuxeo.ecm.directory.multi; 
     20package org.nuxeo.ecm.directory.memory; 
    2121 
    2222import java.util.ArrayList; 
    …… 
    6363        super.setUp(); 
    6464 
    65         deployBundle("nuxeo-core-schema"); 
    66  
     65        deployBundle("org.nuxeo.ecm.core.schema"); 
     66 
     67        // XXX GR fair enough, but why not using an xsd file? 
    6768        SchemaImpl sch = new SchemaImpl(SCHEMA_NAME); 
    6869        sch.addField(QName.valueOf("i"), new TypeRef<Type>(SchemaNames.BUILTIN, StringType.ID)); 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-directory-multi/src/test/java/org/nuxeo/ecm/directory/multi/TestMultiDirectory.java

    r29587 r30374  
    3333import org.nuxeo.ecm.directory.Session; 
    3434import org.nuxeo.ecm.directory.api.DirectoryService; 
     35import org.nuxeo.ecm.directory.memory.MemoryDirectory; 
     36import org.nuxeo.ecm.directory.memory.MemoryDirectoryFactory; 
    3537import org.nuxeo.runtime.api.Framework; 
    3638import org.nuxeo.runtime.test.NXRuntimeTestCase;