Projects >> nuxeo-features >>50bafeb139425d03f08d8e39d7d32a551364543f

Chunk
Conflicting content 
import static org.jboss.seam.ScopeType.SESSION;
package org.nuxeo.platform.cache.web;

import java.io.Serializable;
<<<<<<< HEAD

import static org.jboss.seam.ScopeType.SESSION;
=======
>>>>>>> 2d41e6215b967e378fec550344d3bb99b0ceeb14
Solution content 
package org.nuxeo.platform.cache.web;

import java.io.Serializable;

import static org.jboss.seam.ScopeType.SESSION;
File
CacheControlActionsBean.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    @Destroy
    @PermitAll
<<<<<<< HEAD
    public void destroy() throws ClientException {
        log.debug("Destroyed the seam component...");
=======
    public void destroy() {
        //if (null != versioningManager) {
        //    versioningManager.remove();
        //}

        log.info("Destroyed the seam component...");
>>>>>>> 2d41e6215b967e378fec550344d3bb99b0ceeb14
    }

}
Solution content 
    @Destroy
    @PermitAll
    public void destroy() throws ClientException {
        log.debug("Destroyed the seam component...");
    }

}
File
DocumentVersioningBusinessDelegate.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Method signature
Chunk
Conflicting content 
    private ConversationDocumentsListsManager conversationDocumentsListsManager;

    @In(create = true)
<<<<<<< HEAD
    transient CoreSession documentManager;

    @In(create=true)
    transient Principal currentUser;
=======
    private transient CoreSession documentManager;

    @In(create=true)
    private transient Principal currentUser;
>>>>>>> 2d41e6215b967e378fec550344d3bb99b0ceeb14

    @Override
    protected void notifyListUpdated(String listName) {
Solution content 
    private ConversationDocumentsListsManager conversationDocumentsListsManager;

    @In(create = true)
    private transient CoreSession documentManager;

    @In(create=true)
    private transient Principal currentUser;

    @Override
    protected void notifyListUpdated(String listName) {
File
DocumentsListsManagerBean.java
Developer's decision
Version 2
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.HashSet;
<<<<<<< HEAD
=======
import java.util.Map;
import java.util.Set;
>>>>>>> 2d41e6215b967e378fec550344d3bb99b0ceeb14
import java.io.Serializable;

import javax.faces.application.FacesMessage;
Solution content 
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.io.Serializable;

import javax.faces.application.FacesMessage;
File
ResultsProvidersCacheBean.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
package org.nuxeo.ecm.webapp.pagination;

import java.io.Serializable;
<<<<<<< HEAD
import javax.annotation.security.PermitAll;
import javax.ejb.PostActivate;
import javax.ejb.PrePassivate;
import javax.ejb.Remove;
import javax.ejb.Stateful;
=======
>>>>>>> 2d41e6215b967e378fec550344d3bb99b0ceeb14

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Solution content 
package org.nuxeo.ecm.webapp.pagination;

import java.io.Serializable;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
File
SortActionsBean.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
@Scope(ScopeType.CONVERSATION)
@Transactional
public class SearchResultsBean extends InputController implements SearchResults, Serializable {
<<<<<<< HEAD
=======

    private static final long serialVersionUID = 7823660685121811606L;
>>>>>>> 2d41e6215b967e378fec550344d3bb99b0ceeb14

    private static final Log log = LogFactory.getLog(SearchResultsBean.class);
Solution content 
@Scope(ScopeType.CONVERSATION)
@Transactional
public class SearchResultsBean extends InputController implements SearchResults, Serializable {

    private static final long serialVersionUID = 7823660685121811606L;

    private static final Log log = LogFactory.getLog(SearchResultsBean.class);
File
SearchResultsBean.java
Developer's decision
Version 2
Kind of conflict
Attribute