| Chunk |
|---|
| Conflicting content |
|---|
import org.junit.Test;
import org.junit.runner.RunWith;
<<<<<<< HEAD:jts/application-component-1/src/main/java/org/jboss/as/quickstarts/cmt/jts/ejb/AccountManagerEJB.java
@EJB(lookup = "corbaname:iiop:localhost:3628#jts-quickstart/InvoiceManagerEJBImpl")
private InvoiceManagerEJBHome invoiceManagerHome;
=======
/**
* A simple test case using Arquillian to test an EJB.
*
* @author david@davidsalter.co.uk
*/
@RunWith(Arquillian.class)
public class GreeterEJBTest {
@Deployment
public static JavaArchive createDeployment() {
return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClasses(GreeterEJB.class);
}
>>>>>>> 566c3cdcb12e7f7991a743c2805fc14f2ac33236:ejb-in-war/src/test/java/org/jboss/as/quickstarts/ejbinwar/test/GreeterEJBTest.java
@EJB
private GreeterEJB greeterEJB; |
| Solution content |
|---|
import org.junit.Test;
import org.junit.runner.RunWith;
/**
* A simple test case using Arquillian to test an EJB.
*
* @author david@davidsalter.co.uk
*/
@RunWith(Arquillian.class)
public class GreeterEJBTest {
@Deployment
public static JavaArchive createDeployment() {
return ShrinkWrap.create(JavaArchive.class, "test.jar")
.addClasses(GreeterEJB.class);
}
@EJB
private GreeterEJB greeterEJB; |
| File |
|---|
| GreeterEJBTest.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| Attribute |
| Class signature |
| Comment |
| Method declaration |
| Chunk |
|---|
| Conflicting content |
|---|
@PersistenceContext
private EntityManager entityManager;
<<<<<<< HEAD
@Resource(mappedName = "java:/queue/JTSQueue")
private Queue queue;
=======
@EJB(lookup = "corbaname:iiop:localhost:3628#jts-quickstart/InvoiceManagerEJBImpl")
private InvoiceManagerEJBHome invoiceManagerHome;
>>>>>>> 566c3cdcb12e7f7991a743c2805fc14f2ac33236
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public void createCustomer(String name) throws RemoteException, JMSException { |
| Solution content |
|---|
@PersistenceContext
private EntityManager entityManager;
@EJB(lookup = "corbaname:iiop:localhost:3628#jts-quickstart/InvoiceManagerEJBImpl")
private InvoiceManagerEJBHome invoiceManagerHome;
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public void createCustomer(String name) throws RemoteException, JMSException { |
| File |
|---|
| CustomerManagerEJB.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
@Resource(mappedName = "java:/JmsXA")
private ConnectionFactory connectionFactory;
<<<<<<< HEAD
@Resource(mappedName = "java:/queue/JTSQueue")
=======
@Resource(mappedName = "java:/queue/jts-quickstart")
>>>>>>> 566c3cdcb12e7f7991a743c2805fc14f2ac33236
private Queue queue;
@TransactionAttribute(TransactionAttributeType.MANDATORY) |
| Solution content |
|---|
@Resource(mappedName = "java:/JmsXA")
private ConnectionFactory connectionFactory;
@Resource(mappedName = "java:/queue/jts-quickstart")
private Queue queue;
@TransactionAttribute(TransactionAttributeType.MANDATORY) |
| File |
|---|
| InvoiceManagerEJBImpl.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| Chunk |
|---|
| Conflicting content |
|---|
*/
@MessageDriven(name = "HelloWorldMDB", activationConfig = {
@ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
<<<<<<< HEAD
@ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/JTSQueue"),
=======
@ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/jts-quickstart"),
>>>>>>> 566c3cdcb12e7f7991a743c2805fc14f2ac33236
@ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
public class HelloWorldMDB implements MessageListener {
|
| Solution content |
|---|
*/
@MessageDriven(name = "HelloWorldMDB", activationConfig = {
@ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
@ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/jts-quickstart"),
@ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge") })
public class HelloWorldMDB implements MessageListener {
|
| File |
|---|
| HelloWorldMDB.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |