Projects >> candlepin >>f96cab69549078e46a0b0b3f6d7de63316d50ebb

Chunk
Conflicting content 
 */
package org.candlepin.gutterball.guice;

<<<<<<< HEAD
import javax.inject.Singleton;
import javax.servlet.ServletContext;

import org.candlepin.gutterball.config.Configuration;
import org.candlepin.gutterball.curator.EventCurator;
import org.candlepin.gutterball.filter.LoggingFilter;
=======
import org.candlepin.common.config.Configuration;
import org.candlepin.common.filter.LoggingFilter;
>>>>>>> 64458931d82140351e3c30c9c26b9e034882ea50
import org.candlepin.gutterball.receive.EventReceiver;
import org.candlepin.gutterball.resource.EventResource;
import org.candlepin.gutterball.resource.StatusResource;
Solution content 
 */
package org.candlepin.gutterball.guice;

import org.candlepin.common.config.Configuration;
import org.candlepin.common.filter.LoggingFilter;
import org.candlepin.gutterball.receive.EventReceiver;
import org.candlepin.gutterball.resource.EventResource;
import org.candlepin.gutterball.resource.StatusResource;
File
GutterballServletModule.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import com.google.inject.Provides;
import com.google.inject.servlet.ServletModule;
import com.google.inject.servlet.ServletScopes;
<<<<<<< HEAD
import com.mongodb.DB;
import com.mongodb.MongoClient;
=======

import org.xnap.commons.i18n.I18n;

import java.util.HashMap;
import java.util.Map;

import javax.inject.Singleton;
import javax.servlet.ServletContext;
>>>>>>> 64458931d82140351e3c30c9c26b9e034882ea50

/**
 * GutterballServletContextListener is responsible for starting Guice and binding
Solution content 
import com.google.inject.Provides;
import com.google.inject.servlet.ServletModule;
import com.google.inject.servlet.ServletScopes;

import org.xnap.commons.i18n.I18n;

import java.util.HashMap;
import java.util.Map;

import javax.inject.Singleton;
import javax.servlet.ServletContext;

/**
 * GutterballServletContextListener is responsible for starting Guice and binding
File
GutterballServletModule.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.qpid.client.AMQAnyDestination;
import org.apache.qpid.client.AMQConnection;
import org.candlepin.gutterball.config.ConfigKey;
<<<<<<< HEAD
import org.candlepin.gutterball.config.Configuration;
import org.candlepin.gutterball.curator.EventCurator;
=======
import org.candlepin.common.config.Configuration;
import org.candlepin.gutterball.util.EventJsonUtil;
>>>>>>> 64458931d82140351e3c30c9c26b9e034882ea50
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Solution content 
import org.apache.qpid.client.AMQAnyDestination;
import org.apache.qpid.client.AMQConnection;
import org.candlepin.gutterball.config.ConfigKey;
import org.candlepin.gutterball.config.Configuration;
import org.candlepin.gutterball.curator.EventCurator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
File
EventReceiver.java
Developer's decision
Version 1
Kind of conflict
Import