Projects >> openengsb >>bbeec006ba7bd1c4f279784b6cbfc49da8d5b92a

Chunk
Conflicting content 
                        .versionAsInProject()),
            scanFeatures(
                maven().groupId("org.openengsb").artifactId("openengsb").type("xml").classifier("features-itests")
<<<<<<< HEAD
                    .versionAsInProject(), "openengsb-infrastructure-jpa", "activemq-blueprint",
                "openengsb-connector-memoryauditing", "openengsb-ui-admin"),
=======
                    .versionAsInProject(), "openengsb-connector-memoryauditing", "openengsb-ui-admin"),
>>>>>>> 6d7fca4cd0b0b3a16a739396ea3e450923d61b2f
            workingDirectory(getWorkingDirectory()),
            vmOption("-Dorg.osgi.framework.system.packages.extra=com.sun.org.apache.xerces.internal.dom," 
                + "com.sun.org.apache.xerces.internal.jaxp,org.apache.karaf.branding,sun.reflect"),
Solution content 
                        .versionAsInProject()),
            scanFeatures(
                maven().groupId("org.openengsb").artifactId("openengsb").type("xml").classifier("features-itests")
                    .versionAsInProject(), "openengsb-connector-memoryauditing", "openengsb-ui-admin"),
            workingDirectory(getWorkingDirectory()),
            vmOption("-Dorg.osgi.framework.system.packages.extra=com.sun.org.apache.xerces.internal.dom," 
                + "com.sun.org.apache.xerces.internal.jaxp,org.apache.karaf.branding,sun.reflect"),
File
AbstractExamTestHelper.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.StringResourceModel;
import org.openengsb.ui.admin.basePage.BasePage;
<<<<<<< HEAD
import org.openengsb.ui.admin.model.UsernamePassword;
=======
import org.ops4j.pax.wicket.api.PaxWicketMountPoint;
>>>>>>> 6d7fca4cd0b0b3a16a739396ea3e450923d61b2f

@PaxWicketMountPoint(mountPoint = "login")
public class LoginPage extends BasePage {
Solution content 
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.StringResourceModel;
import org.openengsb.ui.admin.basePage.BasePage;
import org.openengsb.ui.admin.model.UsernamePassword;
import org.ops4j.pax.wicket.api.PaxWicketMountPoint;

@PaxWicketMountPoint(mountPoint = "login")
public class LoginPage extends BasePage {
File
LoginPage.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import org.openengsb.core.api.security.UserManager;
import org.openengsb.core.common.util.Users;
import org.openengsb.ui.admin.basePage.BasePage;
<<<<<<< HEAD
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
=======
import org.ops4j.pax.wicket.api.PaxWicketBean;
import org.ops4j.pax.wicket.api.PaxWicketMountPoint;
>>>>>>> 6d7fca4cd0b0b3a16a739396ea3e450923d61b2f
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.GrantedAuthorityImpl;
import org.springframework.security.core.userdetails.User;
Solution content 
import org.openengsb.core.api.security.UserManager;
import org.openengsb.core.common.util.Users;
import org.openengsb.ui.admin.basePage.BasePage;
import org.ops4j.pax.wicket.api.PaxWicketBean;
import org.ops4j.pax.wicket.api.PaxWicketMountPoint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.GrantedAuthorityImpl;
import org.springframework.security.core.userdetails.User;
File
UserService.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.openengsb.core.api.security.UserManager;
<<<<<<< HEAD
import org.openengsb.core.common.util.Users;
=======
import org.openengsb.core.api.security.model.User;
import org.openengsb.core.security.internal.UserManagerImpl;
import org.ops4j.pax.wicket.api.ApplicationLifecycleListener;
import org.ops4j.pax.wicket.test.spring.PaxWicketSpringBeanComponentInjector;
>>>>>>> 6d7fca4cd0b0b3a16a739396ea3e450923d61b2f
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.authentication.ProviderManager;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
Solution content 
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.openengsb.core.api.security.UserManager;
import org.openengsb.core.common.util.Users;
import org.ops4j.pax.wicket.api.ApplicationLifecycleListener;
import org.ops4j.pax.wicket.test.spring.PaxWicketSpringBeanComponentInjector;
import org.springframework.security.authentication.AuthenticationProvider;
import org.springframework.security.authentication.ProviderManager;
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
File
AbstractLoginTest.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.Arrays;
import java.util.List;

<<<<<<< HEAD
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
import org.apache.wicket.spring.test.ApplicationContextMock;
=======
>>>>>>> 6d7fca4cd0b0b3a16a739396ea3e450923d61b2f
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.Before;
Solution content 
import java.util.Arrays;
import java.util.List;

import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.Before;
File
UserServiceTest.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
package org.openengsb.ui.admin.workflowEditor;

<<<<<<< HEAD
import static junit.framework.Assert.assertNull;
=======

>>>>>>> 6d7fca4cd0b0b3a16a739396ea3e450923d61b2f
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.sameInstance;
import static org.junit.Assert.assertNull;
Solution content 
package org.openengsb.ui.admin.workflowEditor;

import static junit.framework.Assert.assertNull;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.sameInstance;
File
WorkflowEditorTest.java
Developer's decision
Version 1
Kind of conflict
Import