Projects >> ftpserver >>5c2deb20bdfdb044e640c103ee727df427c90e50

Chunk
Conflicting content 
import org.apache.ftpserver.ssl.SslConfigurationFactory;
import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;

<<<<<<< HEAD
/*
 * @author Apache MINA Project
 */
=======
/**
* @author Apache MINA Project*
*/
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
public class EmbeddingFtpServer {

    public static void main(String[] args) throws Exception {
Solution content 
import org.apache.ftpserver.ssl.SslConfigurationFactory;
import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;

/**
* @author Apache MINA Project*
*/
public class EmbeddingFtpServer {

    public static void main(String[] args) throws Exception {
File
EmbeddingFtpServer.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
 */
package org.apache.ftpserver.examples;

<<<<<<< HEAD
=======
import java.io.File;

>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
import org.apache.ftpserver.usermanager.SaltedPasswordEncryptor;
Solution content 
 */

import java.io.File;

import org.apache.ftpserver.ftplet.UserManager;
import org.apache.ftpserver.usermanager.PropertiesUserManagerFactory;
import org.apache.ftpserver.usermanager.SaltedPasswordEncryptor;
File
ManagingUsers.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.ftpserver.usermanager.SaltedPasswordEncryptor;
import org.apache.ftpserver.usermanager.impl.BaseUser;

<<<<<<< HEAD
import java.io.File;

/*
 * @author Apache MINA Project
 */
=======
/**
* @author Apache MINA Project*
*/
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
public class ManagingUsers {

    public static void main(String[] args) throws Exception {
Solution content 
import org.apache.ftpserver.usermanager.SaltedPasswordEncryptor;
import org.apache.ftpserver.usermanager.impl.BaseUser;

/**
* @author Apache MINA Project*
*/
public class ManagingUsers {

    public static void main(String[] args) throws Exception {
File
ManagingUsers.java
Developer's decision
Version 2
Kind of conflict
Comment
Import
Chunk
Conflicting content 
 * 
 *
 * @author Apache MINA Project
<<<<<<< HEAD
 *
=======
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public interface ConnectionConfig {
Solution content 
 * 
 *
 * @author Apache MINA Project
 */
public interface ConnectionConfig {
File
ConnectionConfig.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
 * Factory for creating connection configurations
 *
 * @author Apache MINA Project
<<<<<<< HEAD
 *
=======
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class ConnectionConfigFactory {
Solution content 
 * Factory for creating connection configurations
 *
 * @author Apache MINA Project
 */
public class ConnectionConfigFactory {
File
ConnectionConfigFactory.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * Data connection configuration interface.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public interface DataConnectionConfiguration {
Solution content 
/**
 * Data connection configuration interface.
 *
 * @author Apache MINA Project 
 */
public interface DataConnectionConfiguration {
File
DataConnectionConfiguration.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * Data connection factory
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class DataConnectionConfigurationFactory {
Solution content 
/**
 * Data connection factory
 *
 * @author Apache MINA Project 
 */
public class DataConnectionConfigurationFactory {
File
DataConnectionConfigurationFactory.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    private String passiveAddress;
    private String passiveExternalAddress;
    private PassivePorts passivePorts = new PassivePorts(new int[] { 0 }, true);
<<<<<<< HEAD
    private boolean passiveIpCheck = false;
=======
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
    private boolean implicitSsl;

    /**
Solution content 
    private String passiveAddress;
    private String passiveExternalAddress;
    private PassivePorts passivePorts = new PassivePorts(new int[] { 0 }, true);
    private boolean implicitSsl;

    /**
File
DataConnectionConfigurationFactory.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
            // no available free port - wait for the release notification
            if (dataPort == -1) {
                try {
<<<<<<< HEAD
                    log.info("We're waiting for a passive port, might be stuck");
=======
                    log.info("Out of passive ports, waiting for one to be released. Might be stuck");
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
                    wait();
                } catch (InterruptedException ex) {
                }
Solution content 
            // no available free port - wait for the release notification
            if (dataPort == -1) {
                try {
                    log.info("Out of passive ports, waiting for one to be released. Might be stuck");
                    wait();
                } catch (InterruptedException ex) {
                }
File
DataConnectionConfigurationFactory.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
=======
/**
 * Thrown if a data connection can not be established
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class DataConnectionException extends FtpException {
    private static final long serialVersionUID = -1328383839917648987L;
Solution content 
/**
 * Thrown if a data connection can not be established
 *
 * @author Apache MINA Project 
 */
public class DataConnectionException extends FtpException {
    private static final long serialVersionUID = -1328383839917648987L;
File
DataConnectionException.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * thread. Server implementation is used to create the server
 * socket and handle client connection.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public interface FtpServer {
Solution content 
 * thread. Server implementation is used to create the server
 * socket and handle client connection.
 *
 * @author Apache MINA Project 
 */
public interface FtpServer {
File
FtpServer.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * Exception used during startup to indicate that the configuration is not
 * correct.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class FtpServerConfigurationException extends RuntimeException {
Solution content 
 * Exception used during startup to indicate that the configuration is not
 * correct.
 *
 * @author Apache MINA Project 
 */
public class FtpServerConfigurationException extends RuntimeException {
File
FtpServerConfigurationException.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * This is the starting point of all the servers. Creates server instances based on 
 * the provided configuration. 
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class FtpServerFactory {
Solution content 
 * This is the starting point of all the servers. Creates server instances based on 
 * the provided configuration. 
 *
 * @author Apache MINA Project 
 */
public class FtpServerFactory {
File
FtpServerFactory.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * Common base class recommended for {@link Command} implementations
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public abstract class AbstractCommand implements Command {
Solution content 
 *
/**
 * Common base class recommended for {@link Command} implementations
 * @author Apache MINA Project 
 */
public abstract class AbstractCommand implements Command {
File
AbstractCommand.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * This interface encapsulates all the FTP commands.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public interface Command {
Solution content 
/**
 * This interface encapsulates all the FTP commands.
 *
 * @author Apache MINA Project 
 */
public interface Command {
File
Command.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * Command factory interface.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public interface CommandFactory {
Solution content 
/**
 * Command factory interface.
 *
 * @author Apache MINA Project 
 */
public interface CommandFactory {
File
CommandFactory.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * Factory for {@link CommandFactory} instances
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class CommandFactoryFactory {
Solution content 
/**
 * Factory for {@link CommandFactory} instances
 *
 * @author Apache MINA Project 
 */
public class CommandFactoryFactory {
File
CommandFactoryFactory.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * A command used primarily for overriding already installed commands when one
 * wants to disable the command.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class NotSupportedCommand extends AbstractCommand {
Solution content 
 * A command used primarily for overriding already installed commands when one
 * wants to disable the command.
 *
 * @author Apache MINA Project 
 */
public class NotSupportedCommand extends AbstractCommand {
File
NotSupportedCommand.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * Current implementation does not do anything. As here data transfers are not
 * multi-threaded.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class ABOR extends AbstractCommand {
Solution content 
 * Current implementation does not do anything. As here data transfers are not
 * multi-threaded.
 *
 * @author Apache MINA Project 
 */
public class ABOR extends AbstractCommand {
File
ABOR.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * Acknowledges the ACCT (account) command with a 202 reply. The command however
 * is irrelevant to any workings.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class ACCT extends AbstractCommand {
Solution content 
 * Acknowledges the ACCT (account) command with a 202 reply. The command however
 * is irrelevant to any workings.
 *
 * @author Apache MINA Project 
 */
public class ACCT extends AbstractCommand {
File
ACCT.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * be appended to that file; otherwise the file specified in the pathname shall
 * be created at the server site.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class APPE extends AbstractCommand {
Solution content 
 * be appended to that file; otherwise the file specified in the pathname shall
 * be created at the server site.
 *
 * @author Apache MINA Project 
 */
public class APPE extends AbstractCommand {
File
APPE.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * 
 * This server supports explicit SSL support.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class AUTH extends AbstractCommand {
Solution content 
 * 
 * This server supports explicit SSL support.
 *
 * @author Apache MINA Project 
 */
public class AUTH extends AbstractCommand {
File
AUTH.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * systems having different syntaxes for naming the parent directory. The reply
 * codes shall be identical to the reply codes of CWD.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class CDUP extends AbstractCommand {
Solution content 
 * systems having different syntaxes for naming the parent directory. The reply
 * codes shall be identical to the reply codes of CWD.
 *
 * @author Apache MINA Project 
 */
public class CDUP extends AbstractCommand {
File
CDUP.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * Transfer parameters are similarly unchanged. The argument is a pathname
 * specifying a directory.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class CWD extends AbstractCommand {
Solution content 
 * Transfer parameters are similarly unchanged. The argument is a pathname
 * specifying a directory.
 *
 * @author Apache MINA Project 
 */
public class CWD extends AbstractCommand {
File
CWD.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * This command causes the file specified in the pathname to be deleted at the
 * server site.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class DELE extends AbstractCommand {
Solution content 
 * This command causes the file specified in the pathname to be deleted at the
 * server site.
 *
 * @author Apache MINA Project 
 */
public class DELE extends AbstractCommand {
File
DELE.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 *
 * Internal class, do not use directly.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class DefaultCommandFactory implements CommandFactory {
Solution content 
 *
 * Internal class, do not use directly.
 *
 * @author Apache MINA Project 
 */
public class DefaultCommandFactory implements CommandFactory {
File
DefaultCommandFactory.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * 
 * EPRT
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class EPRT extends AbstractCommand {
Solution content 
 * 
 * EPRT
 *
 * @author Apache MINA Project 
 */
public class EPRT extends AbstractCommand {
File
EPRT.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * response code for entering passive mode using an extended address MUST be
 * 229.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class EPSV extends AbstractCommand {
Solution content 
 * response code for entering passive mode using an extended address MUST be
 * 229.
 *
 * @author Apache MINA Project 
 */
public class EPSV extends AbstractCommand {
File
EPSV.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * a server supports the FEAT command then it MUST advertise supported AUTH,
 * PBSZ and PROT commands in the reply.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class FEAT extends AbstractCommand {
Solution content 
 * a server supports the FEAT command then it MUST advertise supported AUTH,
 * PBSZ and PROT commands in the reply.
 *
 * @author Apache MINA Project 
 */
public class FEAT extends AbstractCommand {
File
FEAT.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * may take an argument (e.g., any command name) and return more specific
 * information as a response.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class HELP extends AbstractCommand {
Solution content 
 * may take an argument (e.g., any command name) and return more specific
 * information as a response.
 *
 * @author Apache MINA Project 
 */
public class HELP extends AbstractCommand {
File
HELP.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * process to determine in which language to present server greetings and the
 * textual part of command responses.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class LANG extends AbstractCommand {
Solution content 
 * process to determine in which language to present server greetings and the
 * textual part of command responses.
 *
 * @author Apache MINA Project 
 */
public class LANG extends AbstractCommand {
File
LANG.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
=======
 * A null argument implies the user's current working or default directory. The
 * data transfer is over the data connection.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class LIST extends AbstractCommand {
Solution content 
 * A null argument implies the user's current working or default directory. The
 * data transfer is over the data connection.
 *
 * @author Apache MINA Project 
 */
public class LIST extends AbstractCommand {
File
LIST.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * Returns the MD5 value for a file or multiple files according to
 * draft-twine-ftpmd5-00.txt.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class MD5 extends AbstractCommand {
Solution content 
 * Returns the MD5 value for a file or multiple files according to
 * draft-twine-ftpmd5-00.txt.
 *
 * @author Apache MINA Project 
 */
public class MD5 extends AbstractCommand {
File
MD5.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * 
 * Returns the date and time of when a file was modified.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class MDTM extends AbstractCommand {
Solution content 
 * 
 * Returns the date and time of when a file was modified.
 *
 * @author Apache MINA Project 
 */
public class MDTM extends AbstractCommand {
File
MDTM.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * Specified in the following document:
 * http://www.omz13.com/downloads/draft-somers-ftp-mfxx-00.html#anchor8
 * 

<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class MFMT extends AbstractCommand {
Solution content 
 * Specified in the following document:
 * http://www.omz13.com/downloads/draft-somers-ftp-mfxx-00.html#anchor8
 * 

 * @author Apache MINA Project 
 */
public class MFMT extends AbstractCommand {
File
MFMT.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * a directory (if the pathname is absolute) or as a subdirectory of the current
 * working directory (if the pathname is relative).
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class MKD extends AbstractCommand {
Solution content 
 * a directory (if the pathname is absolute) or as a subdirectory of the current
 * working directory (if the pathname is relative).
 *
 * @author Apache MINA Project 
 */
public class MKD extends AbstractCommand {
File
MKD.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
            return;
        // argument check
        String fileName = request.getArgument();
        if (fileName == null) {
<<<<<<< HEAD
            session.write(LocalizedFileActionFtpReply.translate(session, request, context,
=======
            session.write(LocalizedFtpReply.translate(session, request, context,
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
                    FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
                    "MKD", null, null));
Solution content 
        // argument check
        String fileName = request.getArgument();
        if (fileName == null) {
            session.write(LocalizedFtpReply.translate(session, request, context,
                    FtpReply.REPLY_501_SYNTAX_ERROR_IN_PARAMETERS_OR_ARGUMENTS,
                    "MKD", null));
            return;
File
MKD.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
 * files in the specified directory. A null argument implies the user's current
 * working or default directory. The data transfer is over the data connection
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class MLSD extends AbstractCommand {
Solution content 
 * files in the specified directory. A null argument implies the user's current
 * working or default directory. The data transfer is over the data connection
 *
 * @author Apache MINA Project 
 */
public class MLSD extends AbstractCommand {
File
MLSD.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * 
 * Returns info on the file over the control connection.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class MLST extends AbstractCommand {
Solution content 
 * 
 * Returns info on the file over the control connection.
 *
 * @author Apache MINA Project 
 */
public class MLST extends AbstractCommand {
File
MLST.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * The argument is a single Telnet character code specifying the data transfer
 * modes described in the Section on Transmission Modes.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class MODE extends AbstractCommand {
Solution content 
 * The argument is a single Telnet character code specifying the data transfer
 * modes described in the Section on Transmission Modes.
 *
 * @author Apache MINA Project 
 */
public class MODE extends AbstractCommand {
File
MODE.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * descriptor; a null argument implies the current directory. The server will
 * return a stream of names of files and no other information.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class NLST extends AbstractCommand {
Solution content 
 * descriptor; a null argument implies the current directory. The server will
 * return a stream of names of files and no other information.
 *
 * @author Apache MINA Project 
 */
public class NLST extends AbstractCommand {
File
NLST.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * This command does not affect any parameters or previously entered commands.
 * It specifies no action other than that the server send an OK reply.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class NOOP extends AbstractCommand {
Solution content 
 * This command does not affect any parameters or previously entered commands.
 * It specifies no action other than that the server send an OK reply.
 *
 * @author Apache MINA Project 
 */
public class NOOP extends AbstractCommand {
File
NOOP.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * This command shall cause the server use optional features for the command
 * specified.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class OPTS extends AbstractCommand {
Solution content 
 * This command shall cause the server use optional features for the command
 * specified.
 *
 * @author Apache MINA Project 
 */
public class OPTS extends AbstractCommand {
File
OPTS.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * Client-Server listing negotation. Instruct the server what listing types to
 * include in machine directory/file listings.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class OPTS_MLST extends AbstractCommand {
Solution content 
 * Client-Server listing negotation. Instruct the server what listing types to
 * include in machine directory/file listings.
 *
 * @author Apache MINA Project 
 */
public class OPTS_MLST extends AbstractCommand {
File
OPTS_MLST.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * UTF-8 and back. Note that the servers default encoding is UTF-8. So this
 * command has no effect.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class OPTS_UTF8 extends AbstractCommand {
Solution content 
 * UTF-8 and back. Note that the servers default encoding is UTF-8. So this
 * command has no effect.
 *
 * @author Apache MINA Project 
 */
public class OPTS_UTF8 extends AbstractCommand {
File
OPTS_UTF8.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * The argument field is a Telnet string specifying the user's password. This
 * command must be immediately preceded by the user name command.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class PASS extends AbstractCommand {
Solution content 
 * The argument field is a Telnet string specifying the user's password. This
 * command must be immediately preceded by the user name command.
 *
 * @author Apache MINA Project 
 */
public class PASS extends AbstractCommand {
File
PASS.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * code to overwrite when reimplementing PASV command can be easily located. 
 * 
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class PASV extends AbstractCommand {
Solution content 
 *
 * @author Apache MINA Project 
 */
public class PASV extends AbstractCommand {
File
PASV.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * 
 * Protection buffer size.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class PBSZ extends AbstractCommand {
Solution content 
 * 
 * Protection buffer size.
 *
 * @author Apache MINA Project 
 */
public class PBSZ extends AbstractCommand {
File
PBSZ.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * 
 * where h1 is the high order 8 bits of the internet host address.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class PORT extends AbstractCommand {
Solution content 
 * 
 * where h1 is the high order 8 bits of the internet host address.
 *
 * @author Apache MINA Project 
 */
public class PORT extends AbstractCommand {
File
PORT.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * 
 * Data channel protection level.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class PROT extends AbstractCommand {
Solution content 
 * 
 * Data channel protection level.
 *
 * @author Apache MINA Project 
 */
public class PROT extends AbstractCommand {
File
PROT.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * This command causes the name of the current working directory to be returned
 * in the reply.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
=======
 * @author Apache MINA Project 
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class PWD extends AbstractCommand {
Solution content 
 * This command causes the name of the current working directory to be returned
 * in the reply.
 *
 * @author Apache MINA Project 
 */
public class PWD extends AbstractCommand {
File
PWD.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
                is = openInputStream(session, file, skipLen);

                // transfer data
<<<<<<< HEAD
                transSz = dataConnection.transferToClient(session.getFtpletSession(), is);
=======
                long transSz = dataConnection.transferToClient(session.getFtpletSession(), is);
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
                // attempt to close the input stream so that errors in 
                // closing it will return an error to the client (FTPSERVER-119) 
                if(is != null) {
Solution content 
                is = openInputStream(session, file, skipLen);

                // transfer data
                long transSz = dataConnection.transferToClient(session.getFtpletSession(), is);
                // attempt to close the input stream so that errors in 
                // closing it will return an error to the client (FTPSERVER-119) 
                if(is != null) {
File
RETR.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 


<<<<<<< HEAD
    
=======
                if (matches != null && matches.length > 0) {
                    tok = matches[0].getName();
                }
            }

            resArg = resArg + '/' + tok;
        }

        // add last slash if necessary
        if ((resArg.length()) + 1 == normalizedRootDir.length()) {
            resArg += '/';
        }

        // final check
        if (!resArg.regionMatches(0, normalizedRootDir, 0, normalizedRootDir
                .length())) {
            resArg = normalizedRootDir;
        }

        return resArg;
    }

>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
    @Override
    public boolean equals(Object obj) {
        if (obj != null && obj instanceof NativeFtpFile) {
Solution content 
                }
            }


        // replace ., ~ and ..
        // in this loop resArg will never end with '/'
        StringTokenizer st = new StringTokenizer(normalizedFileName, "/");
        while (st.hasMoreTokens()) {
            String tok = st.nextToken();

            // . => current directory
            if (tok.equals(".")) {
                continue;
            }

            // .. => parent directory (if not root)
            if (tok.equals("..")) {
                if (resArg.startsWith(normalizedRootDir)) {
                    int slashIndex = resArg.lastIndexOf('/');
                    if (slashIndex != -1) {
                        resArg = resArg.substring(0, slashIndex);
                    }
                }
                continue;
            }

            // ~ => home directory (in this case the root directory)
            if (tok.equals("~")) {
                resArg = normalizedRootDir.substring(0, normalizedRootDir
                        .length() - 1);
                continue;
            }

            if (caseInsensitive) {
                File[] matches = new File(resArg)
                        .listFiles(new NameEqualsFileFilter(tok, true));

                if (matches != null && matches.length > 0) {
                    tok = matches[0].getName();
            resArg = resArg + '/' + tok;
        }

        // add last slash if necessary
        if ((resArg.length()) + 1 == normalizedRootDir.length()) {
            resArg += '/';
        }

        // final check
        if (!resArg.regionMatches(0, normalizedRootDir, 0, normalizedRootDir
                .length())) {
            resArg = normalizedRootDir;
        }

        return resArg;
    }

    @Override
    public boolean equals(Object obj) {
        if (obj != null && obj instanceof NativeFtpFile) {
File
NativeFtpFile.java
Developer's decision
Manual
Kind of conflict
Comment
If statement
Return statement
Variable
Chunk
Conflicting content 
                otherCanonicalFile = ((NativeFtpFile) obj).file
                        .getCanonicalFile();
            } catch (IOException e) {
<<<<<<< HEAD
                throw new RuntimeException("Failed to get the canonical path",
                        e);
=======
                throw new RuntimeException("Failed to get the canonical path", e);
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
            }

            return thisCanonicalFile.equals(otherCanonicalFile);
Solution content 
                otherCanonicalFile = ((NativeFtpFile) obj).file
                        .getCanonicalFile();
            } catch (IOException e) {
                throw new RuntimeException("Failed to get the canonical path", e);
            }

            return thisCanonicalFile.equals(otherCanonicalFile);
File
NativeFtpFile.java
Developer's decision
Version 1
Kind of conflict
Throw statement
Chunk
Conflicting content 
/**
 * Internal class, do not use directly.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 *
=======
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class DefaultConnectionConfig implements ConnectionConfig {
Solution content 
/**
 * Internal class, do not use directly.
 *
 * @author Apache MINA Project *
 */
public class DefaultConnectionConfig implements ConnectionConfig {
File
DefaultConnectionConfig.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * Internal class, do not use directly.
 * 
<<<<<<< HEAD
 * @author Apache MINA Project
 *
=======
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class DefaultFtpHandler implements FtpHandler {
Solution content 
/**
 * Internal class, do not use directly.
 * 
 * @author Apache MINA Project *
 */
public class DefaultFtpHandler implements FtpHandler {
File
DefaultFtpHandler.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * Internal class, do not use directly.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 *
=======
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public interface FtpHandler {
Solution content 
/**
 * Internal class, do not use directly.
 *
 * @author Apache MINA Project *
 */
public interface FtpHandler {
File
FtpHandler.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * Internal class, do not use directly.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 *
=======
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class FtpIoSession implements IoSession {
Solution content 
/**
 * Internal class, do not use directly.
 *
 * @author Apache MINA Project *
 */
public class FtpIoSession implements IoSession {
File
FtpIoSession.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
    private final Logger LOG = LoggerFactory
    .getLogger(IODataConnection.class);

<<<<<<< HEAD
    
=======

>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
    private static final byte[] EOL = System.getProperty("line.separator").getBytes();

    private FtpIoSession session;
Solution content 
    private final Logger LOG = LoggerFactory
    .getLogger(IODataConnection.class);


    private static final byte[] EOL = System.getProperty("line.separator").getBytes();

    private FtpIoSession session;
File
IODataConnection.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
                        } else {
                            if(b == '\n') {
                                // for reads, we should always get \r\n
<<<<<<< HEAD
                                // so what we do here is to ignore \n bytes 
                                // and on \r dump the system local line ending.
                                // Some clients won't transform new lines into \r\n so we make sure we don't delete new lines
                                if (lastByte != '\r'){
                                    bos.write(EOL);
=======
                                // so what we do here is to ignore \n bytes
                                // and on \r dump the system local line ending
                                // Some clients won't transform new lines into \r\n so we make sure we don't delete new lines
								if (lastByte != '\r'){
								    bos.write(EOL);
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
                                }
                            } else if(b == '\r') {
                                bos.write(EOL);
Solution content 
                        } else {
                            if(b == '\n') {
                                // for reads, we should always get \r\n
                                // so what we do here is to ignore \n bytes
                                // and on \r dump the system local line ending
                                // Some clients won't transform new lines into \r\n so we make sure we don't delete new lines
								if (lastByte != '\r'){
								    bos.write(EOL);
                                }
                            } else if(b == '\r') {
                                bos.write(EOL);
File
IODataConnection.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation
Chunk
Conflicting content 
                    SSLSocket sslSocket = (SSLSocket) ssocketFactory
                            .createSocket(serverSocket, serverSocket
<<<<<<< HEAD
                                    .getInetAddress().getHostAddress(),
=======
                                    .getInetAddress().getHostName(),
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
                                    serverSocket.getPort(), true);
                    sslSocket.setUseClientMode(false);
Solution content 
                    SSLSocket sslSocket = (SSLSocket) ssocketFactory
                            .createSocket(serverSocket, serverSocket
                                    .getInetAddress().getHostName(),
                                    serverSocket.getPort(), true);
                    sslSocket.setUseClientMode(false);
File
IODataConnectionFactory.java
Developer's decision
Version 2
Kind of conflict
Cast expression
Chunk
Conflicting content 
                    dataSoc = servSoc.accept();
                }
<<<<<<< HEAD
                
                if (dataConfig.isPassiveIpCheck()) {
					// Let's make sure we got the connection from the same
					// client that we are expecting
					InetAddress remoteAddress = ((InetSocketAddress) session.getRemoteAddress()).getAddress();
					InetAddress dataSocketAddress = dataSoc.getInetAddress();
					if (!dataSocketAddress.equals(remoteAddress)) {
						LOG.warn("Passive IP Check failed. Closing data connection from "
							+ dataSocketAddress
							+ " as it does not match the expected address "
							+ remoteAddress);
						closeDataConnection();
						return null;
					}
				}
                
                DataConnectionConfiguration dataCfg = session.getListener()
                    .getDataConnectionConfiguration();
                
=======
                DataConnectionConfiguration dataCfg = session.getListener()
                    .getDataConnectionConfiguration();

>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
                dataSoc.setSoTimeout(dataCfg.getIdleTime() * 1000);
                LOG.debug("Passive data connection opened");
            }
Solution content 
                    dataSoc = servSoc.accept();
                }
                DataConnectionConfiguration dataCfg = session.getListener()
                    .getDataConnectionConfiguration();

                dataSoc.setSoTimeout(dataCfg.getIdleTime() * 1000);
                LOG.debug("Passive data connection opened");
            }
File
IODataConnectionFactory.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
/**
 * Internal class, do not use directly.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 *
=======
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public interface ServerDataConnectionFactory extends DataConnectionFactory {
Solution content 
/**
 * Internal class, do not use directly.
 *
 * @author Apache MINA Project *
 */
public interface ServerDataConnectionFactory extends DataConnectionFactory {
File
ServerDataConnectionFactory.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * 
 * Adapter between MINA handler and the {@link FtpHandler} interface
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 *
=======
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class FtpHandlerAdapter implements IoHandler {
    private FtpServerContext context;
Solution content 
 */
 * 
 * Adapter between MINA handler and the {@link FtpHandler} interface
 *
 * @author Apache MINA Project *
public class FtpHandlerAdapter implements IoHandler {
    private FtpServerContext context;
File
FtpHandlerAdapter.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * Internal class, do not use directly.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 *
=======
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class ClassUtils {
Solution content 
/**
 * Internal class, do not use directly.
 *
 * @author Apache MINA Project *
 */
public class ClassUtils {
File
ClassUtils.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
*
* From FTPSERVER-250
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class BindExceptionParallelTest extends ClientTestTemplate {
    private static final int NUMBER_OF_CLIENTS = 2;
Solution content 
*
* From FTPSERVER-250
*
* @author Apache MINA Project*
*/
public class BindExceptionParallelTest extends ClientTestTemplate {
    private static final int NUMBER_OF_CLIENTS = 2;
File
BindExceptionParallelTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
*
* From FTPSERVER-250
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class BindExceptionSerialTest extends ClientTestTemplate {
    @Override
Solution content 
*
* From FTPSERVER-250
*
* @author Apache MINA Project*
*/
public class BindExceptionSerialTest extends ClientTestTemplate {
    @Override
File
BindExceptionSerialTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class CdCaseInsensitiveTest extends CdTest {
    protected FtpServerFactory createServer() throws Exception {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class CdCaseInsensitiveTest extends CdTest {
    protected FtpServerFactory createServer() throws Exception {
File
CdCaseInsensitiveTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class CdTest extends ClientTestTemplate {
    protected static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class CdTest extends ClientTestTemplate {
    protected static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
File
CdTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public abstract class ClientTestTemplate extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public abstract class ClientTestTemplate extends TestCase {
File
ClientTestTemplate.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * Tests that commands sent simultaniously are handled correctly.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 *
=======
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class ConcatedCommandsTest extends ClientTestTemplate {
Solution content 
/**
 * Tests that commands sent simultaniously are handled correctly.
 *
 * @author Apache MINA Project *
 */
public class ConcatedCommandsTest extends ClientTestTemplate {
File
ConcatedCommandsTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
*/

/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
public class ConnectPickPortTest extends ClientTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class ConnectPickPortTest extends ClientTestTemplate {
File
ConnectPickPortTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class ConnectTest extends ClientTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class ConnectTest extends ClientTestTemplate {
File
ConnectTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class CustomMaxLoginTest extends ClientTestTemplate {
    private static final String UNKNOWN_USERNAME = "foo";
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class CustomMaxLoginTest extends ClientTestTemplate {
    private static final String UNKNOWN_USERNAME = "foo";
File
CustomMaxLoginTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
*
* Test for FTPSERVER-170
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class DataTransferTimeoutTest extends ClientTestTemplate {
    private static final String TEST_FILENAME = "test.txt";
Solution content 
*
* Test for FTPSERVER-170
*
* @author Apache MINA Project*
*/
public class DataTransferTimeoutTest extends ClientTestTemplate {
    private static final String TEST_FILENAME = "test.txt";
File
DataTransferTimeoutTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class DefaultMaxLoginTest extends ClientTestTemplate {
    private static final String UNKNOWN_USERNAME = "foo";
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class DefaultMaxLoginTest extends ClientTestTemplate {
    private static final String UNKNOWN_USERNAME = "foo";
File
DefaultMaxLoginTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class DeleteTest extends ClientTestTemplate {
    private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class DeleteTest extends ClientTestTemplate {
    private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
File
DeleteTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class DirectoryTest extends ClientTestTemplate {
    private static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class DirectoryTest extends ClientTestTemplate {
    private static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
File
DirectoryTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class FeatTest extends ClientTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class FeatTest extends ClientTestTemplate {
File
FeatTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class FtpMd5Test extends ClientTestTemplate {
    private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
Solution content 
*

/**
* @author Apache MINA Project*
*/
public class FtpMd5Test extends ClientTestTemplate {
    private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
File
FtpMd5Test.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
public class HelpTest extends ClientTestTemplate {

/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class HelpTest extends ClientTestTemplate {
File
HelpTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class I18NTest extends ClientTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class I18NTest extends ClientTestTemplate {
File
I18NTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class InetAddressBlacklistTest extends ClientTestTemplate {
    protected FtpServerFactory createServer() throws Exception {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class InetAddressBlacklistTest extends ClientTestTemplate {
    protected FtpServerFactory createServer() throws Exception {
File
InetAddressBlacklistTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class LangTest extends ClientTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class LangTest extends ClientTestTemplate {
File
LangTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class ListPassiveTest extends ListTest {
    /*
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class ListPassiveTest extends ListTest {
    /*
File
ListPassiveTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class ListTest extends ClientTestTemplate {
    private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class ListTest extends ClientTestTemplate {
    private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
File
ListTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class LoginNoAnonTest extends ClientTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class LoginNoAnonTest extends ClientTestTemplate {
File
LoginNoAnonTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class LoginTest extends ClientTestTemplate {
    private static final String UNKNOWN_USERNAME = "foo";
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class LoginTest extends ClientTestTemplate {
    private static final String UNKNOWN_USERNAME = "foo";
File
LoginTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class MDTMTest extends ClientTestTemplate {
    private static final SimpleDateFormat FTP_DATE_FORMAT = new SimpleDateFormat(
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class MDTMTest extends ClientTestTemplate {
    private static final SimpleDateFormat FTP_DATE_FORMAT = new SimpleDateFormat(
File
MDTMTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class MFMTTest extends ClientTestTemplate {
    private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class MFMTTest extends ClientTestTemplate {
    private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
File
MFMTTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class PasvAddressTest extends ClientTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class PasvAddressTest extends ClientTestTemplate {
File
PasvAddressTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
 * Test for external passive address configured as hostname rather than IP
 * address.
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 *
=======
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class PasvAddressWithHostnameTest extends ClientTestTemplate {
Solution content 
 * Test for external passive address configured as hostname rather than IP
 * address.
 *
 * @author Apache MINA Project *
 */
public class PasvAddressWithHostnameTest extends ClientTestTemplate {
File
PasvAddressWithHostnameTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class PasvTest extends ClientTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class PasvTest extends ClientTestTemplate {
File
PasvTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class RenameTest extends ClientTestTemplate {
    private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class RenameTest extends ClientTestTemplate {
    private static final File TEST_FILE1 = new File(ROOT_DIR, "test1.txt");
File
RenameTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class RetrievePassiveTest extends RetrieveTest {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class RetrievePassiveTest extends RetrieveTest {
File
RetrievePassiveTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class RetrieveTest extends ClientTestTemplate {
    private static final String TEST_FILENAME = "test.txt";
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class RetrieveTest extends ClientTestTemplate {
    private static final String TEST_FILENAME = "test.txt";
File
RetrieveTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 *
=======
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class RmDirTest extends ClientTestTemplate {
Solution content 
/**
 *
 * @author Apache MINA Project *
 */
public class RmDirTest extends ClientTestTemplate {
File
RmDirTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class SiteTest extends ClientTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class SiteTest extends ClientTestTemplate {
File
SiteTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class SizeTest extends ClientTestTemplate {
    protected static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class SizeTest extends ClientTestTemplate {
    protected static final File TEST_DIR1 = new File(ROOT_DIR, "dir1");
File
SizeTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class StorePassiveTest extends StoreTest {
    /*
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class StorePassiveTest extends StoreTest {
    /*
File
StorePassiveTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
import org.apache.ftpserver.test.TestUtil;

/**
<<<<<<< HEAD
 *
 * @author Apache MINA Project
 *
 */
=======
*
* @author Apache MINA Project*
*/
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
public class StoreTest extends ClientTestTemplate {

    private static final String EOL = System.getProperty("line.separator");
Solution content 
import org.apache.ftpserver.test.TestUtil;

/**
*
* @author Apache MINA Project*
*/
public class StoreTest extends ClientTestTemplate {
    private static final String EOL = System.getProperty("line.separator");
File
StoreTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class SubnetBlacklistTest extends ClientTestTemplate {
    protected FtpServerFactory createServer() throws Exception {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class SubnetBlacklistTest extends ClientTestTemplate {
    protected FtpServerFactory createServer() throws Exception {
File
SubnetBlacklistTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class SuspendResumeTest extends ClientTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class SuspendResumeTest extends ClientTestTemplate {
File
SuspendResumeTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class SystTest extends ClientTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class SystTest extends ClientTestTemplate {
File
SystTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class TypeTest extends ClientTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class TypeTest extends ClientTestTemplate {
File
TypeTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class UnlimitedMaxLoginTest extends ClientTestTemplate {
    private static final String UNKNOWN_USERNAME = "foo";
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class UnlimitedMaxLoginTest extends ClientTestTemplate {
    private static final String UNKNOWN_USERNAME = "foo";
File
UnlimitedMaxLoginTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * 
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 *
=======
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class DefaultCommandFactoryTest extends TestCase {
Solution content 
/**
 * 
 *
 * @author Apache MINA Project *
 */
public class DefaultCommandFactoryTest extends TestCase {
File
DefaultCommandFactoryTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
@SuppressWarnings("deprecation")
public class LISTFileFormaterTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
@SuppressWarnings("deprecation")
public class LISTFileFormaterTest extends TestCase {
File
LISTFileFormaterTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class ListArgumentParserTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class ListArgumentParserTest extends TestCase {
File
ListArgumentParserTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class ListArgumentTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class ListArgumentTest extends TestCase {
File
ListArgumentTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
@SuppressWarnings("deprecation")
public class MLSTFileFormaterTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
@SuppressWarnings("deprecation")
public class MLSTFileFormaterTest extends TestCase {
File
MLSTFileFormaterTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class NLSTFileFormaterTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class NLSTFileFormaterTest extends TestCase {
File
NLSTFileFormaterTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class DbUserManagerConfigTest extends SpringConfigTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class DbUserManagerConfigTest extends SpringConfigTestTemplate {
File
DbUserManagerConfigTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class FileUserManagerConfigTest extends SpringConfigTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class FileUserManagerConfigTest extends SpringConfigTestTemplate {
File
FileUserManagerConfigTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class FtpletsConfigTest extends SpringConfigTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class FtpletsConfigTest extends SpringConfigTestTemplate {
File
FtpletsConfigTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.ftplet.UserManager;

<<<<<<< HEAD
/*
 * @author Apache MINA Project
 */
=======
/**
* @author Apache MINA Project*
*/
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
public class MockUserManager implements UserManager {

    public User authenticate(Authentication authentication)
Solution content 
import org.apache.ftpserver.ftplet.User;
import org.apache.ftpserver.ftplet.UserManager;

/**
* @author Apache MINA Project*
*/
public class MockUserManager implements UserManager {

    public User authenticate(Authentication authentication)
File
MockUserManager.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 * Used for testing creation of custom listeners from Spring config
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 *
=======
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class MyCustomListener implements Listener {
Solution content 
/**
 * Used for testing creation of custom listeners from Spring config
 *
 * @author Apache MINA Project *
 */
public class MyCustomListener implements Listener {
File
MyCustomListener.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class PropertyPlaceholderTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class PropertyPlaceholderTest extends TestCase {
File
PropertyPlaceholderTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class SpringConfigTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class SpringConfigTest extends TestCase {
File
SpringConfigTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public abstract class SpringConfigTestTemplate extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public abstract class SpringConfigTestTemplate extends TestCase {
File
SpringConfigTestTemplate.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class TestFtplet extends DefaultFtplet {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class TestFtplet extends DefaultFtplet {
File
TestFtplet.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public abstract class FileSystemViewTemplate extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public abstract class FileSystemViewTemplate extends TestCase {
File
FileSystemViewTemplate.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public abstract class FtpFileTestTemplate extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public abstract class FtpFileTestTemplate extends TestCase {
File
FtpFileTestTemplate.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class NativeFileSystemViewTest extends FileSystemViewTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class NativeFileSystemViewTest extends FileSystemViewTemplate {
File
NativeFileSystemViewTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class DefaultFtpLetContainerTest extends FtpLetContainerTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class DefaultFtpLetContainerTest extends FtpLetContainerTestTemplate {
File
DefaultFtpLetContainerTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
import org.apache.ftpserver.impl.DefaultFtpRequest;
import org.apache.ftpserver.impl.DefaultFtpSession;

<<<<<<< HEAD
/*
 * @author Apache MINA Project
 */
=======
/**
* @author Apache MINA Project*
*/
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
public abstract class FtpLetContainerTestTemplate extends TestCase {

    private final List calls = new ArrayList();
Solution content 
import org.apache.ftpserver.impl.DefaultFtpRequest;
import org.apache.ftpserver.impl.DefaultFtpSession;

/**
* @author Apache MINA Project*
*/
public abstract class FtpLetContainerTestTemplate extends TestCase {

    private final List calls = new ArrayList();
File
FtpLetContainerTestTemplate.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class FtpLetReturnDefaultTest extends ClientTestTemplate {
    private static final byte[] TESTDATA = "TESTDATA".getBytes();
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class FtpLetReturnDefaultTest extends ClientTestTemplate {
    private static final byte[] TESTDATA = "TESTDATA".getBytes();
File
FtpLetReturnDefaultTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class FtpLetReturnDisconnectTest extends ClientTestTemplate {
    private static final byte[] TESTDATA = "TESTDATA".getBytes();
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class FtpLetReturnDisconnectTest extends ClientTestTemplate {
    private static final byte[] TESTDATA = "TESTDATA".getBytes();
File
FtpLetReturnDisconnectTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class FtpLetReturnSkipTest extends ClientTestTemplate {
    private static final byte[] TESTDATA = "TESTDATA".getBytes();
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class FtpLetReturnSkipTest extends ClientTestTemplate {
    private static final byte[] TESTDATA = "TESTDATA".getBytes();
File
FtpLetReturnSkipTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class FtpLetThrowFtpExceptionTest extends FtpLetReturnDisconnectTest {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class FtpLetThrowFtpExceptionTest extends FtpLetReturnDisconnectTest {
File
FtpLetThrowFtpExceptionTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class FtpLetThrowIOExceptionTest extends FtpLetThrowFtpExceptionTest {
    protected void throwException() throws IOException {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class FtpLetThrowIOExceptionTest extends FtpLetThrowFtpExceptionTest {
    protected void throwException() throws IOException {
File
FtpLetThrowIOExceptionTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
<<<<<<< HEAD

/**
*
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class FtpLetThrowRuntimeExceptionTest extends
        FtpLetThrowFtpExceptionTest {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class FtpLetThrowRuntimeExceptionTest extends
        FtpLetThrowFtpExceptionTest {
File
FtpLetThrowRuntimeExceptionTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class MockFtplet extends DefaultFtplet {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class MockFtplet extends DefaultFtplet {
File
MockFtplet.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class MockFtpletCallback extends DefaultFtplet {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class MockFtpletCallback extends DefaultFtplet {
File
MockFtpletCallback.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
 *
<<<<<<< HEAD
 * @author Apache MINA Project
 *
=======
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class DefaultFtpReplyTest extends TestCase {
Solution content 
/**
 *
 * @author Apache MINA Project *
 */
public class DefaultFtpReplyTest extends TestCase {
File
DefaultFtpReplyTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
import org.apache.ftpserver.FtpServerFactory;
import org.apache.ftpserver.listener.Listener;
import org.apache.ftpserver.listener.ListenerFactory;
<<<<<<< HEAD

/**
 *
 * @author Apache MINA Project
 *
=======
import org.apache.ftpserver.test.TestUtil;

/**
 *
 * @author Apache MINA Project *
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
 */
public class DefaultFtpServerTest extends TestCase {
Solution content 
import org.apache.ftpserver.FtpServerFactory;
import org.apache.ftpserver.listener.Listener;
import org.apache.ftpserver.listener.ListenerFactory;
import org.apache.ftpserver.test.TestUtil;

/**
 *
 * @author Apache MINA Project *
 */
public class DefaultFtpServerTest extends TestCase {
File
DefaultFtpServerTest.java
Developer's decision
Version 2
Kind of conflict
Comment
Import
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class FtpRequestImplTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class FtpRequestImplTest extends TestCase {
File
FtpRequestImplTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class FtpStatisticsImplTest extends ServerFtpStatisticsTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class FtpStatisticsImplTest extends ServerFtpStatisticsTestTemplate {
File
FtpStatisticsImplTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class PassivePortsTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class PassivePortsTest extends TestCase {
File
PassivePortsTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public abstract class ServerFtpStatisticsTestTemplate extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public abstract class ServerFtpStatisticsTestTemplate extends TestCase {
File
ServerFtpStatisticsTestTemplate.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**

*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public abstract class ExplicitSecurityTestTemplate extends SSLTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public abstract class ExplicitSecurityTestTemplate extends SSLTestTemplate {
File
ExplicitSecurityTestTemplate.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public abstract class ImplicitSecurityTestTemplate extends
        ExplicitSecurityTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public abstract class ImplicitSecurityTestTemplate extends
        ExplicitSecurityTestTemplate {
File
ImplicitSecurityTestTemplate.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class MinaClientAuthTest extends SSLTestTemplate {
Solution content 
*

/**
* @author Apache MINA Project*
*/
public class MinaClientAuthTest extends SSLTestTemplate {
File
MinaClientAuthTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class MinaExplicitSSLTest extends ExplicitSecurityTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class MinaExplicitSSLTest extends ExplicitSecurityTestTemplate {
File
MinaExplicitSSLTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class MinaExplicitTLSTest extends ExplicitSecurityTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class MinaExplicitTLSTest extends ExplicitSecurityTestTemplate {
File
MinaExplicitTLSTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class MinaImplicitClientAuthTest extends MinaClientAuthTest {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class MinaImplicitClientAuthTest extends MinaClientAuthTest {
File
MinaImplicitClientAuthTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class MinaImplicitSSLTest extends ImplicitSecurityTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class MinaImplicitSSLTest extends ImplicitSecurityTestTemplate {
File
MinaImplicitSSLTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class MinaImplicitTLSTest extends ImplicitSecurityTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class MinaImplicitTLSTest extends ImplicitSecurityTestTemplate {
File
MinaImplicitTLSTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public abstract class SSLTestTemplate extends ClientTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public abstract class SSLTestTemplate extends ClientTestTemplate {
File
SSLTestTemplate.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
            ftpsClient.setAuthValue(auth);
            
            if(auth.equals("SSL")) {
<<<<<<< HEAD
                // SSLv3 is disabled by default on the JBM JDK, therefore we need to enable it
=======
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
                ftpsClient.setEnabledProtocols(new String[]{"SSLv3"});
            }
        }
Solution content 
            ftpsClient.setAuthValue(auth);
            
            if(auth.equals("SSL")) {
                ftpsClient.setEnabledProtocols(new String[]{"SSLv3"});
            }
        }
File
SSLTestTemplate.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class AliasKeymanagerTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class AliasKeymanagerTest extends TestCase {
File
AliasKeymanagerTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class ExtendedAliasKeymanagerTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class ExtendedAliasKeymanagerTest extends TestCase {
File
ExtendedAliasKeymanagerTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class TestUtil {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class TestUtil {
File
TestUtil.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class UsernamePasswordAuthenticationTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class UsernamePasswordAuthenticationTest extends TestCase {
File
UsernamePasswordAuthenticationTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class BaseUserTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class BaseUserTest extends TestCase {
File
BaseUserTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class ClearTextDbUserManagerTest extends DbUserManagerTest {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class ClearTextDbUserManagerTest extends DbUserManagerTest {
File
ClearTextDbUserManagerTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class ClearTextPasswordEncryptorTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class ClearTextPasswordEncryptorTest extends TestCase {
File
ClearTextPasswordEncryptorTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class ConcurrentLoginPermissionTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class ConcurrentLoginPermissionTest extends TestCase {
File
ConcurrentLoginPermissionTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class DbUserManagerTest extends UserManagerTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class DbUserManagerTest extends UserManagerTestTemplate {
File
DbUserManagerTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class Md5PasswordEncryptorTest extends ClearTextPasswordEncryptorTest {
Solution content 
*

/**
* @author Apache MINA Project*
*/
public class Md5PasswordEncryptorTest extends ClearTextPasswordEncryptorTest {
File
Md5PasswordEncryptorTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class PropertiesUserManagerTest extends UserManagerTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class PropertiesUserManagerTest extends UserManagerTestTemplate {
File
PropertiesUserManagerTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class SaltedPasswordEncryptorTest extends ClearTextPasswordEncryptorTest {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class SaltedPasswordEncryptorTest extends ClearTextPasswordEncryptorTest {
File
SaltedPasswordEncryptorTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public abstract class UserManagerTestTemplate extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public abstract class UserManagerTestTemplate extends TestCase {
File
UserManagerTestTemplate.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class VolatilePropertiesUserManagerTest extends UserManagerTestTemplate {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class VolatilePropertiesUserManagerTest extends UserManagerTestTemplate {
File
VolatilePropertiesUserManagerTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class WritePermissionTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class WritePermissionTest extends TestCase {
File
WritePermissionTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class BasePropertiesTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class BasePropertiesTest extends TestCase {
File
BasePropertiesTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class EncryptUtilsTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class EncryptUtilsTest extends TestCase {
File
EncryptUtilsTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
/**
*
<<<<<<< HEAD
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class RegularExprTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class RegularExprTest extends TestCase {
File
RegularExprTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
<<<<<<< HEAD

/**
*
* @author Apache MINA Project
*
=======
* @author Apache MINA Project*
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
*/
public class SocketAddressEncoderTest extends TestCase {
Solution content 
/**
*
* @author Apache MINA Project*
*/
public class SocketAddressEncoderTest extends TestCase {
File
SocketAddressEncoderTest.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;

<<<<<<< HEAD
/*
 * @author Apache MINA Project
 */
=======
/**
* @author Apache MINA Project*
*/
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
public class FtpServerListener implements ServletContextListener {

    public static final String FTPSERVER_CONTEXT_NAME = "org.apache.ftpserver";
Solution content 
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;

/**
* @author Apache MINA Project*
*/
public class FtpServerListener implements ServletContextListener {

    public static final String FTPSERVER_CONTEXT_NAME = "org.apache.ftpserver";
File
FtpServerListener.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
import org.apache.ftpserver.FtpServer;

<<<<<<< HEAD
/*
 * @author Apache MINA Project
 */
=======
/**
* @author Apache MINA Project*
*/
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
public class FtpServerServlet extends HttpServlet {

    private static final long serialVersionUID = 5539642787624981705L;
Solution content 
import org.apache.ftpserver.FtpServer;

/**
* @author Apache MINA Project*
*/
public class FtpServerServlet extends HttpServlet {

    private static final long serialVersionUID = 5539642787624981705L;
File
FtpServerServlet.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
import org.apache.ftpserver.ftplet.FtpSession;
import org.apache.ftpserver.ftplet.FtpletResult;

<<<<<<< HEAD
/*
 * @author Apache MINA Project
 */
=======
/**
* @author Apache MINA Project*
*/
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
public class MyFtplet extends DefaultFtplet {

    @Override
Solution content 
import org.apache.ftpserver.ftplet.FtpSession;
import org.apache.ftpserver.ftplet.FtpletResult;

/**
* @author Apache MINA Project*
*/
public class MyFtplet extends DefaultFtplet {

    @Override
File
MyFtplet.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;

<<<<<<< HEAD
/*
 * @author Apache MINA Project
 */
=======
/**
* @author Apache MINA Project*
*/
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
public class Activator implements BundleActivator {

    public void start(BundleContext context) throws Exception {
Solution content 
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;

/**
* @author Apache MINA Project*
*/
public class Activator implements BundleActivator {

    public void start(BundleContext context) throws Exception {
File
Activator.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
import org.apache.ftpserver.FtpServer;

<<<<<<< HEAD
/*
 * @author Apache MINA Project
 */
=======
/**
* @author Apache MINA Project*
*/
>>>>>>> 2c119023bd644e65cd0855561ad4737f7de2bdd2
public class FtpServerLifecycle {

    private FtpServer server;
Solution content 
import org.apache.ftpserver.FtpServer;

/**
* @author Apache MINA Project*
*/
public class FtpServerLifecycle {

    private FtpServer server;
File
FtpServerLifecycle.java
Developer's decision
Version 2
Kind of conflict
Comment