Changeset 29634

Show
Ignore:
Timestamp:
01/25/08 17:10:47 (10 months ago)
Author:
stan
Message:

NXP-2006 Merging notification modification from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • org.nuxeo.ecm.core/branches/1.4/nuxeo-core/src/main/java/org/nuxeo/ecm/core/api/AbstractSession.java

    r29626 r29634  
    493493            Map<String, Object> options = new HashMap<String, Object>(); 
    494494            options.put(CoreEventConstants.DOCUMENT, doc); 
     495            options.put(CoreEventConstants.PARENT_PATH, srcDocModel.getParentRef()); 
    495496            notifyEvent(DocumentEventTypes.DOCUMENT_MOVED, docModel, options, 
    496497                    null, comment, true); 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-events-api/src/main/java/org/nuxeo/ecm/platform/events/api/RepositoryChangeEvent.java

    r28498 r29634  
    3333    int PERMISSIONS = 4; 
    3434    int LOCK = 5; 
     35    int LIFECYCLE = 6; 
     36    int MOVED = 7; 
    3537 
    3638    int getType(); 

  • org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-events-core/src/main/java/org/nuxeo/ecm/platform/events/EventFactory.java

    r28510 r29634  
    2020package org.nuxeo.ecm.platform.events; 
    2121 
     22import java.util.Map; 
     23 
    2224import org.nuxeo.ecm.core.api.DocumentModel; 
    2325import org.nuxeo.ecm.core.api.DocumentRef; 
    …… 
    2527import org.nuxeo.ecm.core.api.event.CoreEventConstants; 
    2628import org.nuxeo.ecm.core.api.event.DocumentEventTypes; 
     29import org.nuxeo.ecm.core.lifecycle.LifeCycleEventTypes; 
    2730import org.nuxeo.ecm.platform.events.api.NXCoreEvent; 
    2831import org.nuxeo.ecm.platform.events.api.RepositoryChangeEvent; 
    2932import org.nuxeo.ecm.platform.events.api.impl.RepositoryChangeEventImpl; 
    30  
    31 import java.io.Serializable; 
    32 import java.util.Map; 
    3333 
    3434/** 
    …… 
    5151        int type = 0; 
    5252        DocumentRef targetRef = docModel.getRef(); 
    53         Serializable details = null; 
     53        Map info = coreEvent.getInfo(); 
     54 
     55        // TODO: should be Serializable 
     56        Object details = null; 
    5457 
    5558        if (DocumentEventTypes.DOCUMENT_UPDATED.equals(eventId)) { 
    …… 
    6871            type = RepositoryChangeEvent.REMOVED; 
    6972            details = docModel.getParentRef(); 
     73        } else if (DocumentEventTypes.DOCUMENT_MOVED.equals(eventId)) { 
     74            type = RepositoryChangeEvent.MOVED; 
     75            details = (DocumentRef) info.get(CoreEventConstants.PARENT_PATH); 
     76        } else if (LifeCycleEventTypes.LIFECYCLE_TRANSITION_EVENT.equals(eventId)) { 
     77            type = RepositoryChangeEvent.LIFECYCLE; 
     78            details = coreEvent.getInfo().get(LifeCycleEventTypes.OPTION_NAME_TRANSITION); 
    7079        } 
    71         /* TODO: DOCUMENT_MOVED, DOCUMENT_PUBLISHED */ 
     80        /* TODO: DOCUMENT_PUBLISHED */ 
    7281        if (type == 0) { 
    7382            return null; 
    7483        } 
    7584 
    76         Map info = coreEvent.getInfo(); 
    7785        String sessionId = (String) info.get(CoreEventConstants.SESSION_ID); 
    7886        String repositoryName = (String) info.get(CoreEventConstants.REPOSITORY_NAME);