Projects >> rodl >>5eb609c596ac9d40ac579342a9131cfbb92e7703

Chunk
Conflicting content 
import org.joda.time.DateTime;
import org.openrdf.rio.RDFFormat;

<<<<<<< HEAD
import pl.psnc.dl.wf4ever.ApplicationProperties;
import pl.psnc.dl.wf4ever.db.ResearchObjectId;
import pl.psnc.dl.wf4ever.db.dao.AtomFeedEntryDAO;
=======
import pl.psnc.dl.wf4ever.connection.DigitalLibraryFactory;
import pl.psnc.dl.wf4ever.db.ResearchObjectId;
>>>>>>> 21c1f3376a0c2f969102a9f012e503de1f3e1544
import pl.psnc.dl.wf4ever.db.dao.ResearchObjectIdDAO;
import pl.psnc.dl.wf4ever.dl.ConflictException;
import pl.psnc.dl.wf4ever.dl.NotFoundException;
Solution content 
import org.joda.time.DateTime;
import org.openrdf.rio.RDFFormat;

import pl.psnc.dl.wf4ever.ApplicationProperties;
import pl.psnc.dl.wf4ever.db.ResearchObjectId;
import pl.psnc.dl.wf4ever.db.dao.AtomFeedEntryDAO;
import pl.psnc.dl.wf4ever.db.dao.ResearchObjectIdDAO;
import pl.psnc.dl.wf4ever.dl.ConflictException;
import pl.psnc.dl.wf4ever.dl.NotFoundException;
File
ResearchObject.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.junit.Before;
import org.junit.BeforeClass;

<<<<<<< HEAD
=======
import pl.psnc.dl.wf4ever.connection.DigitalLibraryFactory;
>>>>>>> 21c1f3376a0c2f969102a9f012e503de1f3e1544
import pl.psnc.dl.wf4ever.db.dao.ResearchObjectIdDAO;
import pl.psnc.dl.wf4ever.db.hibernate.HibernateUtil;
import pl.psnc.dl.wf4ever.dl.UserMetadata;
Solution content 
import org.junit.Before;
import org.junit.BeforeClass;

import pl.psnc.dl.wf4ever.db.dao.ResearchObjectIdDAO;
import pl.psnc.dl.wf4ever.db.hibernate.HibernateUtil;
import pl.psnc.dl.wf4ever.dl.UserMetadata;
File
BaseTest.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        model = FileManager.get().loadModel(MANIFEST_2, MANIFEST_2, "RDF/XML");
        dataset.addNamedModel(MANIFEST_2, model);
        researchObject2 = builder.buildResearchObject(URI.create(RESEARCH_OBJECT_2));
<<<<<<< HEAD
        HibernateUtil.getSessionFactory().getCurrentSession().getTransaction().begin();
=======
        HibernateUtil.getSessionFactory().getCurrentSession().beginTransaction();
>>>>>>> 21c1f3376a0c2f969102a9f012e503de1f3e1544
    }
Solution content 
        model = FileManager.get().loadModel(MANIFEST_2, MANIFEST_2, "RDF/XML");
        dataset.addNamedModel(MANIFEST_2, model);
        researchObject2 = builder.buildResearchObject(URI.create(RESEARCH_OBJECT_2));
        HibernateUtil.getSessionFactory().getCurrentSession().getTransaction().begin();

    }
File
BaseTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation