Projects >> nuxeo-features >>cccc03b28480b6ac7e968a5f83aa43b5d33ec288

Chunk
Conflicting content 
import org.nuxeo.ecm.webengine.WebException;
import org.nuxeo.ecm.webengine.model.WebContext;
import org.nuxeo.ecm.webengine.model.WebObject;
<<<<<<< HEAD
import org.nuxeo.runtime.api.Framework;
=======
import org.nuxeo.ecm.webengine.model.Resource;
import org.nuxeo.ecm.webengine.model.exceptions.WebResourceNotFoundException;
>>>>>>> 60036c76c0b232798ddf72c9970a341fc18176ad
import org.nuxeo.webengine.sites.utils.SiteQueriesColection;
import org.nuxeo.webengine.sites.utils.SiteUtils;
Solution content 
import org.nuxeo.ecm.webengine.WebException;
import org.nuxeo.ecm.webengine.model.WebContext;
import org.nuxeo.ecm.webengine.model.WebObject;
import org.nuxeo.ecm.webengine.model.Resource;
import org.nuxeo.ecm.webengine.model.exceptions.WebResourceNotFoundException;
import org.nuxeo.runtime.api.Framework;
import org.nuxeo.webengine.sites.utils.SiteQueriesColection;
import org.nuxeo.webengine.sites.utils.SiteUtils;
File
Site.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
    @POST
        }
    }

<<<<<<< HEAD
=======
    @Override
    @Path(value = "{path}")
    public Resource traverse(@PathParam("path") String path) {
        try {
            return newDocument(path);
        } catch (Exception e) {
            if (e instanceof WebResourceNotFoundException) {
                CoreSession session = ctx.getCoreSession();
                try {
                    if (session.hasPermission(doc.getRef(),
                            PERMISSION_ADD_CHILDREN)) {
                        DocumentObject parent = (DocumentObject) ctx.getTargetObject();
                        ctx.getRequest().setAttribute(THEME_PERSPECTIVE,
                                "create");
                        ctx.getRequest().setAttribute(PAGE_NAME_ATTRIBUTE, path);
                        return parent;
                    } else {
                        return newObject("WebPage", path);
                    }
                } catch (ClientException ce) {
                    throw WebException.wrap(ce);
                }

            } else {
                throw WebException.wrap(e);
            }
        }
    }
>>>>>>> 60036c76c0b232798ddf72c9970a341fc18176ad

    @Path("createWebPage")
Solution content 
        }
    }

    @Override
    @Path(value = "{path}")
    public Resource traverse(@PathParam("path") String path) {
        try {
            return newDocument(path);
        } catch (Exception e) {
            if (e instanceof WebResourceNotFoundException) {
                CoreSession session = ctx.getCoreSession();
                try {
                    if (session.hasPermission(doc.getRef(),
                            PERMISSION_ADD_CHILDREN)) {
                        DocumentObject parent = (DocumentObject) ctx.getTargetObject();
                        ctx.getRequest().setAttribute(THEME_PERSPECTIVE,
                                "create");
                        ctx.getRequest().setAttribute(PAGE_NAME_ATTRIBUTE, path);
                        return parent;
                    } else {
                        return newObject("WebPage", path);
                    }
                } catch (ClientException ce) {
                    throw WebException.wrap(ce);
                }
            } else {
                throw WebException.wrap(e);
            }
        }
    }
    @POST
    @Path("createWebPage")
File
Site.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
    protected Map getSiteArguments() throws Exception {
        Map root = new HashMap();
        root.put(PAGE_NAME, SiteUtils.getString(doc, WEBCONTAINER_NAME, null));
<<<<<<< HEAD
        root.put(SITE_DESCRIPTION, SiteUtils.getString(doc, WEBCONTAINER_BASELINE, null));
        root.put(EMAIL, "mailto:"+doc.getPropertyValue(
                WEBCONTAINER_EMAIL).toString());
=======
        root.put(SITE_DESCRIPTION, SiteUtils.getString(doc,
                WEBCONTAINER_BASELINE, null));
>>>>>>> 60036c76c0b232798ddf72c9970a341fc18176ad
        return root;
    }
Solution content 
    protected Map getSiteArguments() throws Exception {
        Map root = new HashMap();
        root.put(PAGE_NAME, SiteUtils.getString(doc, WEBCONTAINER_NAME, null));
        root.put(SITE_DESCRIPTION, SiteUtils.getString(doc,
                WEBCONTAINER_BASELINE, null));
        root.put(EMAIL, "mailto:"+doc.getPropertyValue(
                WEBCONTAINER_EMAIL).toString());
        return root;
    }
File
Site.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
import javax.ws.rs.core.Response;

import org.apache.commons.lang.StringUtils;
<<<<<<< HEAD
import org.nuxeo.common.utils.IdUtils;
=======
>>>>>>> 60036c76c0b232798ddf72c9970a341fc18176ad
import org.nuxeo.ecm.core.api.Blob;
import org.nuxeo.ecm.core.api.ClientException;
import org.nuxeo.ecm.core.api.CoreSession;
Solution content 
import javax.ws.rs.core.Response;

import org.apache.commons.lang.StringUtils;
import org.nuxeo.ecm.core.api.Blob;
import org.nuxeo.ecm.core.api.ClientException;
import org.nuxeo.ecm.core.api.CoreSession;
File
SiteUtils.java
Developer's decision
Version 2
Kind of conflict
Import