Projects >> zanata-server >>dacddfec5f82e032a7f61898a0c586db1984711a

Chunk
Conflicting content 
import javax.faces.application.FacesMessage;

import org.apache.commons.lang.time.DateUtils;
<<<<<<< HEAD
import javax.inject.Inject;
import javax.inject.Named;
=======
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
import org.jboss.seam.annotations.Scope;
>>>>>>> da4108a6d06aed23497ac69d3d1f1267bfa66687
import org.zanata.dao.AccountActivationKeyDAO;
import org.zanata.exception.KeyNotFoundException;
import org.zanata.exception.ActivationLinkExpiredException;
Solution content 
import javax.faces.application.FacesMessage;

import org.apache.commons.lang.time.DateUtils;
import javax.inject.Inject;
import javax.inject.Named;
import org.zanata.dao.AccountActivationKeyDAO;
import org.zanata.exception.KeyNotFoundException;
import org.zanata.exception.ActivationLinkExpiredException;
File
ActivateAction.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.zanata.seam.security.AbstractRunAsOperation;
import org.zanata.seam.security.IdentityManager;

<<<<<<< HEAD
@Named("activate")
@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */
=======
@Name("activate")
@Scope(ScopeType.PAGE)
>>>>>>> da4108a6d06aed23497ac69d3d1f1267bfa66687
public class ActivateAction implements Serializable {

    private static final long serialVersionUID = -8079131168179421345L;
Solution content 
import org.zanata.seam.security.AbstractRunAsOperation;
import org.zanata.seam.security.IdentityManager;

@Named("activate")
@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */
public class ActivateAction implements Serializable {

    private static final long serialVersionUID = -8079131168179421345L;
File
ActivateAction.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Chunk
Conflicting content 
    private static final long serialVersionUID = -8079131168179421345L;

<<<<<<< HEAD
    @Inject
    private FacesMessages facesMessages;

    @Inject
=======
    @In
>>>>>>> da4108a6d06aed23497ac69d3d1f1267bfa66687
    private AccountActivationKeyDAO accountActivationKeyDAO;

    @Inject
Solution content 
    private static final long serialVersionUID = -8079131168179421345L;


    @Inject
    private AccountActivationKeyDAO accountActivationKeyDAO;

    @Inject
File
ActivateAction.java
Developer's decision
Combination
Kind of conflict
Annotation
Attribute
Chunk
Conflicting content 
    private static int LINK_ACTIVE_DAYS = 1;

<<<<<<< HEAD
    // @Begin(join = true) /* TODO [CDI] commented out begin conversation. Verify it still works properly */
=======
>>>>>>> da4108a6d06aed23497ac69d3d1f1267bfa66687
    public void validateActivationKey() {

        if (getActivationKey() == null) {
Solution content 
    private static int LINK_ACTIVE_DAYS = 1;

    public void validateActivationKey() {

        if (getActivationKey() == null) {
File
ActivateAction.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
        this.activationKey = activationKey;
    }

<<<<<<< HEAD
//    @End /* TODO [CDI] commented out end conversation. verify it still work */
    public String activate() {

=======
    public void activate() {
>>>>>>> da4108a6d06aed23497ac69d3d1f1267bfa66687
        new AbstractRunAsOperation() {
            public void execute() {
                identityManager.enableUser(key.getAccount().getUsername());
Solution content 
        this.activationKey = activationKey;
    }

    public void activate() {
        new AbstractRunAsOperation() {
            public void execute() {
                identityManager.enableUser(key.getAccount().getUsername());
File
ActivateAction.java
Developer's decision
Version 2
Kind of conflict
Comment
Method signature