Projects >> nuxeo-runtime >>0b2e01a6db5117dd57e13e70e4db93251ae55c3e

Chunk
Conflicting content 
    @Override
    public void start(BundleContext context) throws Exception {
<<<<<<< HEAD
        initEnvironment();
        removeH2Lock();
=======
       configureLogging();
>>>>>>> 076453df2b42d737066621a39258a270499b106b
        startWebServices(context);
        startRuntime(context);
        startContainer();
Solution content 
    @Override
    public void start(BundleContext context) throws Exception {
       configureLogging();
        initEnvironment();
        removeH2Lock();
        startWebServices(context);
        startRuntime(context);
        startContainer();
File
StartApplication.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Chunk
Conflicting content 
        ((OSGiRuntimeService) Framework.getRuntime()).fireApplicationStarted();
    }

<<<<<<< HEAD
    private void removeH2Lock() {
        String h2 = System.getProperty("h2.baseDir");
        if (h2 != null) {
            File file = new File(h2);
            file = new File(file, "nuxeo.lucene");
            file = new File(file, "write.lock");
            file.delete();
        }
    }

    private void startRuntime(BundleContext context) throws BundleException {
=======
    protected void startRuntime(BundleContext context) throws BundleException {
>>>>>>> 076453df2b42d737066621a39258a270499b106b
        try {
            context.getBundle().loadClass("org.nuxeo.runtime.api.Framework");
        } catch (Throwable t) {
Solution content 
    }

    protected void removeH2Lock() {
        String h2 = System.getProperty("h2.baseDir");
        if (h2 != null) {
            File file = new File(h2);
            file = new File(file, "nuxeo.lucene");
            file = new File(file, "write.lock");
            file.delete();
        }
    }

    protected void startRuntime(BundleContext context) throws BundleException {
        try {
            context.getBundle().loadClass("org.nuxeo.runtime.api.Framework");
        } catch (Throwable t) {
File
StartApplication.java
Developer's decision
Manual
Kind of conflict
Method declaration
Method signature