Projects >> nuxeo-features >>34b6bff8608a07787b4d685600a0d5f72f3e8444

Chunk
Conflicting content 
    protected static final ContainerManagedHibernateConfiguration hibernateConfiguration = new ContainerManagedHibernateConfiguration();

<<<<<<< HEAD
    public static final PersistenceProvider persistenceProvider = new PersistenceProvider(
            hibernateConfiguration);
=======
    public static final PersistenceProvider persistenceProvider = new PersistenceProvider();
>>>>>>> 82e091ab8ad104885e67936d3db2be979417b703

    private static final ExpressionEvaluator expressionEvaluator = new ExpressionEvaluator(
            new ExpressionFactoryImpl());
Solution content 
    protected static final ContainerManagedHibernateConfiguration hibernateConfiguration = new ContainerManagedHibernateConfiguration();

    public static final PersistenceProvider persistenceProvider = new PersistenceProvider(
            hibernateConfiguration);

    private static final ExpressionEvaluator expressionEvaluator = new ExpressionEvaluator(
            new ExpressionFactoryImpl());
File
NXAuditEventsService.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        entry.setCategory(message.getCategory());
        entry.setDocLifeCycle(message.getDocCurrentLifeCycle());

<<<<<<< HEAD
        doPutExtendedInfos(entry, message, source, principal);
        return entry;

    }

    protected LogEntry doCreateAndFillEntryFromEvent(CoreEvent event)
            throws AuditException {
        NuxeoPrincipal principal = guardedPrincipal(event);
        DocumentModel document = (DocumentModel) event.getSource();
        LogEntry entry = new LogEntry();
        entry.setEventId(event.getEventId());
        entry.setEventDate(event.getDate());
        entry.setDocUUID(document.getId());
        entry.setDocPath(document.getPathAsString());
        entry.setDocType(document.getType());
        entry.setPrincipalName(principal.getName());
        try {
            if (document.isLifeCycleLoaded())
                entry.setDocLifeCycle(document.getCurrentLifeCycleState());
        } catch (ClientException e1) {
            throw new AuditRuntimeException(
                    "Cannot fetch life cycle state from " + document, e1);
=======
        if (source != null) {
            Calendar creationDate = null;
            try {
                creationDate = (Calendar) source.getProperty("dublincore",
                        "created");
            } catch (ClientException e) {
            }
            if (creationDate != null) {
                entry.setEventDate(creationDate.getTime());
            }
>>>>>>> 82e091ab8ad104885e67936d3db2be979417b703
        }
        entry.setCategory("eventDocumentCategory");
Solution content 
        entry.setDocUUID(document.getId());
        entry.setDocPath(document.getPathAsString());
        entry.setDocType(document.getType());
        entry.setPrincipalName(principal.getName());
        try {
        entry.setCategory(message.getCategory());
        entry.setDocLifeCycle(message.getDocCurrentLifeCycle());

        doPutExtendedInfos(entry, message, source, principal);
        return entry;

    }

    protected LogEntry doCreateAndFillEntryFromEvent(CoreEvent event)
            throws AuditException {
        NuxeoPrincipal principal = guardedPrincipal(event);
        DocumentModel document = (DocumentModel) event.getSource();
        LogEntry entry = new LogEntry();
        entry.setEventId(event.getEventId());
        entry.setEventDate(event.getDate());
            if (document.isLifeCycleLoaded())
                entry.setDocLifeCycle(document.getCurrentLifeCycleState());
        } catch (ClientException e1) {
            throw new AuditRuntimeException(
                    "Cannot fetch life cycle state from " + document, e1);
        }
        entry.setCategory("eventDocumentCategory");
File
NXAuditEventsService.java
Developer's decision
Version 1
Kind of conflict
Cast expression
Catch clause
If statement
Method invocation
Method signature
Return statement
Throw statement
Try statement
Variable
Chunk
Conflicting content 
    protected EntityManagerFactory emf;

<<<<<<< HEAD
    public PersistenceProvider(HibernateConfiguration configuration) {
        this.hibernateConfiguration = configuration;
=======
    public PersistenceProvider() {
>>>>>>> 82e091ab8ad104885e67936d3db2be979417b703
    }

    protected HibernateConfiguration hibernateConfiguration;
Solution content 
    protected EntityManagerFactory emf;

    public PersistenceProvider(HibernateConfiguration configuration) {
        this.hibernateConfiguration = configuration;
    }

    protected HibernateConfiguration hibernateConfiguration;
File
PersistenceProvider.java
Developer's decision
Version 1
Kind of conflict
Method signature
Variable