milenkovicm

package com.example

import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.*;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


public class CdiExtension implements Extension {

milenkovicm

<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://java.sun.com/xml/ns/javaee"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">

   <!-- Enable JCACHE interceptors -->
   <interceptors>
      <class>org.infinispan.cdi.interceptor.CacheResultInterceptor</class>
      <class>org.infinispan.cdi.interceptor.CacheRemoveEntryInterceptor</class>
      <class>org.infinispan.cdi.interceptor.CacheRemoveAllInterceptor</class>

milenkovicm

public class JBoss7TransactionManagerLookup implements TransactionManagerLookup {
   public TransactionManager getTransactionManager() throws Exception {
      InitialContext ic = new InitialContext();
      TransactionManager tm  = (TransactionManager) ic.lookup("java:jboss/TransactionManager");
      if (tm == null) throw new IllegalStateException("Couldn't find the transaction mamager in JNDI");
      return tm;
   }
}

milenkovicm

   /** The Resource adapter can't depend on any provider's specific library. Because of that we use reflection to locate the
    *  transaction manager during startup.
    *
    *
    *  TODO: https://jira.jboss.org/browse/HORNETQ-417
    *        We should use a proper SPI instead of reflection
    *        We would need to define a proper SPI package for this.
    *  */
   public static TransactionManager locateTM(final String locatorClass, final String locatorMethod)
   {

milenkovicm

Simplest way to git a list of conflicted files

$git ls-files -u | cut -f 2 | sort -u

$git ls-files -u | awk '{print $4}' | sort | uniq

or just add an alias

milenkovicm

[core]
	repositoryformatversion = 0
	filemode = false
	logallrefupdates = true
	autocrlf = false
[color]
	branch = auto
	diff = auto
	status = auto
[color "branch"]

milenkovicm

/*
 * Copyright (c) 2012 Marko Milenkovic
 * 
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
 * "Software"), to deal in the Software without restriction, including
 * without limitation the rights to use, copy, modify, merge, publish,
 * distribute, sublicense, and/or sell copies of the Software, and to
 * permit persons to whom the Software is furnished to do so, subject to
 * the following conditions:

milenkovicm

/*
 * Copyright (c) 2012 Marko Milenkovic
 * 
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
 * "Software"), to deal in the Software without restriction, including
 * without limitation the rights to use, copy, modify, merge, publish,
 * distribute, sublicense, and/or sell copies of the Software, and to
 * permit persons to whom the Software is furnished to do so, subject to
 * the following conditions:

milenkovicm

package com.example;


import javax.inject.Inject;

import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.WebArchive;

milenkovicm

package com.example.util;

import java.io.File;
import java.io.InputStream;

import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public final class ResourceReader {