Projects >> nuxeo-features >>f852df84e675edb0974ff77dc32570f126590909

Chunk
Conflicting content 
                "CoreEventListenerService.xml");

        // needed to avoid npe when creating DocumentModel
<<<<<<< HEAD
        deploy("LifeCycleService.xml");

        deploy("nxtransform-bundle-dmtest.xml");
        deploy("nxtransform-plugins-bundle-dmtest.xml");

        deploy("nxdocmodifier-bundle.xml");
        deploy("nxdocmodifier-test-contrib-bundle.xml");
=======
        deployContrib("org.nuxeo.ecm.platform.modifier.tests",
                "LifeCycleService.xml");

        deployContrib("org.nuxeo.ecm.platform.modifier.tests",
                "nxmimetype-bundle.xml");
        deployContrib("org.nuxeo.ecm.platform.modifier.tests",
                "nxtransform-bundle-dmtest.xml");
        deployContrib("org.nuxeo.ecm.platform.modifier.tests",
                "nxtransform-plugins-bundle-dmtest.xml");

        deployContrib("org.nuxeo.ecm.platform.modifier.tests",
                "nxdocmodifier-bundle.xml");
        deployContrib("org.nuxeo.ecm.platform.modifier.tests",
                "nxdocmodifier-test-contrib-bundle.xml");
>>>>>>> dfbbb396b0fb7986d3d3cac80fc0aa22ba3e19a7
    }

    @Override
Solution content 
                "CoreEventListenerService.xml");

        // needed to avoid npe when creating DocumentModel
        deployContrib("org.nuxeo.ecm.platform.modifier.tests",
                "LifeCycleService.xml");

        deployContrib("org.nuxeo.ecm.platform.modifier.tests",
                "nxtransform-bundle-dmtest.xml");
        deployContrib("org.nuxeo.ecm.platform.modifier.tests",
                "nxtransform-plugins-bundle-dmtest.xml");

        deployContrib("org.nuxeo.ecm.platform.modifier.tests",
                "nxdocmodifier-bundle.xml");
        deployContrib("org.nuxeo.ecm.platform.modifier.tests",
                "nxdocmodifier-test-contrib-bundle.xml");
    }

    @Override
File
AbstractPluginTestCase.java
Developer's decision
Combination
Kind of conflict
Method invocation
Chunk
Conflicting content 
        sch.addField(QName.valueOf("atelier_emetteur"), new TypeRef(SchemaNames.BUILTIN, StringType.ID));
        Framework.getLocalService(SchemaManager.class).registerSchema(sch);

<<<<<<< HEAD
        deploy("nxuidgenerator-bundle.xml");
        deploy("nxuidgenerator-bundle-contrib.xml");
=======
        deployContrib("org.nuxeo.ecm.platform.uidgen.core.tests",
                "nxuidgenerator-bundle.xml");
        deployContrib("org.nuxeo.ecm.platform.uidgen.core.tests",
                "nxuidgenerator-bundle-contrib.xml");

>>>>>>> dfbbb396b0fb7986d3d3cac80fc0aa22ba3e19a7
    }
    private static CoreEventListenerService getListenerService() {
Solution content 
        sch.addField(QName.valueOf("atelier_emetteur"), new TypeRef(SchemaNames.BUILTIN, StringType.ID));
        Framework.getLocalService(SchemaManager.class).registerSchema(sch);

        deployContrib("org.nuxeo.ecm.platform.uidgen.core.tests",
                "nxuidgenerator-bundle.xml");
        deployContrib("org.nuxeo.ecm.platform.uidgen.core.tests",
                "nxuidgenerator-bundle-contrib.xml");

    }

    private static CoreEventListenerService getListenerService() {
File
TestUIDGeneratorService.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
    @Override
    public void setUp() throws Exception {
        super.setUp();
<<<<<<< HEAD
        deploy("WorkflowDocumentSecurityPolicyService.xml");
        deploy("WorkflowDocumentSecurityPolicyServiceTestExtensions.xml");
        service = NXWorkflowDocument.getWorkflowDocumentRightsPolicyService();
=======
        deployContrib("org.nuxeo.ecm.platform.workflow.document.tests",
                "WorkflowDocumentSecurityPolicyService.xml");
        deployContrib("org.nuxeo.ecm.platform.workflow.document.tests",
                "WorkflowDocumentSecurityPolicyServiceTestExtensions.xml");
        service = NXWorkflowDocument
                .getWorkflowDocumentRightsPolicyService();

>>>>>>> dfbbb396b0fb7986d3d3cac80fc0aa22ba3e19a7
    }

    public void testService() {
Solution content 
    @Override
    public void setUp() throws Exception {
        super.setUp();
        deployContrib("org.nuxeo.ecm.platform.workflow.document.tests",
                "WorkflowDocumentSecurityPolicyService.xml");
        deployContrib("org.nuxeo.ecm.platform.workflow.document.tests",
                "WorkflowDocumentSecurityPolicyServiceTestExtensions.xml");
        service = NXWorkflowDocument.getWorkflowDocumentRightsPolicyService();
    }

    public void testService() {
File
AbstractWorkflowDocumentRightsPolicyServiceTestCase.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation