Projects >> cadmium >>5ecb493f417305e1ad3e6b59278916598516b2fd

Chunk
Conflicting content 
  @Inject
  protected DelayedGitServiceInitializer gitInit;
  
<<<<<<< HEAD
  private GitService git;
  protected Properties configProperties;

=======
>>>>>>> da2abf53dc0c32f5b033d5dfb3cd4fbf40fd4ff0
  public String getName() { return ProtocolMessage.SYNC; }
  
  @Override
Solution content 
  @Inject
  protected DelayedGitServiceInitializer gitInit;
  
  protected Properties configProperties;

  
  public String getName() { return ProtocolMessage.SYNC; }
  
  @Override
File
SyncCommandAction.java
Developer's decision
Combination
Kind of conflict
Attribute
Chunk
Conflicting content 
  
    
  protected Future lastTask = null;
  
<<<<<<< HEAD
  protected CoordinatedWorkerListener listener;
  protected Properties configProperties; 
  protected GitService gitService = null;
=======
  private CoordinatedWorkerListener listener;
>>>>>>> da2abf53dc0c32f5b033d5dfb3cd4fbf40fd4ff0
  public CoordinatedWorkerImpl() {
    pool = Executors.newSingleThreadExecutor();
Solution content 
    
  protected Future lastTask = null;
  

  protected CoordinatedWorkerListener listener;
  protected Properties configProperties; 
  
  public CoordinatedWorkerImpl() {
    pool = Executors.newSingleThreadExecutor();
File
CoordinatedWorkerImpl.java
Developer's decision
Combination
Kind of conflict
Attribute
Chunk
Conflicting content 
  private HistoryManager historyManager = null;

  @Inject
<<<<<<< HEAD
  public InitializeTask(ConfigManager configManager, ContentService servlet, SiteConfigProcessor metaProcessor, @Named("com.meltmedia.cadmium.git.uri") String repoUri, @Named("initialCadmiumBranch") String branch, @Named("sharedContentRoot") String contentRoot, @Named("warName") String warName, @Named("contentDir") String contentDirectory, HistoryManager historyManager) {

    this.branch = branch;
    this.repoUri = repoUri;
=======
  public InitializeTask(@Named("config.properties") Properties configProperties, ContentService servlet, SiteConfigProcessor metaProcessor, @Named("sharedContentRoot") String contentRoot, @Named("warName") String warName, @Named("contentDir") String contentDirectory, HistoryManager historyManager) {
    this.branch = configProperties.getProperty("com.meltmedia.cadmium.branch");
    this.repoUri = configProperties.getProperty("com.meltmedia.cadmium.git.uri");
>>>>>>> da2abf53dc0c32f5b033d5dfb3cd4fbf40fd4ff0
    this.contentRoot = contentRoot;
    this.warName = warName;
    this.contentDirectory = contentDirectory;
Solution content 
  private HistoryManager historyManager = null;
  private Properties configProperties = new Properties();

  @Inject
  public InitializeTask(ConfigManager configManager, ContentService servlet, SiteConfigProcessor metaProcessor, @Named("sharedContentRoot") String contentRoot, @Named("warName") String warName, @Named("contentDir") String contentDirectory, HistoryManager historyManager) {
    
    this.contentRoot = contentRoot;
    this.warName = warName;
    this.contentDirectory = contentDirectory;
File
InitializeTask.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Method signature
Chunk
Conflicting content 
    tracker.setMembers(new ArrayList());
    tracker.getMembers().add(new ChannelMember(new IpAddress(1234), true, true));
    tracker.getMembers().add(new ChannelMember(new IpAddress(4321), false, false));
<<<<<<< HEAD
        
=======
    
    Properties configProperties = new Properties();
    configProperties.setProperty("repo", "oldRepo");
>>>>>>> da2abf53dc0c32f5b033d5dfb3cd4fbf40fd4ff0
    configProperties.setProperty("branch", "master");
    configProperties.setProperty("git.ref.sha", "good_key");
Solution content 
    tracker.setMembers(new ArrayList());
    tracker.getMembers().add(new ChannelMember(new IpAddress(1234), true, true));
    tracker.getMembers().add(new ChannelMember(new IpAddress(4321), false, false));
    
   
    configProperties.setProperty("repo", "oldRepo");

    configProperties.setProperty("branch", "master");
    configProperties.setProperty("git.ref.sha", "good_key");
File
SyncCommandActionTest.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
      }
      
    };
<<<<<<< HEAD
    worker.setListener(listener);    
   
=======
    worker.setListener(listener);
    
    Properties configProperties = new Properties();
    configProperties.setProperty("repo", "oldRepo");
>>>>>>> da2abf53dc0c32f5b033d5dfb3cd4fbf40fd4ff0
    configProperties.setProperty("branch", "master");
    configProperties.setProperty("git.ref.sha", "old_key");
Solution content 
      }
      
    };

    worker.setListener(listener);    

    configProperties.setProperty("repo", "oldRepo");

    configProperties.setProperty("branch", "master");
    configProperties.setProperty("git.ref.sha", "old_key");
File
SyncCommandActionTest.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
  private String warName;
  private String vHostName;
  private String channelConfigUrl;
<<<<<<< HEAD
  private ConfigManager configManager;
  private String branch;
=======
>>>>>>> da2abf53dc0c32f5b033d5dfb3cd4fbf40fd4ff0
  private String failOver;
  
  private ServletContext context;
Solution content 
  private String warName;
  private String vHostName;
  private String channelConfigUrl;
  private ConfigManager configManager;
  
  private String failOver;
  
  private ServletContext context;
File
CadmiumListener.java
Developer's decision
Combination
Kind of conflict
Attribute
Chunk
Conflicting content 
    failOver = servletContextEvent.getServletContext().getRealPath("/");
    MaintenanceFilter.siteDown.start();
    context = servletContextEvent.getServletContext();
<<<<<<< HEAD
    
    configManager = new ConfigManager();
    
    Properties cadmiumProperties = configManager.getPropertiesByContext(context, "/WEB-INF/cadmium.properties");
    
=======
>>>>>>> da2abf53dc0c32f5b033d5dfb3cd4fbf40fd4ff0
    
    Properties configProperties = new Properties();
    configProperties = configManager.getSystemProperties();
Solution content 
    failOver = servletContextEvent.getServletContext().getRealPath("/");
    MaintenanceFilter.siteDown.start();
    context = servletContextEvent.getServletContext();
    
    configManager = new ConfigManager();
    
    Properties cadmiumProperties = configManager.getPropertiesByContext(context, "/WEB-INF/cadmium.properties");
    
    
    Properties configProperties = new Properties();
    configProperties = configManager.getSystemProperties();
File
CadmiumListener.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
      GitService.setupSsh(sshDir.getAbsolutePath());
    }
    
<<<<<<< HEAD
    repoUri = cadmiumProperties.getProperty("com.meltmedia.cadmium.git.uri");  
    branch = cadmiumProperties.getProperty("com.meltmedia.cadmium.branch");


=======
>>>>>>> da2abf53dc0c32f5b033d5dfb3cd4fbf40fd4ff0
    String repoDir = servletContextEvent.getServletContext().getInitParameter("repoDir");
    if (repoDir != null && repoDir.trim().length() > 0) {
      this.repoDir = repoDir;
Solution content 
      GitService.setupSsh(sshDir.getAbsolutePath());
    }
    


    String repoDir = servletContextEvent.getServletContext().getInitParameter("repoDir");
    if (repoDir != null && repoDir.trim().length() > 0) {
      this.repoDir = repoDir;
File
CadmiumListener.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        
        Reflections reflections = new Reflections("com.meltmedia.cadmium");
        Properties configProperties = new Properties();
<<<<<<< HEAD
        configProperties = configManager.getSystemProperties(); 
        
        configProperties = configManager.loadProperties(configProperties, new File(applicationContentRoot, CONFIG_PROPERTIES_FILE));
       
=======
        configProperties.putAll(System.getenv());
        configProperties.putAll(System.getProperties());
        loadProperties(configProperties, context, "/WEB-INF/cadmium.properties", log);

        if (new File(applicationContentRoot, CONFIG_PROPERTIES_FILE).exists()) {
          try {
            configProperties.load(new FileReader(new File(
                applicationContentRoot, CONFIG_PROPERTIES_FILE)));
          } catch (Exception e) {
            log.warn("Failed to load properties file ["
                + CONFIG_PROPERTIES_FILE + "] from content directory.", e);
          }
        }


>>>>>>> da2abf53dc0c32f5b033d5dfb3cd4fbf40fd4ff0
        bind(SiteDownService.class).toInstance(MaintenanceFilter.siteDown);

        bind(FileServlet.class).in(Scopes.SINGLETON);
Solution content 
        
        Reflections reflections = new Reflections("com.meltmedia.cadmium");
        Properties configProperties = new Properties();

        configProperties = configManager.getSystemProperties();         
        configProperties = configManager.loadProperties(configProperties, new File(applicationContentRoot, CONFIG_PROPERTIES_FILE));
       

        bind(SiteDownService.class).toInstance(MaintenanceFilter.siteDown);

        bind(FileServlet.class).in(Scopes.SINGLETON);
File
CadmiumListener.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable