Projects >> eucalyptus >>2f289d1e8b111ff7f84585971b76ae439b66161b

Chunk
Conflicting content 
import com.eucalyptus.bootstrap.RunDuring;
import com.eucalyptus.bootstrap.Bootstrap.Stage;
import com.eucalyptus.component.Components;
<<<<<<< HEAD
import com.eucalyptus.component.id.Eucalyptus;
import com.eucalyptus.empyrean.Empyrean;
=======
import com.eucalyptus.entities.Counters;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import com.eucalyptus.entities.EntityWrapper;
import com.eucalyptus.ldap.LdapConfiguration;
Solution content 
import com.eucalyptus.bootstrap.RunDuring;
import com.eucalyptus.component.Components;
import com.eucalyptus.component.id.Eucalyptus;
import com.eucalyptus.empyrean.Empyrean;
import com.eucalyptus.entities.EntityWrapper;
import com.eucalyptus.ldap.LdapConfiguration;
File
DatabaseAuthBootstrapper.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.log4j.Logger;
import com.eucalyptus.auth.crypto.Hmacs;
<<<<<<< HEAD
=======
import com.eucalyptus.component.auth.EucaKeyStore;
import com.eucalyptus.component.auth.SystemCredentialProvider;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import com.eucalyptus.bootstrap.Bootstrap;
import com.eucalyptus.bootstrap.Bootstrapper;
import com.eucalyptus.bootstrap.Component;
Solution content 
import org.apache.log4j.Logger;
import com.eucalyptus.auth.crypto.Hmacs;
import com.eucalyptus.bootstrap.Bootstrap;
import com.eucalyptus.bootstrap.Bootstrapper;
File
RemoteComponentCredentialBootstrapper.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.eucalyptus.bootstrap.RunDuring;
import com.eucalyptus.bootstrap.Bootstrap.Stage;
import com.eucalyptus.component.Components;
<<<<<<< HEAD
import com.eucalyptus.component.auth.EucaKeyStore;
import com.eucalyptus.component.auth.SystemCredentialProvider;
import com.eucalyptus.component.id.Eucalyptus;
import com.eucalyptus.empyrean.Empyrean;
=======
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934

@Provides(Component.bootstrap)
@RunDuring(Bootstrap.Stage.SystemCredentialsInit)
Solution content 
import com.eucalyptus.bootstrap.RunDuring;
import com.eucalyptus.component.ComponentId;
import com.eucalyptus.component.ComponentIds;
import com.eucalyptus.component.Components;
import com.eucalyptus.component.auth.EucaKeyStore;
import com.eucalyptus.component.auth.SystemCredentialProvider;
import com.eucalyptus.component.id.Eucalyptus;
import com.eucalyptus.empyrean.Empyrean;

@Provides(Empyrean.class)
@RunDuring(Bootstrap.Stage.SystemCredentialsInit)
File
RemoteComponentCredentialBootstrapper.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
import com.eucalyptus.auth.api.CertificateProvider;
import com.eucalyptus.auth.api.CryptoProvider;
import com.eucalyptus.auth.api.HmacProvider;
<<<<<<< HEAD
import com.eucalyptus.component.ComponentIds;
import com.eucalyptus.component.auth.SystemCredentialProvider;
import com.eucalyptus.component.id.Eucalyptus;
=======
import com.eucalyptus.bootstrap.Component;
import com.eucalyptus.records.EventType;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import com.eucalyptus.records.EventRecord;

public class DefaultCryptoProvider implements CryptoProvider, CertificateProvider, HmacProvider {
Solution content 
import com.eucalyptus.auth.api.CertificateProvider;
import com.eucalyptus.auth.api.CryptoProvider;
import com.eucalyptus.auth.api.HmacProvider;
import com.eucalyptus.component.ComponentIds;
import com.eucalyptus.component.auth.SystemCredentialProvider;
import com.eucalyptus.component.id.Eucalyptus;
import com.eucalyptus.records.EventRecord;
import com.eucalyptus.records.EventType;

public class DefaultCryptoProvider implements CryptoProvider, CertificateProvider, HmacProvider {
File
DefaultCryptoProvider.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
  public VmAllocationInfo verify( VmAllocationInfo vmAllocInfo ) throws EucalyptusCloudException {
    if ( SshKeyPair.NO_KEY_NAME.equals( vmAllocInfo.getRequest().getKeyName() ) || vmAllocInfo.getRequest().getKeyName() == null ) {
//ASAP:FIXME:GRZE
<<<<<<< HEAD
      if( "windows".equals( vmAllocInfo.getPlatform( ) ) ) {
        throw new EucalyptusCloudException( "You must specify a keypair when running a windows vm: " + vmAllocInfo.getRequest().getImageId() );
      } else {
        vmAllocInfo.setKeyInfo( new VmKeyInfo() );
        return vmAllocInfo;
      }
=======
//      if( "windows".equals( vmAllocInfo.getImageInfo( ).getPlatform( ) ) ) {
//        throw new EucalyptusCloudException( "You must specify a keypair when running a windows vm: " + vmAllocInfo.getRequest().getImageId() );
//      } else {
        vmAllocInfo.setKeyInfo( new VmKeyInfo() );
        return vmAllocInfo;
//      }
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    }
    SshKeyPair keypair = KeyPairUtil.getUserKeyPair( vmAllocInfo.getRequest( ).getUserId( ), vmAllocInfo.getRequest( ).getKeyName( ) );
    if ( keypair == null ) {
Solution content 
  public VmAllocationInfo verify( VmAllocationInfo vmAllocInfo ) throws EucalyptusCloudException {
    if ( SshKeyPair.NO_KEY_NAME.equals( vmAllocInfo.getRequest().getKeyName() ) || vmAllocInfo.getRequest().getKeyName() == null ) {
//ASAP:FIXME:GRZE
      if( "windows".equals( vmAllocInfo.getPlatform( ) ) ) {
        throw new EucalyptusCloudException( "You must specify a keypair when running a windows vm: " + vmAllocInfo.getRequest().getImageId() );
      } else {
        vmAllocInfo.setKeyInfo( new VmKeyInfo() );
        return vmAllocInfo;
      }
    }
    SshKeyPair keypair = KeyPairUtil.getUserKeyPair( vmAllocInfo.getRequest( ).getUserId( ), vmAllocInfo.getRequest( ).getKeyName( ) );
    if ( keypair == null ) {
File
KeyPairManager.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
public class StorageUtil {
  private static Logger LOG = Logger.getLogger( StorageUtil.class );
  
<<<<<<< HEAD
  public static  TYPE send( String clusterName, BaseMessage message ) throws EucalyptusCloudException {
=======
  public static  TYPE send( String clusterName, EucalyptusMessage message ) throws EucalyptusCloudException {
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    StorageControllerConfiguration scConfig = Configuration.lookupSc( clusterName );
    Dispatcher sc = ServiceDispatcher.lookup( Components.lookup("storage"), scConfig.getHostName( ) );
    TYPE reply = (TYPE) sc.send( message );
Solution content 
public class StorageUtil {
  private static Logger LOG = Logger.getLogger( StorageUtil.class );
  
  public static  TYPE send( String clusterName, BaseMessage message ) throws EucalyptusCloudException {
    StorageControllerConfiguration scConfig = Configuration.lookupSc( clusterName );
    Dispatcher sc = ServiceDispatcher.lookup( Components.lookup("storage"), scConfig.getHostName( ) );
    TYPE reply = (TYPE) sc.send( message );
File
StorageUtil.java
Developer's decision
Version 1
Kind of conflict
Method signature
Chunk
Conflicting content 
      LOG.error( e, e );
      credDb.rollback( );
    }
<<<<<<< HEAD
    EventRecord.here( ClusterBuilder.class, EventType.COMPONENT_SERVICE_STOPPED, config.getComponentId( ).name( ), config.getName( ), config.getUri( ) ).info( );
=======
    EventRecord.here( ClusterBuilder.class, EventType.COMPONENT_SERVICE_STOP, config.getComponent( ).name( ), config.getName( ), config.getUri( ) ).info( );
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    Clusters.stop( cluster.getName( ) );
    for( Group g : Groups.listAllGroups( ) ) {
      for( Authorization auth : g.getAuthorizations( ) ) {
Solution content 
      LOG.error( e, e );
      credDb.rollback( );
    }
    EventRecord.here( ClusterBuilder.class, EventType.COMPONENT_SERVICE_STOPPED, config.getComponentId( ).name( ), config.getName( ), config.getUri( ) ).info( );
    Clusters.stop( cluster.getName( ) );
    for( Group g : Groups.listAllGroups( ) ) {
      for( Authorization auth : g.getAuthorizations( ) ) {
File
ClusterBuilder.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.apache.commons.lang.time.StopWatch;
import org.apache.log4j.Logger;
import org.bouncycastle.util.encoders.Base64;
<<<<<<< HEAD
=======
import com.eucalyptus.auth.Groups;
import com.eucalyptus.auth.principal.Authorization;
import com.eucalyptus.auth.principal.AvailabilityZonePermission;
import com.eucalyptus.auth.principal.Group;
import com.eucalyptus.bootstrap.Component;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import com.eucalyptus.component.Components;
import com.eucalyptus.config.Configuration;
import com.eucalyptus.event.EventFailedException;
Solution content 
import org.apache.commons.lang.time.StopWatch;
import org.apache.log4j.Logger;
import org.bouncycastle.util.encoders.Base64;
import com.eucalyptus.component.Components;
import com.eucalyptus.config.Configuration;
import com.eucalyptus.event.EventFailedException;
File
VmInstance.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    }
    } catch ( EventFailedException ex ) {
      LOG.error( ex, ex );
<<<<<<< HEAD
=======
//    EventRecord.here( VmInstance.class, EventClass.VM, EventType.VM_STATE )
//               .withDetails( this.getOwnerId( ), this.getInstanceId( ), "type", this.getVmTypeInfo( ).getName( ) )
//               .withDetails( "state", this.state.getReference( ).name( ) ).withDetails( "cluster", this.placement )
//               /** ASAP: FIXME: GRZE .withDetails( "image", this.imageInfo.getImageId( ) ) **/
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
  }
  
  public String getByKey( String path ) {
Solution content 
    } catch ( EventFailedException ex ) {
      LOG.error( ex, ex );
    }
  }
  
  public String getByKey( String path ) {
File
VmInstance.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
import com.eucalyptus.vm.SystemState.Reason;
import com.eucalyptus.vm.VmState;
import com.eucalyptus.ws.client.ServiceDispatcher;
<<<<<<< HEAD
import com.google.common.base.Predicate;
=======
import com.eucalyptus.records.EventRecord;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import edu.ucsb.eucalyptus.cloud.Network;
import edu.ucsb.eucalyptus.cloud.NetworkToken;
import edu.ucsb.eucalyptus.msgs.AttachedVolume;
Solution content 
import com.eucalyptus.vm.SystemState.Reason;
import com.eucalyptus.vm.VmState;
import com.eucalyptus.ws.client.ServiceDispatcher;
import com.google.common.base.Predicate;
import edu.ucsb.eucalyptus.cloud.Network;
import edu.ucsb.eucalyptus.cloud.NetworkToken;
import edu.ucsb.eucalyptus.msgs.AttachedVolume;
File
VmInstances.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
      rep.setOutput( null );
    }
    try {
<<<<<<< HEAD
      ServiceContext.response( rep );
    } catch ( Exception ex1 ) {
      LOG.error( ex1 , ex1 );
=======
      ServiceContext.dispatch( "ReplyQueue", rep );
    } catch ( EucalyptusCloudException ex ) {
      LOG.error( ex , ex );
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    }
  }
Solution content 
      rep.setOutput( null );
    }
    try {
      ServiceContext.response( rep );
    } catch ( Exception ex1 ) {
      LOG.error( ex1 , ex1 );
    }
  }
File
PasswordDataCallback.java
Developer's decision
Version 1
Kind of conflict
Catch clause
Method invocation
Chunk
Conflicting content 
import com.eucalyptus.cluster.VmInstance;
import com.eucalyptus.cluster.VmInstances;
import com.eucalyptus.entities.EntityWrapper;
<<<<<<< HEAD
=======
import com.eucalyptus.images.Image;
import com.eucalyptus.images.ImageInfo;
import com.eucalyptus.images.ProductCode;
import com.eucalyptus.ldap.LdapConfiguration;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import com.eucalyptus.util.EucalyptusCloudException;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
Solution content 
import com.eucalyptus.cluster.VmInstance;
import com.eucalyptus.cluster.VmInstances;
import com.eucalyptus.entities.EntityWrapper;
import com.eucalyptus.util.EucalyptusCloudException;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
File
ImageManager.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            throw new EucalyptusCloudException( "Referenced ramdisk id is invalid: " + ramdiskId );
          }
        }
<<<<<<< HEAD
        imageInfo.setImageType( ImageManager.IMAGE_MACHINE );
=======
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
        imageInfo.setKernelId( kernelId );
        imageInfo.setRamdiskId( ramdiskId );
        imageInfo.setImageId( ImageUtil.newImageId( ImageManager.IMAGE_MACHINE_PREFIX, imageInfo.getImageLocation( ) ) );
Solution content 
            throw new EucalyptusCloudException( "Referenced ramdisk id is invalid: " + ramdiskId );
          }
        }
        imageInfo.setImageType( ImageManager.IMAGE_MACHINE );
        imageInfo.setKernelId( kernelId );
        imageInfo.setRamdiskId( ramdiskId );
        imageInfo.setImageId( ImageUtil.newImageId( ImageManager.IMAGE_MACHINE_PREFIX, imageInfo.getImageLocation( ) ) );
File
ImageManager.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
import com.eucalyptus.auth.principal.Authorization;
import com.eucalyptus.auth.principal.AvailabilityZonePermission;
import com.eucalyptus.auth.principal.Group;
<<<<<<< HEAD
import java.util.NoSuchElementException;
=======
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import com.eucalyptus.cluster.Cluster;
import com.eucalyptus.cluster.ClusterNodeState;
import com.eucalyptus.cluster.Clusters;
Solution content 
import com.eucalyptus.auth.principal.Authorization;
import com.eucalyptus.auth.principal.AvailabilityZonePermission;
import com.eucalyptus.auth.principal.Group;
import java.util.NoSuchElementException;
import com.eucalyptus.cluster.Cluster;
import com.eucalyptus.cluster.ClusterNodeState;
import com.eucalyptus.cluster.Clusters;
File
NodeResourceAllocator.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
  public void allocate( VmAllocationInfo vmInfo ) throws Exception {
    String clusterName = vmInfo.getRequest( ).getAvailabilityZone( );
    String vmTypeName = vmInfo.getRequest( ).getInstanceType( );
<<<<<<< HEAD
    Integer minAmount = vmInfo.getRequest( ).getMinCount( );
    Integer maxAmount = vmInfo.getRequest( ).getMaxCount( );
=======
    final int amount = vmInfo.getRequest( ).getMinCount( );
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    Context ctx = Contexts.lookup( );
    if ( ctx.getGroups( ).isEmpty( ) ) {
      throw new NotEnoughResourcesAvailable( "Not authorized: you do not have sufficient permission to use " + clusterName );
Solution content 
  public void allocate( VmAllocationInfo vmInfo ) throws Exception {
    String clusterName = vmInfo.getRequest( ).getAvailabilityZone( );
    String vmTypeName = vmInfo.getRequest( ).getInstanceType( );
    Integer minAmount = vmInfo.getRequest( ).getMinCount( );
    Integer maxAmount = vmInfo.getRequest( ).getMaxCount( );
    Context ctx = Contexts.lookup( );
    if ( ctx.getGroups( ).isEmpty( ) ) {
      throw new NotEnoughResourcesAvailable( "Not authorized: you do not have sufficient permission to use " + clusterName );
File
NodeResourceAllocator.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    }
    long splitTime = vm.getSplitTime( );
    VmState oldState = vm.getState( );
<<<<<<< HEAD
=======
    
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    vm.setServiceTag( runVm.getServiceTag( ) );
    vm.setUuid( runVm.getUuid( ) );
    vm.setPlatform( runVm.getPlatform( ) );
Solution content 
    }
    long splitTime = vm.getSplitTime( );
    VmState oldState = vm.getState( );
    vm.setServiceTag( runVm.getServiceTag( ) );
    vm.setUuid( runVm.getUuid( ) );
    vm.setPlatform( runVm.getPlatform( ) );
File
SystemState.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
<<<<<<< HEAD
import com.google.common.collect.Iterables;
import com.eucalyptus.records.EventRecord;
import com.google.common.base.Predicate;
import edu.ucsb.eucalyptus.cloud.VmAllocationInfo;
import edu.ucsb.eucalyptus.msgs.CreatePlacementGroupResponseType;
import edu.ucsb.eucalyptus.msgs.CreatePlacementGroupType;
import edu.ucsb.eucalyptus.msgs.CreateTagsResponseType;
import edu.ucsb.eucalyptus.msgs.CreateTagsType;
import edu.ucsb.eucalyptus.msgs.DeletePlacementGroupResponseType;
import edu.ucsb.eucalyptus.msgs.DeletePlacementGroupType;
import edu.ucsb.eucalyptus.msgs.DeleteTagsResponseType;
import edu.ucsb.eucalyptus.msgs.DeleteTagsType;
import edu.ucsb.eucalyptus.msgs.DescribeBundleTasksResponseType;
import edu.ucsb.eucalyptus.msgs.DescribeBundleTasksType;
import edu.ucsb.eucalyptus.msgs.DescribeInstanceAttributeResponseType;
import edu.ucsb.eucalyptus.msgs.DescribeInstanceAttributeType;
import edu.ucsb.eucalyptus.msgs.DescribeInstancesResponseType;
import edu.ucsb.eucalyptus.msgs.DescribeInstancesType;
import edu.ucsb.eucalyptus.msgs.DescribePlacementGroupsResponseType;
import edu.ucsb.eucalyptus.msgs.DescribePlacementGroupsType;
import edu.ucsb.eucalyptus.msgs.DescribeTagsResponseType;
import edu.ucsb.eucalyptus.msgs.DescribeTagsType;
import edu.ucsb.eucalyptus.msgs.GetConsoleOutputResponseType;
import edu.ucsb.eucalyptus.msgs.GetConsoleOutputType;
import edu.ucsb.eucalyptus.msgs.GetPasswordDataResponseType;
import edu.ucsb.eucalyptus.msgs.GetPasswordDataType;
import edu.ucsb.eucalyptus.msgs.ModifyInstanceAttributeResponseType;
import edu.ucsb.eucalyptus.msgs.ModifyInstanceAttributeType;
import edu.ucsb.eucalyptus.msgs.MonitorInstancesResponseType;
import edu.ucsb.eucalyptus.msgs.MonitorInstancesType;
=======
import edu.ucsb.eucalyptus.msgs.GetConsoleOutputType;
import edu.ucsb.eucalyptus.msgs.GetPasswordDataResponseType;
import edu.ucsb.eucalyptus.msgs.GetPasswordDataType;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import edu.ucsb.eucalyptus.msgs.RebootInstancesResponseType;
import edu.ucsb.eucalyptus.msgs.RebootInstancesType;
import edu.ucsb.eucalyptus.msgs.TerminateInstancesResponseType;
Solution content 
import com.eucalyptus.records.EventRecord;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import edu.ucsb.eucalyptus.cloud.VmAllocationInfo;
import edu.ucsb.eucalyptus.msgs.CreatePlacementGroupResponseType;
import edu.ucsb.eucalyptus.msgs.CreatePlacementGroupType;
import edu.ucsb.eucalyptus.msgs.CreateTagsResponseType;
import edu.ucsb.eucalyptus.msgs.CreateTagsType;
import edu.ucsb.eucalyptus.msgs.DeletePlacementGroupResponseType;
import edu.ucsb.eucalyptus.msgs.DeletePlacementGroupType;
import edu.ucsb.eucalyptus.msgs.DeleteTagsResponseType;
import edu.ucsb.eucalyptus.msgs.DeleteTagsType;
import edu.ucsb.eucalyptus.msgs.DescribeBundleTasksResponseType;
import edu.ucsb.eucalyptus.msgs.DescribeBundleTasksType;
import edu.ucsb.eucalyptus.msgs.DescribeInstanceAttributeResponseType;
import edu.ucsb.eucalyptus.msgs.DescribeInstanceAttributeType;
import edu.ucsb.eucalyptus.msgs.DescribeInstancesResponseType;
import edu.ucsb.eucalyptus.msgs.DescribeInstancesType;
import edu.ucsb.eucalyptus.msgs.DescribePlacementGroupsResponseType;
import edu.ucsb.eucalyptus.msgs.DescribePlacementGroupsType;
import edu.ucsb.eucalyptus.msgs.DescribeTagsResponseType;
import edu.ucsb.eucalyptus.msgs.DescribeTagsType;
import edu.ucsb.eucalyptus.msgs.GetConsoleOutputResponseType;
import edu.ucsb.eucalyptus.msgs.GetConsoleOutputType;
import edu.ucsb.eucalyptus.msgs.GetPasswordDataResponseType;
import edu.ucsb.eucalyptus.msgs.GetPasswordDataType;
import edu.ucsb.eucalyptus.msgs.ModifyInstanceAttributeResponseType;
import edu.ucsb.eucalyptus.msgs.ModifyInstanceAttributeType;
import edu.ucsb.eucalyptus.msgs.MonitorInstancesResponseType;
import edu.ucsb.eucalyptus.msgs.MonitorInstancesType;
import edu.ucsb.eucalyptus.msgs.RebootInstancesResponseType;
import edu.ucsb.eucalyptus.msgs.RebootInstancesType;
import edu.ucsb.eucalyptus.msgs.ResetInstanceAttributeResponseType;
import edu.ucsb.eucalyptus.msgs.ResetInstanceAttributeType;
import edu.ucsb.eucalyptus.msgs.StartInstancesResponseType;
import edu.ucsb.eucalyptus.msgs.StartInstancesType;
import edu.ucsb.eucalyptus.msgs.StopInstancesResponseType;
import edu.ucsb.eucalyptus.msgs.StopInstancesType;
import edu.ucsb.eucalyptus.msgs.TerminateInstancesItemType;
import edu.ucsb.eucalyptus.msgs.TerminateInstancesResponseType;
File
VmControl.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
    if ( !request.isAdministrator( ) && !v.getOwnerId( ).equals( request.getUserId( ) ) ) {
      throw new EucalyptusCloudException( "Permission denied for vm: " + request.getInstanceId( ) );
    } else if ( !VmState.RUNNING.equals( v.getState( ) ) ) {
<<<<<<< HEAD
      GetConsoleOutputResponseType reply = request.getReply( );
      reply.setInstanceId( request.getInstanceId( ) );
      reply.setTimestamp( new Date( ) );
      reply.setOutput( v.getConsoleOutputString( ) );
      ServiceContext.response( reply );
=======
      throw new EucalyptusCloudException( "Instance " + request.getInstanceId( ) + " is not in a running state." );
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    } else {
      Cluster cluster = null;
      try {
Solution content 
    if ( !request.isAdministrator( ) && !v.getOwnerId( ).equals( request.getUserId( ) ) ) {
      throw new EucalyptusCloudException( "Permission denied for vm: " + request.getInstanceId( ) );
    } else if ( !VmState.RUNNING.equals( v.getState( ) ) ) {
      GetConsoleOutputResponseType reply = request.getReply( );
      reply.setInstanceId( request.getInstanceId( ) );
      reply.setTimestamp( new Date( ) );
      reply.setOutput( v.getConsoleOutputString( ) );
      ServiceContext.response( reply );
    } else {
      Cluster cluster = null;
      try {
File
VmControl.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Throw statement
Variable
Chunk
Conflicting content 
    }
    return reply;
  }
<<<<<<< HEAD
  public UnmonitorInstancesResponseType unmonitorInstances(UnmonitorInstancesType request) {
    UnmonitorInstancesResponseType reply = request.getReply( );
    return reply;
  }
  public StartInstancesResponseType startInstances(StartInstancesType request) {
    StartInstancesResponseType reply = request.getReply( );
    return reply;
  }

  public StopInstancesResponseType stopInstances(StopInstancesType request) {
    StopInstancesResponseType reply = request.getReply( );
    return reply;
  }
  public ResetInstanceAttributeResponseType resetInstanceAttribute(ResetInstanceAttributeType request) {
    ResetInstanceAttributeResponseType reply = request.getReply( );
    return reply;
  }
  public MonitorInstancesResponseType monitorInstances(MonitorInstancesType request) {
    MonitorInstancesResponseType reply = request.getReply( );
    return reply;
  }
  public ModifyInstanceAttributeResponseType modifyInstanceAttribute(ModifyInstanceAttributeType request) {
    ModifyInstanceAttributeResponseType reply = request.getReply( );
    return reply;
  }
  public DescribeTagsResponseType describeTags(DescribeTagsType request) {
    DescribeTagsResponseType reply = request.getReply( );
    return reply;
  }

  public DescribePlacementGroupsResponseType describePlacementGroups(DescribePlacementGroupsType request) {
    DescribePlacementGroupsResponseType reply = request.getReply( );
    return reply;
  }

  public DescribeInstanceAttributeResponseType describeInstanceAttribute(DescribeInstanceAttributeType request) {
    DescribeInstanceAttributeResponseType reply = request.getReply( );
    return reply;
  }

  public DeleteTagsResponseType deleteTags(DeleteTagsType request) {
    DeleteTagsResponseType reply = request.getReply( );
    return reply;
  }

  public DeletePlacementGroupResponseType deletePlacementGroup(DeletePlacementGroupType request) {
    DeletePlacementGroupResponseType reply = request.getReply( );
    return reply;
  }

  public CreateTagsResponseType createTags(CreateTagsType request) {
    CreateTagsResponseType reply = request.getReply( );
    return reply;
  }

  public CreatePlacementGroupResponseType createPlacementGroup(CreatePlacementGroupType request) {
    CreatePlacementGroupResponseType reply = request.getReply( );
    return reply;
  }

=======
  
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
  public CancelBundleTaskResponseType cancelBundleTask( CancelBundleTaskType request ) throws EucalyptusCloudException {
    CancelBundleTaskResponseType reply = request.getReply( );
    reply.set_return( true );
Solution content 
    }
    return reply;
  }
  public UnmonitorInstancesResponseType unmonitorInstances(UnmonitorInstancesType request) {
    UnmonitorInstancesResponseType reply = request.getReply( );
    return reply;
  }
  public StartInstancesResponseType startInstances(StartInstancesType request) {
    StartInstancesResponseType reply = request.getReply( );
    return reply;
  }

  public StopInstancesResponseType stopInstances(StopInstancesType request) {
    StopInstancesResponseType reply = request.getReply( );
    return reply;
  }
  public ResetInstanceAttributeResponseType resetInstanceAttribute(ResetInstanceAttributeType request) {
    ResetInstanceAttributeResponseType reply = request.getReply( );
    return reply;
  }
  public MonitorInstancesResponseType monitorInstances(MonitorInstancesType request) {
    MonitorInstancesResponseType reply = request.getReply( );
    return reply;
  }
  public ModifyInstanceAttributeResponseType modifyInstanceAttribute(ModifyInstanceAttributeType request) {
    ModifyInstanceAttributeResponseType reply = request.getReply( );
    return reply;
  }
  public DescribeTagsResponseType describeTags(DescribeTagsType request) {
    DescribeTagsResponseType reply = request.getReply( );
    return reply;
  }

  public DescribePlacementGroupsResponseType describePlacementGroups(DescribePlacementGroupsType request) {
    DescribePlacementGroupsResponseType reply = request.getReply( );
    return reply;
  }

  public DescribeInstanceAttributeResponseType describeInstanceAttribute(DescribeInstanceAttributeType request) {
    DescribeInstanceAttributeResponseType reply = request.getReply( );
    return reply;
  }

  public DeleteTagsResponseType deleteTags(DeleteTagsType request) {
    DeleteTagsResponseType reply = request.getReply( );
    return reply;
  }

  public DeletePlacementGroupResponseType deletePlacementGroup(DeletePlacementGroupType request) {
    DeletePlacementGroupResponseType reply = request.getReply( );
    return reply;
  }

  public CreateTagsResponseType createTags(CreateTagsType request) {
    CreateTagsResponseType reply = request.getReply( );
    return reply;
  }

  public CreatePlacementGroupResponseType createPlacementGroup(CreatePlacementGroupType request) {
    CreatePlacementGroupResponseType reply = request.getReply( );
    return reply;
  }

  public CancelBundleTaskResponseType cancelBundleTask( CancelBundleTaskType request ) throws EucalyptusCloudException {
    CancelBundleTaskResponseType reply = request.getReply( );
    reply.set_return( true );
File
VmControl.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
    }
  }
  
<<<<<<< HEAD
}
=======
}
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
Solution content 
    }
  }
  
}
File
VmControl.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
import java.util.ArrayList;
import java.util.List;
import com.eucalyptus.cluster.VmInstances;
<<<<<<< HEAD
import com.eucalyptus.component.Components;
import com.eucalyptus.component.id.Dns;
=======
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import com.eucalyptus.util.EucalyptusCloudException;
import edu.ucsb.eucalyptus.cloud.Network;
import edu.ucsb.eucalyptus.cloud.ResourceToken;
Solution content 
import java.util.ArrayList;
import java.util.List;
import com.eucalyptus.cluster.VmInstances;
import com.eucalyptus.component.Components;
import com.eucalyptus.component.id.Dns;
import com.eucalyptus.util.EucalyptusCloudException;
import edu.ucsb.eucalyptus.cloud.Network;
import edu.ucsb.eucalyptus.cloud.ResourceToken;
File
VmReplyTransform.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    for( ResourceToken allocToken : vmAllocInfo.getAllocationTokens() )
      for( String instId : allocToken.getInstanceIds() ) {
<<<<<<< HEAD
        reservation.getInstancesSet().add( VmInstances.getInstance().lookup( instId ).getAsRunningInstanceItemType( Components.lookup( Dns.class ).isLocal( ) ) );
=======
        reservation.getInstancesSet().add( VmInstances.getInstance().lookup( instId ).getAsRunningInstanceItemType( Component.dns.isLocal( ) ) );
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
      }

    reply.setRsvInfo( reservation );
Solution content 
    for( ResourceToken allocToken : vmAllocInfo.getAllocationTokens() )
      for( String instId : allocToken.getInstanceIds() ) {
        reservation.getInstancesSet().add( VmInstances.getInstance().lookup( instId ).getAsRunningInstanceItemType( Components.lookup( Dns.class ).isLocal( ) ) );
      }

    reply.setRsvInfo( reservation );
File
VmReplyTransform.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
<<<<<<< HEAD
import com.eucalyptus.accounts.AddGroupMemberResponseType;
import com.eucalyptus.accounts.AddGroupMemberType;
import com.eucalyptus.accounts.AddGroupResponseType;
import com.eucalyptus.accounts.AddGroupType;
import com.eucalyptus.accounts.AddUserResponseType;
import com.eucalyptus.accounts.AddUserType;
import com.eucalyptus.accounts.DeleteGroupResponseType;
import com.eucalyptus.accounts.DeleteGroupType;
import com.eucalyptus.accounts.DeleteUserResponseType;
import com.eucalyptus.accounts.DeleteUserType;
import com.eucalyptus.accounts.DescribeGroupsResponseType;
import com.eucalyptus.accounts.DescribeGroupsType;
import com.eucalyptus.accounts.DescribeUsersResponseType;
import com.eucalyptus.accounts.DescribeUsersType;
import com.eucalyptus.accounts.GrantGroupAuthorizationResponseType;
import com.eucalyptus.accounts.GrantGroupAuthorizationType;
import com.eucalyptus.accounts.GroupInfoType;
import com.eucalyptus.accounts.RemoveGroupMemberResponseType;
import com.eucalyptus.accounts.RemoveGroupMemberType;
import com.eucalyptus.accounts.RevokeGroupAuthorizationResponseType;
import com.eucalyptus.accounts.RevokeGroupAuthorizationType;
import com.eucalyptus.accounts.UserInfoType;
=======
import edu.ucsb.eucalyptus.msgs.AddGroupMemberResponseType;
import edu.ucsb.eucalyptus.msgs.AddGroupMemberType;
import edu.ucsb.eucalyptus.msgs.AddGroupResponseType;
import edu.ucsb.eucalyptus.msgs.AddGroupType;
import edu.ucsb.eucalyptus.msgs.AddUserResponseType;
import edu.ucsb.eucalyptus.msgs.AddUserType;
import edu.ucsb.eucalyptus.msgs.DeleteGroupResponseType;
import edu.ucsb.eucalyptus.msgs.DeleteGroupType;
import edu.ucsb.eucalyptus.msgs.DeleteUserResponseType;
import edu.ucsb.eucalyptus.msgs.DeleteUserType;
import edu.ucsb.eucalyptus.msgs.DescribeGroupsResponseType;
import edu.ucsb.eucalyptus.msgs.DescribeGroupsType;
import edu.ucsb.eucalyptus.msgs.DescribeUsersResponseType;
import edu.ucsb.eucalyptus.msgs.DescribeUsersType;
import edu.ucsb.eucalyptus.msgs.GrantGroupAuthorizationResponseType;
import edu.ucsb.eucalyptus.msgs.GrantGroupAuthorizationType;
import edu.ucsb.eucalyptus.msgs.GroupInfoType;
import edu.ucsb.eucalyptus.msgs.RemoveGroupMemberResponseType;
import edu.ucsb.eucalyptus.msgs.RemoveGroupMemberType;
import edu.ucsb.eucalyptus.msgs.RevokeGroupAuthorizationResponseType;
import edu.ucsb.eucalyptus.msgs.RevokeGroupAuthorizationType;
import edu.ucsb.eucalyptus.msgs.UserInfoType;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934

public class Accounts {
  private static Logger LOG = Logger.getLogger( Accounts.class );
Solution content 
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.eucalyptus.accounts.AddGroupMemberResponseType;
import com.eucalyptus.accounts.AddGroupMemberType;
import com.eucalyptus.accounts.AddGroupResponseType;
import com.eucalyptus.accounts.AddGroupType;
import com.eucalyptus.accounts.AddUserResponseType;
import com.eucalyptus.accounts.AddUserType;
import com.eucalyptus.accounts.DeleteGroupResponseType;
import com.eucalyptus.accounts.DeleteGroupType;
import com.eucalyptus.accounts.DeleteUserResponseType;
import com.eucalyptus.accounts.DeleteUserType;
import com.eucalyptus.accounts.DescribeGroupsResponseType;
import com.eucalyptus.accounts.DescribeGroupsType;
import com.eucalyptus.accounts.DescribeUsersResponseType;
import com.eucalyptus.accounts.DescribeUsersType;
import com.eucalyptus.accounts.GrantGroupAuthorizationResponseType;
import com.eucalyptus.accounts.GrantGroupAuthorizationType;
import com.eucalyptus.accounts.GroupInfoType;
import com.eucalyptus.accounts.RemoveGroupMemberResponseType;
import com.eucalyptus.accounts.RemoveGroupMemberType;
import com.eucalyptus.accounts.RevokeGroupAuthorizationResponseType;
import com.eucalyptus.accounts.RevokeGroupAuthorizationType;
import com.eucalyptus.accounts.UserInfoType;

public class Accounts {
  private static Logger LOG = Logger.getLogger( Accounts.class );
File
Accounts.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
      for ( Component c : Components.list( ) ) {
        for ( Service s : c.getServices( ) ) {
          ServiceConfiguration conf = s.getServiceConfiguration( );
<<<<<<< HEAD
          listConfigs.add( new ComponentInfoType( String.format( "%-15.15s", conf.getComponentId( ).name( ).toUpperCase( ) ) + ( conf.getPartition( ) != null
            ? conf.getPartition( )
            : "-" ),
                                                  conf.getName( ), conf.getHostName( ), s.getState( ).toString( ), "" ) );
          for ( String d : s.getDetails( ) ) {
            listConfigs.add( new ComponentInfoType( String.format( "%-15.15s", conf.getComponentId( ).name( ).toUpperCase( ) ) + ( conf.getPartition( ) != null
              ? conf.getPartition( )
              : "-" ),
=======
          listConfigs.add( new ComponentInfoType( String.format( "%-15.15s", conf.getComponent( ).name( ).toUpperCase( ) ) + ( conf.getPartition( ) != null ?  conf.getPartition( ) : "-" ), 
                                                  conf.getName( ), conf.getHostName( ), s.getState( ).toString( ), "" ) );
          for( String d : s.getDetails( ) ) {
            listConfigs.add( new ComponentInfoType( String.format( "%-15.15s", conf.getComponent( ).name( ).toUpperCase( ) ) + ( conf.getPartition( ) != null ?  conf.getPartition( ) : "-" ), 
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
                                                    conf.getName( ), "detail", d, "" ) );
          }
        }
Solution content 
      for ( Component c : Components.list( ) ) {
        for ( Service s : c.getServices( ) ) {
          ServiceConfiguration conf = s.getServiceConfiguration( );
          listConfigs.add( new ComponentInfoType( String.format( "%-15.15s", conf.getComponentId( ).name( ).toUpperCase( ) ) + ( conf.getPartition( ) != null
            ? conf.getPartition( )
            : "-" ),
                                                  conf.getName( ), conf.getHostName( ), s.getState( ).toString( ), "" ) );
          for ( String d : s.getDetails( ) ) {
            listConfigs.add( new ComponentInfoType( String.format( "%-15.15s", conf.getComponentId( ).name( ).toUpperCase( ) ) + ( conf.getPartition( ) != null
              ? conf.getPartition( )
              : "-" ),
                                                    conf.getName( ), "detail", d, "" ) );
          }
        }
File
Configuration.java
Developer's decision
Version 1
Kind of conflict
For statement
Method invocation
Chunk
Conflicting content 
  }
  
  private static void setupConfigurations( ) {
<<<<<<< HEAD
    ServiceJarDiscovery.runDiscovery( new ComponentDiscovery( ) );
=======
      ServiceJarDiscovery.runDiscovery( new ComponentDiscovery( ) );

      //    Enumeration p1;
      //    URI u = null;
      //    try {
      //      p1 = Thread.currentThread( ).getContextClassLoader( ).getResources( "com.eucalyptus.CloudServiceProvider" );
      //      if ( !p1.hasMoreElements( ) ) return;
      //      while ( p1.hasMoreElements( ) ) {
      //        u = p1.nextElement( ).toURI( );
      //        Properties props = new Properties( );
      //        props.load( u.toURL( ).openStream( ) );
      //        String name = props.getProperty( "name" );
      //        if ( Components.contains( name ) /** make this not use a string? **/ ) {
      //          throw BootstrapException.throwFatal( "Duplicate component definition in: " + u.toASCIIString( ) );
      //        } else {
      //          try {
      //            LOG.debug( "Loaded " + name + " from " + u );
      //            Components.create( name, u );
      //          } catch ( ServiceRegistrationException e ) {
      //            LOG.debug( e, e );
      //            throw BootstrapException.throwFatal( "Error in component bootstrap: " + e.getMessage( ), e );
      //          }
      //        }
      //      }
      //    } catch ( IOException e ) {
      //      LOG.error( e, e );
      //      throw BootstrapException.throwFatal( "Failed to load component resources from: " + u, e );
      //    } catch ( URISyntaxException e ) {
      //      LOG.error( e, e );
      //      throw BootstrapException.throwFatal( "Failed to load component resources from: " + u, e );
      //    }
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
  }
  
  private static File getAndCheckLibDirectory( String eucaHome ) {
Solution content 
  }
  
  private static void setupConfigurations( ) {
    ServiceJarDiscovery.runDiscovery( new ComponentDiscovery( ) );
  }
  
  private static File getAndCheckLibDirectory( String eucaHome ) {
File
StandalonePersistence.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Chunk
Conflicting content 
import com.eucalyptus.auth.Authentication;
import com.eucalyptus.auth.ClusterCredentials;
import com.eucalyptus.auth.X509Cert;
<<<<<<< HEAD
import com.eucalyptus.component.auth.SystemCredentialProvider;
import com.eucalyptus.component.id.Storage;
=======
import com.eucalyptus.bootstrap.Component;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import com.eucalyptus.entities.EntityWrapper;
import com.eucalyptus.util.EucalyptusCloudException;
import com.eucalyptus.util.StorageProperties;
Solution content 
import com.eucalyptus.auth.Authentication;
import com.eucalyptus.auth.ClusterCredentials;
import com.eucalyptus.auth.X509Cert;
import com.eucalyptus.component.auth.SystemCredentialProvider;
import com.eucalyptus.component.id.Storage;
import com.eucalyptus.entities.EntityWrapper;
import com.eucalyptus.util.EucalyptusCloudException;
import com.eucalyptus.util.StorageProperties;
File
BlockStorageUtil.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	static { GroovyUtil.loadConfig("storageprops.groovy"); }

	public static void updateName() {
<<<<<<< HEAD
	  try {
      StorageProperties.NAME = Components.lookup( Storage.class ).getLocalService( ).getServiceConfiguration( ).getPartition( );
    } catch ( NoSuchElementException ex ) {
      LOG.error( ex , ex );
      LOG.error( "Failed to configure Storage Controller NAME." );
      throw ex;
    }
	}

	public static void updateStorageHost() {
    try {
      STORAGE_HOST = Components.lookup( Storage.class ).getLocalService( ).getServiceConfiguration( ).getHostName( );
    } catch ( NoSuchElementException ex ) {
      LOG.error( ex , ex );
      LOG.error( "Failed to configure Storage Controller HOST (given the name " + StorageProperties.NAME + "." );
    }
=======
		try {
			StorageProperties.NAME = Components.lookup( Component.storage ).getLocalService( ).getServiceConfiguration( ).getPartition();
		} catch ( NoSuchElementException ex ) {
			LOG.error( ex , ex );
			LOG.error( "Failed to configure Storage Controller NAME." );
			throw ex;
		}
	}

	public static void updateStorageHost() {
		try {
			STORAGE_HOST = Components.lookup( Component.storage ).getLocalService( ).getServiceConfiguration( ).getHostName( );
		} catch ( NoSuchElementException ex ) {
			LOG.error( ex , ex );
			LOG.error( "Failed to configure Storage Controller HOST (given the name " + StorageProperties.NAME + "." );
		}
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
	}

	public static void updateStorageHost(String hostName) {
Solution content 
	static { GroovyUtil.loadConfig("storageprops.groovy"); }

	public static void updateName() {
	  try {
      StorageProperties.NAME = Components.lookup( Storage.class ).getLocalService( ).getServiceConfiguration( ).getPartition( );
    } catch ( NoSuchElementException ex ) {
      LOG.error( ex , ex );
      LOG.error( "Failed to configure Storage Controller NAME." );
      throw ex;
    }
	}

	public static void updateStorageHost() {
    try {
      STORAGE_HOST = Components.lookup( Storage.class ).getLocalService( ).getServiceConfiguration( ).getHostName( );
    } catch ( NoSuchElementException ex ) {
      LOG.error( ex , ex );
      LOG.error( "Failed to configure Storage Controller HOST (given the name " + StorageProperties.NAME + "." );
    }
	}

	public static void updateStorageHost(String hostName) {
File
StorageProperties.java
Developer's decision
Version 1
Kind of conflict
Method signature
Try statement
Chunk
Conflicting content 
        {
          corId.wait( MAP_GET_WAIT_MS );
        }
<<<<<<< HEAD
        catch ( InterruptedException e ) {
          Thread.currentThread( ).interrupt( );
        }
=======
        catch ( InterruptedException e ) {}
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
      this.waitList.remove( corId );
      if( this.replyMap.containsKey( corId ) )
        reply = this.replyMap.remove( corId );
Solution content 
        {
          corId.wait( MAP_GET_WAIT_MS );
        }
        catch ( InterruptedException e ) {
          Thread.currentThread( ).interrupt( );
        }
      this.waitList.remove( corId );
      if( this.replyMap.containsKey( corId ) )
        reply = this.replyMap.remove( corId );
File
ReplyCoordinator.java
Developer's decision
Version 1
Kind of conflict
Catch clause
Chunk
Conflicting content 
<<<<<<< HEAD
 */
package edu.ucsb.eucalyptus.util;

import org.apache.log4j.Logger;
import com.eucalyptus.component.ComponentIds;
import com.eucalyptus.component.id.Eucalyptus;
import com.eucalyptus.context.Contexts;
import com.eucalyptus.context.IllegalContextAccessException;
=======
import com.eucalyptus.bootstrap.Component;
import com.eucalyptus.util.WalrusProperties;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934


public class UserManagement {
Solution content 
 */
package edu.ucsb.eucalyptus.util;

import org.apache.log4j.Logger;
import com.eucalyptus.component.ComponentIds;
import com.eucalyptus.component.id.Eucalyptus;
import com.eucalyptus.context.Contexts;
import com.eucalyptus.context.IllegalContextAccessException;


public class UserManagement {
File
UserManagement.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
   * boolean
   */
  public static boolean isAdministrator( String userId ) {
<<<<<<< HEAD
    try {
      if( ComponentIds.lookup(Eucalyptus.class).name( ).equals( userId ) || "admin".equals( userId ) || Contexts.lookup( ).getUser( ).isSystem( ) /** <--- the right one **/ ) {
        return true; 
      } else {
        return false;
      }
    } catch ( IllegalContextAccessException ex ) {
      LOG.trace( ex , ex );
      return false;
    }
=======
    if ( Component.eucalyptus.name( ).equals( userId ) || WalrusProperties.ADMIN.equals( userId ) ) return true;
    return false;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
  }

}
Solution content 
   * boolean
   */
  public static boolean isAdministrator( String userId ) {
    try {
      if( ComponentIds.lookup(Eucalyptus.class).name( ).equals( userId ) || "admin".equals( userId ) || Contexts.lookup( ).getUser( ).isSystem( ) /** <--- the right one **/ ) {
        return true; 
      } else {
        return false;
      }
    } catch ( IllegalContextAccessException ex ) {
      LOG.trace( ex , ex );
      return false;
    }
  }

}
File
UserManagement.java
Developer's decision
Version 1
Kind of conflict
If statement
Return statement
Try statement
Chunk
Conflicting content 
  public abstract User getDelegate( );
  public abstract String getPassword( );
  public abstract void setPassword( String password );
<<<<<<< HEAD
  public static final User SYSTEM = new User() { //NOTE:GRZE: this is transitional.  needed for internal communication.
    @Override public String getName( ) {
      return "eucalyptus";
    }
    @Override public X509Certificate getX509Certificate( ) { return null; }
    @Override public Boolean isSystem( ) { return true; }
    @Override public Boolean isAdministrator( ) { return true; }
    @Override public Boolean isEnabled( ) { return true; }
    @Override public List getAllX509Certificates( ) { return null; }
    @Override public void setX509Certificate( X509Certificate cert ) {}    
    @Override public void revokeX509Certificate( ) {}    
    @Override public BigInteger getNumber( ) { return BigInteger.ZERO; }
    @Override public void revokeSecretKey( ) {}
    @Override public String getQueryId( ) { return null; }
    @Override public String getSecretKey( ) { return null; }
    @Override public void setQueryId( String queryId ) {}
    @Override public void setSecretKey( String secretKey ) {}
    @Override public void setAdministrator( Boolean admin ) {}
    @Override public void setEnabled( Boolean enabled ) {}
    @Override public String getToken( ) { return null; }
    @Override public boolean checkToken( String testToken ) { return true; }
    @Override public User getDelegate( ) { return null; }
    @Override public String getPassword( ) { return null; }
    @Override public void setPassword( String password ) {}
  };
=======
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
}
Solution content 
  public abstract User getDelegate( );
  public abstract String getPassword( );
  public abstract void setPassword( String password );
  public static final User SYSTEM = new User() { //NOTE:GRZE: this is transitional.  needed for internal communication.
    @Override public String getName( ) {
      return "eucalyptus";
    }
    @Override public X509Certificate getX509Certificate( ) { return null; }
    @Override public Boolean isSystem( ) { return true; }
    @Override public Boolean isAdministrator( ) { return true; }
    @Override public Boolean isEnabled( ) { return true; }
    @Override public List getAllX509Certificates( ) { return null; }
    @Override public void setX509Certificate( X509Certificate cert ) {}    
    @Override public void revokeX509Certificate( ) {}    
    @Override public BigInteger getNumber( ) { return BigInteger.ZERO; }
    @Override public void revokeSecretKey( ) {}
    @Override public String getQueryId( ) { return null; }
    @Override public String getSecretKey( ) { return null; }
    @Override public void setQueryId( String queryId ) {}
    @Override public void setSecretKey( String secretKey ) {}
    @Override public void setAdministrator( Boolean admin ) {}
    @Override public void setEnabled( Boolean enabled ) {}
    @Override public String getToken( ) { return null; }
    @Override public boolean checkToken( String testToken ) { return true; }
    @Override public User getDelegate( ) { return null; }
    @Override public String getPassword( ) { return null; }
    @Override public void setPassword( String password ) {}
  };
}
File
User.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
import com.eucalyptus.component.Component;
import com.eucalyptus.component.Components;
import com.eucalyptus.component.Service;
<<<<<<< HEAD
import com.eucalyptus.component.ServiceConfiguration;
import com.eucalyptus.component.id.Eucalyptus;
import com.eucalyptus.context.ServiceContextManager;
import com.eucalyptus.empyrean.Empyrean;
=======
import com.eucalyptus.context.ServiceContext;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import com.eucalyptus.records.EventClass;
import com.eucalyptus.records.EventRecord;
import com.eucalyptus.records.EventType;
Solution content 
import com.eucalyptus.component.Component;
import com.eucalyptus.component.Components;
import com.eucalyptus.component.Service;
import com.eucalyptus.component.ServiceConfiguration;
import com.eucalyptus.component.id.Eucalyptus;
import com.eucalyptus.context.ServiceContextManager;
import com.eucalyptus.empyrean.Empyrean;
import com.eucalyptus.records.EventClass;
import com.eucalyptus.records.EventRecord;
import com.eucalyptus.records.EventType;
File
SystemBootstrapper.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.eucalyptus.util.LogUtil;
import com.eucalyptus.util.NetworkUtil;
import com.google.common.base.Functions;
<<<<<<< HEAD
import com.google.common.base.Join;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
=======
import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
import edu.emory.mathcs.backport.java.util.Collections;
import edu.ucsb.eucalyptus.msgs.ClusterInfoType;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934

/**
 * Java entry point from eucalyptus-bootstrap
Solution content 
import com.eucalyptus.util.LogUtil;
import com.eucalyptus.util.NetworkUtil;
import com.google.common.base.Functions;
import com.google.common.base.Join;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;

/**
 * Java entry point from eucalyptus-bootstrap
File
SystemBootstrapper.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
 * Java entry point from eucalyptus-bootstrap
 */
public class SystemBootstrapper {
<<<<<<< HEAD
  private static final String       SEP = " -- ";
  
  private static Logger             LOG = Logger.getLogger( SystemBootstrapper.class );
  
  private static SystemBootstrapper singleton;
  private static ThreadGroup        singletonGroup;
  public static final PrintStream   out = System.out;
  public static final PrintStream   err = System.err;
=======
  private static final String SEP = " -- ";
  static { System.setProperty( "euca.log.level", "TRACE" ); }

  
  private static Logger               LOG          = Logger.getLogger( SystemBootstrapper.class );
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
  
  public static SystemBootstrapper getInstance( ) {
    synchronized ( SystemBootstrapper.class ) {
Solution content 
 * Java entry point from eucalyptus-bootstrap
 */
public class SystemBootstrapper {
  private static final String       SEP = " -- ";
  
  private static Logger             LOG = Logger.getLogger( SystemBootstrapper.class );
  
  private static SystemBootstrapper singleton;
  private static ThreadGroup        singletonGroup;
  public static final PrintStream   out = System.out;
  public static final PrintStream   err = System.err;
  
  public static SystemBootstrapper getInstance( ) {
    synchronized ( SystemBootstrapper.class ) {
File
SystemBootstrapper.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Static initializer
Chunk
Conflicting content 
  
  public boolean init( ) throws Exception {
    try {
<<<<<<< HEAD
      LogLevels.EXTREME = "EXTREME".equals( System.getProperty( "euca.log.level" ).toUpperCase( ) );
      LogLevels.TRACE = "TRACE".equals( System.getProperty( "euca.log.level" ) ) || LogLevels.EXTREME;
      LogLevels.DEBUG = "DEBUG".equals( System.getProperty( "euca.log.level" ) ) || LogLevels.TRACE;
      if ( LogLevels.EXTREME ) {
        System.setProperty( "euca.log.level", "TRACE" );
      }
      System.setOut( new PrintStream( System.out ) {
        public void print( final String string ) {
          if( string.replaceAll("\\s*","").length( ) > 2 ) {
            SystemBootstrapper.out.print( string );
            EventRecord.caller( SystemBootstrapper.class, EventType.BOGUS, string ).info( );
          }
        }
      }
            );
      System.setErr( new PrintStream( System.err ) {
        public void print( final String string ) {
          if( string.replaceAll("\\s*","").length( ) > 2 ) {
            SystemBootstrapper.err.print( string );
            EventRecord.caller( SystemBootstrapper.class, EventType.BOGUS, string ).error( );
          }
        }
      }
            );
      LOG.info( LogUtil.subheader( "Starting system with debugging set as: " + Join.join( "\n", LogLevels.class.getDeclaredFields( ) ) ) );
=======
      boolean doTrace = "TRACE".equals( System.getProperty( "euca.log.level" ) );
      boolean doDebug = "DEBUG".equals( System.getProperty( "euca.log.level" ) ) || doTrace;
      LOG.info( LogUtil.subheader( "Starting system with debugging set as: " + doDebug ) );
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
      Security.addProvider( new BouncyCastleProvider( ) );
      LogLevels.DEBUG = doDebug;
      LogLevels.TRACE = doDebug;
Solution content 
  
  public boolean init( ) throws Exception {
    try {
      LogLevels.EXTREME = "EXTREME".equals( System.getProperty( "euca.log.level" ).toUpperCase( ) );
      LogLevels.TRACE = "TRACE".equals( System.getProperty( "euca.log.level" ) ) || LogLevels.EXTREME;
      LogLevels.DEBUG = "DEBUG".equals( System.getProperty( "euca.log.level" ) ) || LogLevels.TRACE;
      if ( LogLevels.EXTREME ) {
        System.setProperty( "euca.log.level", "TRACE" );
      }
      System.setOut( new PrintStream( System.out ) {
        public void print( final String string ) {
          if( string.replaceAll("\\s*","").length( ) > 2 ) {
            SystemBootstrapper.out.print( string );
            EventRecord.caller( SystemBootstrapper.class, EventType.BOGUS, string ).info( );
          }
        }
      }
            );
      System.setErr( new PrintStream( System.err ) {
        public void print( final String string ) {
          if( string.replaceAll("\\s*","").length( ) > 2 ) {
            SystemBootstrapper.err.print( string );
            EventRecord.caller( SystemBootstrapper.class, EventType.BOGUS, string ).error( );
          }
        }
      }
            );
      LOG.info( LogUtil.subheader( "Starting system with debugging set as: " + Join.join( "\n", LogLevels.class.getDeclaredFields( ) ) ) );
      Security.addProvider( new BouncyCastleProvider( ) );
File
SystemBootstrapper.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
      Bootstrap.Stage stage = Bootstrap.transition( );
      do {
        stage.start( );
<<<<<<< HEAD
      } while ( ( stage = Bootstrap.transition( ) ) != null );
    } catch ( BootstrapException t ) {
      t.printStackTrace( );
      LOG.fatal( t, t );
      throw t;
=======
      } while( ( stage = Bootstrap.transition( ) ) != null );
    } catch ( BootstrapException e ) {
      e.printStackTrace( );
      throw e;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    } catch ( Throwable t ) {
      LOG.fatal( t, t );
      System.exit( 1 );
Solution content 
      Bootstrap.Stage stage = Bootstrap.transition( );
      do {
        stage.start( );
      } while ( ( stage = Bootstrap.transition( ) ) != null );
    } catch ( BootstrapException t ) {
      t.printStackTrace( );
      LOG.fatal( t, t );
      throw t;
    } catch ( Throwable t ) {
      LOG.fatal( t, t );
      System.exit( 1 );
File
SystemBootstrapper.java
Developer's decision
Version 1
Kind of conflict
Catch clause
Method invocation
Throw statement
Variable
Chunk
Conflicting content 
      System.exit( 1 );
      throw t;
    }
<<<<<<< HEAD
    for ( final Component c : Components.list( ) ) {
      if ( ( Components.lookup( Eucalyptus.class ).isLocal( ) && c.getIdentity( ).isCloudLocal( ) || ( c.getIdentity( ).isAlwaysLocal( ) ) ) ) {
        Threads.lookup( Empyrean.class.getName( ) ).submit( new Runnable( ) {
          @Override
          public void run( ) {
            try {
              Component.Transition.STARTING.transit( c );
              Component.Transition.READY_CHECK.transit( c );
              Component.Transition.ENABLING.transit( c );
            } catch ( Throwable ex ) {
              LOG.error( ex , ex );
            }
          }} );
      }
=======
    /** ASAP:FIXME:GRZE **/
    for( Component c : Components.list( ) ) {
      if( ( Components.lookup( "eucalyptus" ).isLocal( ) && c.getPeer( ).isCloudLocal( ) || ( c.getPeer( ).isAlwaysLocal( ) ) ) ) {
        Component.Transition.STARTING.transit( c );
        Component.Transition.READY_CHECK.transit( c );
        Component.Transition.ENABLING.transit( c );
      } 
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    }
    try {
      SystemBootstrapper.printBanner( );
Solution content 
      System.exit( 1 );
      throw t;
    }
    for ( final Component c : Components.list( ) ) {
      if ( ( Components.lookup( Eucalyptus.class ).isLocal( ) && c.getIdentity( ).isCloudLocal( ) || ( c.getIdentity( ).isAlwaysLocal( ) ) ) ) {
        Threads.lookup( Empyrean.class.getName( ) ).submit( new Runnable( ) {
          @Override
          public void run( ) {
            try {
              Component.Transition.STARTING.transit( c );
              Component.Transition.READY_CHECK.transit( c );
              Component.Transition.ENABLING.transit( c );
            } catch ( Throwable ex ) {
              LOG.error( ex , ex );
            }
          }} );
      }
    }
    try {
      SystemBootstrapper.printBanner( );
File
SystemBootstrapper.java
Developer's decision
Version 1
Kind of conflict
Comment
For statement
If statement
Chunk
Conflicting content 
  public boolean stop( ) throws Exception {
    LOG.warn( "Shutting down Eucalyptus." );
    EventRecord.here( SystemBootstrapper.class, EventClass.SYSTEM, EventType.SYSTEM_STOP, "SHUT DOWN" ).info( );
<<<<<<< HEAD
    ServiceContextManager.shutdown( );
=======
    EventRecord.flush( );
    ServiceContext.shutdown( );
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    return true;
  }
Solution content 
  public boolean stop( ) throws Exception {
    LOG.warn( "Shutting down Eucalyptus." );
    EventRecord.here( SystemBootstrapper.class, EventClass.SYSTEM, EventType.SYSTEM_STOP, "SHUT DOWN" ).info( );
    ServiceContextManager.shutdown( );
    return true;
  }
File
SystemBootstrapper.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
import java.util.concurrent.atomic.AtomicReference;
import org.apache.log4j.Logger;
import com.eucalyptus.bootstrap.BootstrapException;
<<<<<<< HEAD
import com.eucalyptus.bootstrap.SystemBootstrapper;
import com.eucalyptus.empyrean.Empyrean;
=======
import com.eucalyptus.component.id.Empyrean;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import com.eucalyptus.event.ClockTick;
import com.eucalyptus.event.Event;
import com.eucalyptus.event.EventListener;
Solution content 
import java.util.concurrent.atomic.AtomicReference;
import org.apache.log4j.Logger;
import com.eucalyptus.bootstrap.BootstrapException;
import com.eucalyptus.bootstrap.SystemBootstrapper;
import com.eucalyptus.empyrean.Empyrean;
import com.eucalyptus.event.ClockTick;
import com.eucalyptus.event.Event;
import com.eucalyptus.event.EventListener;
File
Component.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
  
  /**
   */
  @Override
  public String toString( ) {
<<<<<<< HEAD
    return String.format( "Component %s name=%s enabled=%s local=%s goal=%s state=%s builder=%s\n", this.identity.name( ),
                          this.name, this.enabled, this.local, this.stateMachine.getGoal( ), this.getState( ), this.getBuilder( ) );
=======
    return String.format( "Component %s name=%s enabled=%s local=%s state=%s builder=%s\n", this.component,
                          this.name, this.enabled, this.local, this.getState( ), this.getBuilder( ) );
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
  }
Solution content 
   */
  @Override
  public String toString( ) {
    return String.format( "Component %s name=%s enabled=%s local=%s goal=%s state=%s builder=%s\n", this.identity.name( ),
                          this.name, this.enabled, this.local, this.stateMachine.getGoal( ), this.getState( ), this.getBuilder( ) );
  }
  
  /**
File
Component.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
    return this.getName( ).compareTo( that.getName( ) );
  }
  
<<<<<<< HEAD
=======
  /**
   * REMOVE: promptly. Don't even think about using this.
   * 
   * @deprecated for sucking.
   */
  @Deprecated
  public com.eucalyptus.bootstrap.Component getPeer( ) {
    return this.component;
  }
  
  /**
   * REMOVE: promptly. Don't even think about using this.
   * 
   * @deprecated for sucking, too.
   */
  @Deprecated
  private com.eucalyptus.bootstrap.Component initComponent( ) {
    try {
      com.eucalyptus.bootstrap.Component component = com.eucalyptus.bootstrap.Component.valueOf( name );
      if ( component == null ) {
        throw BootstrapException.throwError( "Error loading component.  Failed to find component named '" + name );
      }
      return component;
    } catch ( Exception e ) {
      throw BootstrapException.throwError( "Error loading component.  Failed to find component named '" + name, e );
    }
  }
  
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
  /**
   * @return the bootstrapper
   */
Solution content 
    return this.getName( ).compareTo( that.getName( ) );
  }
  
  /**
   * @return the bootstrapper
   */
File
Component.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content 
    this.port = 8773;
    this.uriPattern = "http://%s:%d/internal/%s";
    this.uriLocal = String.format( "vm://%sInternal", this.getClass( ).getSimpleName( ) );
<<<<<<< HEAD
    this.modelContent = loadModel();
  }

  private String loadModel( ) {
    StringWriter out = new StringWriter( );
    try {
      InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream( this.getServiceModelFileName( ) );
      if( in == null ) {
        return EMPTY_MODEL;
      } else {
        IOUtils.copy( in, out );
        in.close( );
        out.flush( );
        String outString = out.toString( );
        if( LogLevels.EXTREME ) {
          LOG.trace( "Loaded model for: " + this );
          LOG.trace( outString );
        }
        return outString;
      }
    } catch ( IOException ex ) {
      LOG.error( ex , ex );
      throw BootstrapException.throwError( "BUG! BUG! Failed to load configuration specified for Component: " + this.name, ex );
    }
=======
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
  }

  public String name( ) {
Solution content 
    this.port = 8773;
    this.uriPattern = "http://%s:%d/internal/%s";
    this.uriLocal = String.format( "vm://%sInternal", this.getClass( ).getSimpleName( ) );
    this.modelContent = loadModel();
  }

  private String loadModel( ) {
    StringWriter out = new StringWriter( );
    try {
      InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream( this.getServiceModelFileName( ) );
      if( in == null ) {
        return EMPTY_MODEL;
      } else {
        IOUtils.copy( in, out );
        in.close( );
        out.flush( );
        String outString = out.toString( );
        if( LogLevels.EXTREME ) {
          LOG.trace( "Loaded model for: " + this );
          LOG.trace( outString );
        }
        return outString;
      }
    } catch ( IOException ex ) {
      LOG.error( ex , ex );
      throw BootstrapException.throwError( "BUG! BUG! Failed to load configuration specified for Component: " + this.name, ex );
    }
  }

  public String name( ) {
File
ComponentId.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Method signature
Try statement
Variable
Chunk
Conflicting content 
        }
      }
    };
<<<<<<< HEAD
    
    final TransitionListener addPipelines = Transitions.createListener( new Predicate( ) {
      @Override
      public boolean apply( Component arg0 ) {
        PipelineRegistry.getInstance( ).enable( arg0.getIdentity( ) );
        return true;
      }
    } );
    final TransitionListener removePipelines = Transitions.createListener( new Predicate( ) {
      @Override
      public boolean apply( Component arg0 ) {
        PipelineRegistry.getInstance( ).disable( arg0.getIdentity( ) );
        return true;
      }
    } );
=======
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    
    return new StateMachineBuilder( this.parent, State.PRIMORDIAL ) {
      {
Solution content 
        }
      }
    };
    
    final TransitionListener addPipelines = Transitions.createListener( new Predicate( ) {
      @Override
      public boolean apply( Component arg0 ) {
        PipelineRegistry.getInstance( ).enable( arg0.getIdentity( ) );
        return true;
      }
    } );
    final TransitionListener removePipelines = Transitions.createListener( new Predicate( ) {
      @Override
      public boolean apply( Component arg0 ) {
        PipelineRegistry.getInstance( ).disable( arg0.getIdentity( ) );
        return true;
      }
    } );
    
    return new StateMachineBuilder( this.parent, State.PRIMORDIAL ) {
      {
File
ComponentState.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
  private final Dispatcher           dispatcher;
  private final Component            parent;
  public static String               LOCAL_HOSTNAME = "@localhost";
  private final String               name;
<<<<<<< HEAD
  private final ServiceCredentials   keys;
=======
  private final Credentials          keys;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
  private final ServiceEndpoint      endpoint;
  private final ServiceConfiguration serviceConfiguration;
Solution content 
  public static String               LOCAL_HOSTNAME = "@localhost";
  private final Component            parent;
  private final String               name;
  private final ServiceCredentials   keys;
  private final ServiceEndpoint      endpoint;
  private final Dispatcher           dispatcher;
  private final ServiceConfiguration serviceConfiguration;
File
Service.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
  @Override
  public String toString( ) {
<<<<<<< HEAD:clc/modules/msgs/src/main/java/com/eucalyptus/component/ServiceCredentials.java
    if( this.getCertificate( ) != null ) {
      return String.format( "ServiceCredentials name=%s cert-sn=%s cert-dn=%s", this.getName( ), this.getCertificate( ).getSerialNumber( ), this.getCertificate( ).getSubjectDN( ) );
=======
    if( this.certificate != null ) {
      return String.format( "Credentials name=%s cert-sn=%s cert-dn=%s", this.getName( ), this.getCertificate( ).getSerialNumber( ), this.getCertificate( ).getSubjectDN( ) );
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934:clc/modules/msgs/src/main/java/com/eucalyptus/component/Credentials.java
    } else {
      return String.format( "Credentials name=%s cert-sn=%s cert-dn=%s", this.getName( ), "none", "none" );
    }
Solution content 
  @Override
  public String toString( ) {
    if( this.getCertificate( ) != null ) {
      return String.format( "ServiceCredentials name=%s cert-sn=%s cert-dn=%s", this.getName( ), this.getCertificate( ).getSerialNumber( ), this.getCertificate( ).getSubjectDN( ) );
    } else {
      return String.format( "Credentials name=%s cert-sn=%s cert-dn=%s", this.getName( ), "none", "none" );
    }
File
ServiceCredentials.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Return statement
Chunk
Conflicting content 
            .info( );
          }
        } catch ( InterruptedException e1 ) {
<<<<<<< HEAD
          Thread.currentThread( ).interrupt( );
=======
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
          return;
        } catch ( final ExecutionException e ) {
          LOG.error( e.getCause( ), e.getCause( ) );
Solution content 
            .info( );
          }
        } catch ( InterruptedException e1 ) {
          Thread.currentThread( ).interrupt( );
          return;
        } catch ( final ExecutionException e ) {
          LOG.error( e.getCause( ), e.getCause( ) );
File
ServiceEndpoint.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
          }
        }
      } catch ( InterruptedException e ) {
<<<<<<< HEAD
        Thread.currentThread( ).interrupt( );
=======
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
        LOG.error( e , e );
      }
      return ret;
Solution content 
          }
        }
      } catch ( InterruptedException e ) {
        Thread.currentThread( ).interrupt( );
        LOG.error( e , e );
      }
      return ret;
File
Threads.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
      try {
        this.returnCode = this.self.waitFor( );
      } catch ( InterruptedException e ) {
<<<<<<< HEAD
        Thread.currentThread( ).interrupt( );
=======
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
        LOG.debug( e, e );
      }
    } catch ( Exception e ) {
Solution content 
      try {
        this.returnCode = this.self.waitFor( );
      } catch ( InterruptedException e ) {
        Thread.currentThread( ).interrupt( );
        LOG.debug( e, e );
      }
    } catch ( Exception e ) {
File
ServiceProcess.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
    do {
      try {
        future = futureQueue.poll( 50, TimeUnit.MILLISECONDS );
<<<<<<< HEAD
      } catch ( final InterruptedException e ) {
        Thread.currentThread( ).interrupt( );
      }
=======
      } catch ( final InterruptedException e ) {}
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    } while ( future == null );
    pipeline.remove( "connector" );
Solution content 
    do {
      try {
        future = futureQueue.poll( 50, TimeUnit.MILLISECONDS );
      } catch ( final InterruptedException e ) {
        Thread.currentThread( ).interrupt( );
      }
    } while ( future == null );
    pipeline.remove( "connector" );
File
NioBootstrap.java
Developer's decision
Version 1
Kind of conflict
Catch clause
Chunk
Conflicting content 
    this.outStateListeners.putAll( outStateListeners );
  }
  
<<<<<<< HEAD
  public CheckedListenableFuture
 startTransition( T transitionName ) throws IllegalStateException, ExistingTransitionException {
    if ( this.state.isMarked( ) ) {
      throw new ExistingTransitionException( "Transition request transition=" + transitionName + " rejected because of an ongoing transition: " + this.currentTransition.get( ) );
    } else if ( !this.transitions.containsKey( transitionName ) ) {
=======
  public Callback.Completion startTransition( T transitionName ) throws IllegalStateException, ExistingTransitionException {
    if ( !this.transitions.containsKey( transitionName ) ) {
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
      throw new NoSuchElementException( "No such transition named: " + transitionName.toString( ) + ". Known transitions: " + this.getTransitions( ) );
    } else {
      this.checkTransition( transitionName );
Solution content 
    this.outStateListeners.putAll( outStateListeners );
  }
  
  public CheckedListenableFuture
 startTransition( T transitionName ) throws IllegalStateException, ExistingTransitionException {
    if ( this.state.isMarked( ) ) {
      throw new ExistingTransitionException( "Transition request transition=" + transitionName + " rejected because of an ongoing transition: " + this.currentTransition.get( ) );
    } else if ( !this.transitions.containsKey( transitionName ) ) {
      throw new NoSuchElementException( "No such transition named: " + transitionName.toString( ) + ". Known transitions: " + this.getTransitions( ) );
    } else {
      this.checkTransition( transitionName );
File
AtomicMarkedState.java
Developer's decision
Version 1
Kind of conflict
If statement
Method signature
Throw statement
Chunk
Conflicting content 
    }
  }
  
<<<<<<< HEAD
  public CheckedListenableFuture
 startTransitionTo( S nextState ) throws IllegalStateException, ExistingTransitionException {
    if ( this.state.isMarked( ) ) {
      throw new ExistingTransitionException( "Transition request state=" + nextState + " rejected because of an ongoing transition: " + this.currentTransition.get( ) );
    } else if ( !this.stateTransitions.get( this.state.getReference( ) ).containsKey( nextState ) ) {
=======
  public Callback.Completion startTransitionTo( S nextState ) throws IllegalStateException, ExistingTransitionException {
    if ( !this.stateTransitions.get( this.state.getReference( ) ).containsKey( nextState ) ) {
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
      throw new NoSuchElementException( "No transition to " + nextState.toString( ) + " from current state " + this.toString( ) + ". Known transitions: "
                                        + this.getTransitions( ) );
    } else {
Solution content 
    }
  }
  
  public CheckedListenableFuture
 startTransitionTo( S nextState ) throws IllegalStateException, ExistingTransitionException {
    if ( this.state.isMarked( ) ) {
      throw new ExistingTransitionException( "Transition request state=" + nextState + " rejected because of an ongoing transition: " + this.currentTransition.get( ) );
    } else if ( !this.stateTransitions.get( this.state.getReference( ) ).containsKey( nextState ) ) {
      throw new NoSuchElementException( "No transition to " + nextState.toString( ) + " from current state " + this.toString( ) + ". Known transitions: "
                                        + this.getTransitions( ) );
    } else {
File
AtomicMarkedState.java
Developer's decision
Version 1
Kind of conflict
If statement
Method signature
Throw statement
Chunk
Conflicting content 
      }
      this.currentTransition.set( null );
      this.state.set( tr.getErrorState( ), false );
<<<<<<< HEAD
      this.fireInListeners( tr.getErrorState( ) );
=======
      this.fireInListeners( tr.getToState( ) );
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    }
  }
Solution content 
      }
      this.currentTransition.set( null );
      this.state.set( tr.getErrorState( ), false );
      this.fireInListeners( tr.getErrorState( ) );
    }
  }
File
AtomicMarkedState.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
      }
      this.state.set( tr.getFromState( ), false );
      this.currentTransition.set( null );
<<<<<<< HEAD
      this.fireInListeners( tr.getFromState( ) );
=======
      this.fireInListeners( tr.getToState( ) );
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
    }
  }
Solution content 
      }
      this.state.set( tr.getFromState( ), false );
      this.currentTransition.set( null );
      this.fireInListeners( tr.getFromState( ) );
    }
  }
File
AtomicMarkedState.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.bouncycastle.util.encoders.Base64;

import com.eucalyptus.component.auth.SystemCredentialProvider;
<<<<<<< HEAD
import com.eucalyptus.component.id.Eucalyptus;
=======
import com.eucalyptus.bootstrap.Component;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import com.eucalyptus.util.StorageProperties;
Solution content 
import org.bouncycastle.util.encoders.Base64;

import com.eucalyptus.component.auth.SystemCredentialProvider;
import com.eucalyptus.component.id.Eucalyptus;
import com.eucalyptus.util.StorageProperties;
File
HttpTransfer.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.eucalyptus.auth.api.BaseLoginModule;
import com.eucalyptus.auth.principal.User;
import com.eucalyptus.auth.util.Hashes;
<<<<<<< HEAD
import com.eucalyptus.component.id.Storage;
=======
import com.eucalyptus.bootstrap.Component;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934

public class WalrusComponentLoginModule extends BaseLoginModule {
	private static Logger LOG = Logger.getLogger( WalrusComponentLoginModule.class );
Solution content 
import com.eucalyptus.auth.api.BaseLoginModule;
import com.eucalyptus.auth.principal.User;
import com.eucalyptus.auth.util.Hashes;
import com.eucalyptus.component.id.Storage;

public class WalrusComponentLoginModule extends BaseLoginModule {
	private static Logger LOG = Logger.getLogger( WalrusComponentLoginModule.class );
File
WalrusComponentLoginModule.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import com.eucalyptus.auth.principal.User;
import com.eucalyptus.auth.X509Cert;
import com.eucalyptus.auth.util.Hashes;
<<<<<<< HEAD
import com.eucalyptus.component.id.Eucalyptus;
=======
import com.eucalyptus.bootstrap.Component;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import com.eucalyptus.entities.EntityWrapper;
import com.eucalyptus.util.EucalyptusCloudException;
import com.eucalyptus.util.WalrusProperties;
Solution content 
import com.eucalyptus.auth.principal.User;
import com.eucalyptus.auth.X509Cert;
import com.eucalyptus.auth.util.Hashes;
import com.eucalyptus.component.id.Eucalyptus;
import com.eucalyptus.entities.EntityWrapper;
import com.eucalyptus.util.EucalyptusCloudException;
import com.eucalyptus.util.WalrusProperties;
File
WalrusImageManager.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
						try {
					if(!signatureVerified) {
//							PublicKey publicKey = cert.getPublicKey();
//							sigVerifier.initVerify(publicKey);
//						}

//					}
=======
					//check if Eucalyptus signed it
						throw new DecryptionFailedException("signature verification");
					}

<<<<<<< HEAD
//					//check if Eucalyptus signed it
//					if(!signatureVerified) {
//						try {
//							X509Certificate cert = SystemCredentialProvider.getCredentialProvider(Eucalyptus.class).getCertificate();
//							sigVerifier.update((machineConfiguration + image).getBytes());
//							signatureVerified = sigVerifier.verify(Hashes.hexToBytes(signature));
//						} catch(Exception ex) {
//							db.rollback();
//							LOG.error(ex, ex);
//							throw new DecryptionFailedException("signature verification");
							X509Certificate cert = SystemCredentialProvider.getCredentialProvider(Component.eucalyptus).getCertificate();
							PublicKey publicKey = cert.getPublicKey();
							sigVerifier.initVerify(publicKey);
							sigVerifier.update((machineConfiguration + image).getBytes());
							signatureVerified = sigVerifier.verify(Hashes.hexToBytes(signature));
						} catch(Exception ex) {
							db.rollback();
							LOG.error(ex, ex);
							throw new DecryptionFailedException("signature verification");
						}

					}
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
					if(!signatureVerified) {
						throw new NotAuthorizedException("Invalid signature");
					}
Solution content 
						throw new DecryptionFailedException("signature verification");
					}

//					//check if Eucalyptus signed it
//					if(!signatureVerified) {
//						try {
//							X509Certificate cert = SystemCredentialProvider.getCredentialProvider(Eucalyptus.class).getCertificate();
//							PublicKey publicKey = cert.getPublicKey();
//							sigVerifier.initVerify(publicKey);
//							sigVerifier.update((machineConfiguration + image).getBytes());
//							signatureVerified = sigVerifier.verify(Hashes.hexToBytes(signature));
//						} catch(Exception ex) {
//							db.rollback();
//							LOG.error(ex, ex);
//							throw new DecryptionFailedException("signature verification");
//						}

//					}
					if(!signatureVerified) {
						throw new NotAuthorizedException("Invalid signature");
					}
File
WalrusImageManager.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Chunk
Conflicting content 
  
  @Override
  public boolean start( ) throws Exception {
<<<<<<< HEAD
    Component euca = Components.lookup( Eucalyptus.class );
    for ( final Component comp : Components.list( ) ) {
=======
    boolean failed = false;
    Component euca = Components.lookup( Components.delegate.eucalyptus );
    for ( Component comp : Components.list( ) ) {
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
      EventRecord.here( ServiceVerifyBootstrapper.class, EventType.COMPONENT_INFO, comp.getName( ), comp.isAvailableLocally( ).toString( ) ).info( );
      for ( final ServiceConfiguration s : comp.list( ) ) {
        if ( euca.isLocal( ) && euca.getIdentity( ).hasDispatcher( ) ) {
Solution content 
  
  @Override
  public boolean start( ) throws Exception {
    Component euca = Components.lookup( Eucalyptus.class );
    for ( final Component comp : Components.list( ) ) {
      EventRecord.here( ServiceVerifyBootstrapper.class, EventType.COMPONENT_INFO, comp.getName( ), comp.isAvailableLocally( ).toString( ) ).info( );
      for ( final ServiceConfiguration s : comp.list( ) ) {
        if ( euca.isLocal( ) && euca.getIdentity( ).hasDispatcher( ) ) {
File
ServiceDispatchBootstrapper.java
Developer's decision
Version 1
Kind of conflict
For statement
Method invocation
Variable
Chunk
Conflicting content 
import java.security.GeneralSecurityException;
import org.jboss.netty.channel.ChannelPipeline;
<<<<<<< HEAD

import com.eucalyptus.ws.handlers.InternalWsSecHandler;
import com.eucalyptus.ws.handlers.NioResponseHandler;
import com.eucalyptus.ws.handlers.ResponseHandler;
import com.eucalyptus.ws.protocol.AddressingHandler;
=======
import com.eucalyptus.ws.handlers.ResponseHandler;
import com.eucalyptus.ws.handlers.soap.AddressingHandler;
import com.eucalyptus.ws.handlers.wssecurity.InternalWsSecHandler;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934

public class InternalClientPipeline extends NioClientPipeline {
  public InternalClientPipeline( final ResponseHandler handler ) throws GeneralSecurityException {
Solution content 
import java.security.GeneralSecurityException;
import org.jboss.netty.channel.ChannelPipeline;

import com.eucalyptus.ws.handlers.InternalWsSecHandler;
import com.eucalyptus.ws.handlers.NioResponseHandler;
import com.eucalyptus.ws.handlers.ResponseHandler;
import com.eucalyptus.ws.protocol.AddressingHandler;

public class InternalClientPipeline extends NioClientPipeline {
  public InternalClientPipeline( final ResponseHandler handler ) throws GeneralSecurityException {
File
InternalClientPipeline.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
 *    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
 *    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
 *    ANY SUCH LICENSES OR RIGHTS.
<<<<<<< HEAD
 *******************************************************************************
 * @author: chris grzegorczyk 
=======
 *******************************************************************************/
/*
 * Author: chris grzegorczyk 
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
 */
package com.eucalyptus.ws.server;
Solution content 
 *    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
 *    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
 *    ANY SUCH LICENSES OR RIGHTS.
 *******************************************************************************
 * @author: chris grzegorczyk 
 */
package com.eucalyptus.ws.server;
File
NioHttpConnector.java
Developer's decision
Version 1
Kind of conflict
Comment
Package declaration
Chunk
Conflicting content 
  private static Logger                 LOG = Logger.getLogger( NioServer.class );
  private static Channel                       serverChannel;

<<<<<<< HEAD
=======
  static {
    PipelineRegistry.getInstance( ).register( new HeartbeatPipeline( ) );
    PipelineRegistry.getInstance( ).register( new MetadataPipeline( ) );
    PipelineRegistry.getInstance( ).register( new EucalyptusSoapPipeline( ) );
    PipelineRegistry.getInstance( ).register( new ElasticFoxPipeline( ) );
    PipelineRegistry.getInstance( ).register( new WalrusRESTPipeline( ) );
    PipelineRegistry.getInstance( ).register( new WalrusRESTPostPipeline( ) );
    PipelineRegistry.getInstance( ).register( new EucalyptusQueryPipeline( ) );
    PipelineRegistry.getInstance( ).register( new WalrusSoapPipeline( ) );
    PipelineRegistry.getInstance( ).register( new VMwareSoapPipeline( ) );
  }
  
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
  public NioServer( ) {}

  public static void start( ) {
Solution content 
  private static Logger                 LOG = Logger.getLogger( NioServer.class );
  private static Channel                       serverChannel;

  public NioServer( ) {}

  public static void start( ) {
File
NioServer.java
Developer's decision
Version 1
Kind of conflict
Static initializer
Chunk
Conflicting content 
* 
/*******************************************************************************
<<<<<<< HEAD
 *Copyright (c) 2009  Eucalyptus Systems, Inc.
 * 
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation, only version 3 of the License.
 * 
 * 
 *  This file is distributed in the hope that it will be useful, but WITHOUT
 *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 *  for more details.
 * 
 *  You should have received a copy of the GNU General Public License along
 *  with this program.  If not, see .
 * 
 *  Please contact Eucalyptus Systems, Inc., 130 Castilian
 *  Dr., Goleta, CA 93101 USA or visit 
 *  if you need additional information or have any questions.
 * 
 *  This file may incorporate work covered under the following copyright and
 *  permission notice:
 * 
 *    Software License Agreement (BSD License)
 * 
 *    Copyright (c) 2008, Regents of the University of California
 *    All rights reserved.
 * 
 *    Redistribution and use of this software in source and binary forms, with
 *    or without modification, are permitted provided that the following
 *    conditions are met:
 * 
 *      Redistributions of source code must retain the above copyright notice,
 *      this list of conditions and the following disclaimer.
 * 
 *      Redistributions in binary form must reproduce the above copyright
 *      notice, this list of conditions and the following disclaimer in the
 *      documentation and/or other materials provided with the distribution.
 * 
 *    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 *    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 *    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
 *    PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
 *    OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 *    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 *    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 *    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 *    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 *    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 *    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF
 *    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
 *    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
 *    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
 *    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
 *    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
 *    THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
 *    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
 *    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
 *    ANY SUCH LICENSES OR RIGHTS.
 *******************************************************************************
 * @author: chris grzegorczyk 
=======
*Copyright (c) 2009  Eucalyptus Systems, Inc.
* 
*  This program is free software: you can redistribute it and/or modify
*  it under the terms of the GNU General Public License as published by
*  the Free Software Foundation, only version 3 of the License.
* 
* 
*  This file is distributed in the hope that it will be useful, but WITHOUT
*  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
*  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
*  for more details.
* 
*  You should have received a copy of the GNU General Public License along
*  with this program.  If not, see .
* 
*  Please contact Eucalyptus Systems, Inc., 130 Castilian
*  Dr., Goleta, CA 93101 USA or visit 
*  if you need additional information or have any questions.
*  This file may incorporate work covered under the following copyright and
*  permission notice:
* 
*    Software License Agreement (BSD License)
* 
*    Copyright (c) 2008, Regents of the University of California
*    All rights reserved.
* 
*    Redistribution and use of this software in source and binary forms, with
*    or without modification, are permitted provided that the following
*    conditions are met:
* 
*      Redistributions of source code must retain the above copyright notice,
*      this list of conditions and the following disclaimer.
* 
*      Redistributions in binary form must reproduce the above copyright
*      notice, this list of conditions and the following disclaimer in the
*      documentation and/or other materials provided with the distribution.
* 
*    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
*    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
*    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
*    PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
*    OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
*    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
*    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
*    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
*    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
*    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
*    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF
*    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
*    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
*    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
*    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
*    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
*    THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
*    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
*    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
*    ANY SUCH LICENSES OR RIGHTS.
*******************************************************************************/
/*
 * Author: chris grzegorczyk 
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
 */
package com.eucalyptus.ws.stages;
Solution content 
/*******************************************************************************
 *Copyright (c) 2009  Eucalyptus Systems, Inc.
 * 
 *  This program is free software: you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
 *  the Free Software Foundation, only version 3 of the License.
 * 
 * 
 *  This file is distributed in the hope that it will be useful, but WITHOUT
 *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 *  for more details.
 * 
 *  You should have received a copy of the GNU General Public License along
 *  with this program.  If not, see .
 * 
 *  Please contact Eucalyptus Systems, Inc., 130 Castilian
 *  Dr., Goleta, CA 93101 USA or visit 
 *  if you need additional information or have any questions.
 * 
 *  This file may incorporate work covered under the following copyright and
 *  permission notice:
 * 
 *    Software License Agreement (BSD License)
 * 
 *    Copyright (c) 2008, Regents of the University of California
 *    All rights reserved.
 * 
 *    Redistribution and use of this software in source and binary forms, with
 *    or without modification, are permitted provided that the following
 *    conditions are met:
 * 
 *      Redistributions of source code must retain the above copyright notice,
 *      this list of conditions and the following disclaimer.
 * 
 *      Redistributions in binary form must reproduce the above copyright
 *      notice, this list of conditions and the following disclaimer in the
 *      documentation and/or other materials provided with the distribution.
 * 
 *    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 *    IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 *    TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
 *    PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
 *    OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 *    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
 *    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
 *    PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 *    LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 *    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 *    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. USERS OF
 *    THIS SOFTWARE ACKNOWLEDGE THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE
 *    LICENSED MATERIAL, COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS
 *    SOFTWARE, AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING
 *    IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, SANTA
 *    BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, WHICH IN
 *    THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, REPLACEMENT
 *    OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO IDENTIFIED, OR
 *    WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT NEEDED TO COMPLY WITH
 *    ANY SUCH LICENSES OR RIGHTS.
 *******************************************************************************
 * @author: chris grzegorczyk 
 */
package com.eucalyptus.ws.stages;
File
QueryBindingStage.java
Developer's decision
Version 1
Kind of conflict
Comment
Package declaration
Chunk
Conflicting content 
		try {
			logData.offer(logEntry, 500, TimeUnit.MILLISECONDS);
		} catch(InterruptedException ex) {
<<<<<<< HEAD
      Thread.currentThread( ).interrupt( );
=======

>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
		}
	}
Solution content 
		try {
			logData.offer(logEntry, 500, TimeUnit.MILLISECONDS);
		} catch(InterruptedException ex) {
      Thread.currentThread( ).interrupt( );
		}
	}
File
WalrusBucketLogger.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
          for ( int i = 0; i < 10 && !jettyServer.isStopped( ) && jettyServer.isStopping( ); i++ ) {
            try {
              TimeUnit.MILLISECONDS.sleep( 500 );
<<<<<<< HEAD
            } catch ( InterruptedException e ) {
              Thread.currentThread( ).interrupt( );
            }
=======
            } catch ( InterruptedException e ) {}
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
          }
          jettyServer.destroy( );
        } catch ( Exception e ) {
Solution content 
          for ( int i = 0; i < 10 && !jettyServer.isStopped( ) && jettyServer.isStopping( ); i++ ) {
            try {
              TimeUnit.MILLISECONDS.sleep( 500 );
            } catch ( InterruptedException e ) {
              Thread.currentThread( ).interrupt( );
            }
          }
          jettyServer.destroy( );
        } catch ( Exception e ) {
File
HttpServerBootstrapper.java
Developer's decision
Version 1
Kind of conflict
Catch clause
Chunk
Conflicting content 
import com.eucalyptus.auth.crypto.Certs;
import com.eucalyptus.auth.principal.User;
import com.eucalyptus.auth.util.PEMFiles;
<<<<<<< HEAD
import com.eucalyptus.component.auth.SystemCredentialProvider;
import com.eucalyptus.component.id.Eucalyptus;
=======
import com.eucalyptus.bootstrap.Component;
>>>>>>> 13e51a33c2efb85363bb609279032894335d3934
import edu.ucsb.eucalyptus.cloud.entities.SystemConfiguration;

public class X509Download extends HttpServlet {
Solution content 
import com.eucalyptus.auth.crypto.Certs;
import com.eucalyptus.auth.principal.User;
import com.eucalyptus.auth.util.PEMFiles;
import com.eucalyptus.component.auth.SystemCredentialProvider;
import com.eucalyptus.component.id.Eucalyptus;
import edu.ucsb.eucalyptus.cloud.entities.SystemConfiguration;

public class X509Download extends HttpServlet {
File
X509Download.java
Developer's decision
Version 1
Kind of conflict
Import