DATAJPA-136 - Initial draft of CDI integration.

Implemented CDI integration based on the Spring Data Commons code introduced in DATACMNS-110.

pom.xml

@@ -64,6 +64,8 @@
 		<junit.version>4.8.1</junit.version>
 		<jpa.version>2.0.0</jpa.version>
 		<slf4j.version>1.6.1</slf4j.version>
+		<cdi.version>1.0</cdi.version>
+		<webbeans.version>1.1.3</webbeans.version>
 		
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<dist.id>spring-data-jpa</dist.id>
@@ -418,6 +420,37 @@
 			<version>${querydsl.version}</version>
 			<optional>true</optional>
 		</dependency>
+		
+		<!-- CDI -->
+		<dependency>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
+			<version>${cdi.version}</version>
+			<scope>provided</scope>
+			<optional>true</optional>
+		</dependency>
+		
+		<dependency>
+			<groupId>javax.el</groupId>
+			<artifactId>el-api</artifactId>
+			<version>${cdi.version}</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.openwebbeans.test</groupId>
+			<artifactId>cditest-owb</artifactId>
+			<version>${webbeans.version}</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>test</scope>
+		</dependency>
+		
 	</dependencies>
 	
 	<build>

src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryBean.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import java.lang.annotation.Annotation;
+import java.util.Set;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.persistence.EntityManager;
+
+import org.springframework.data.jpa.repository.support.JpaRepositoryFactory;
+import org.springframework.data.repository.cdi.CdiRepositoryBean;
+import org.springframework.util.Assert;
+
+/**
+ * A bean which represents a JPA repository.
+ * 
+ * @author Dirk Mahler
+ * @author Oliver Gierke
+ * 
+ * @param <T> The type of the repository.
+ */
+class JpaRepositoryBean<T> extends CdiRepositoryBean<T> {
+
+	private final Bean<EntityManager> entityManagerBean;
+
+	/**
+	 * Constructs a {@link JpaRepositoryBean}.
+	 * 
+	 * @param beanManager must not be {@literal null}.
+	 * @param entityManagerBean must not be {@literal null}.
+	 * @param qualifiers must not be {@literal null}.
+	 * @param repositoryType must not be {@literal null}.
+	 */
+	JpaRepositoryBean(BeanManager beanManager, Bean<EntityManager> entityManagerBean, Set<Annotation> qualifiers,
+			Class<T> repositoryType) {
+
+		super(qualifiers, repositoryType, beanManager);
+
+		Assert.notNull(entityManagerBean);
+		this.entityManagerBean = entityManagerBean;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see javax.enterprise.context.spi.Contextual#create(javax.enterprise .context.spi.CreationalContext)
+	 */
+	@Override
+	public T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {
+
+		// Get an instance from the associated entity manager bean.
+		EntityManager entityManager = getDependencyInstance(entityManagerBean, EntityManager.class);
+		// Create the JPA repository instance and return it.
+		JpaRepositoryFactory factory = new JpaRepositoryFactory(entityManager);
+		return factory.getRepository(repositoryType);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see javax.enterprise.inject.spi.Bean#getScope()
+	 */
+	public Class<? extends Annotation> getScope() {
+
+		// The repository uses the same scope as the associated EntityManager.
+		return entityManagerBean.getScope();
+	}
+}

src/main/java/org/springframework/data/jpa/repository/cdi/JpaRepositoryExtension.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.ProcessBean;
+import javax.persistence.EntityManager;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
+
+/**
+ * A portable CDI extension which registers beans for Spring Data JPA repositories.
+ * 
+ * @author Dirk Mahler
+ * @author Oliver Gierke
+ */
+public class JpaRepositoryExtension extends CdiRepositoryExtensionSupport {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(JpaRepositoryExtension.class);
+
+	private final Map<Set<Annotation>, Bean<EntityManager>> entityManagers = new HashMap<Set<Annotation>, Bean<EntityManager>>();
+
+	public JpaRepositoryExtension() {
+		LOGGER.info("Activating CDI extension for Spring Data JPA repositories.");
+	}
+
+	/**
+	 * Implementation of a an observer which checks for EntityManager beans and stores them in {@link #entityManagers} for
+	 * later association with corresponding repository beans.
+	 * 
+	 * @param <X> The type.
+	 * @param processAnnotatedType The annotated type as defined by CDI.
+	 */
+	@SuppressWarnings("unchecked")
+	<X> void processBean(@Observes ProcessBean<X> processBean) {
+		Bean<X> bean = processBean.getBean();
+		for (Type type : bean.getTypes()) {
+			// Check if the bean is an EntityManager.
+			if (type instanceof Class<?> && EntityManager.class.isAssignableFrom((Class<?>) type)) {
+				LOGGER.debug("Discovered '{}' with qualifiers {}.", EntityManager.class.getName(), bean.getQualifiers());
+				// Store the EntityManager bean using its qualifiers.
+				entityManagers.put(new HashSet<Annotation>(bean.getQualifiers()), (Bean<EntityManager>) bean);
+			}
+		}
+	}
+
+	/**
+	 * Implementation of a an observer which registers beans to the CDI container for the detected Spring Data
+	 * repositories.
+	 * <p>
+	 * The repository beans are associated to the EntityManagers using their qualifiers.
+	 * 
+	 * @param beanManager The BeanManager instance.
+	 */
+	void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager) {
+
+		for (Entry<Class<?>, Set<Annotation>> entry : getRepositoryTypes()) {
+
+			Class<?> repositoryType = entry.getKey();
+			Set<Annotation> qualifiers = entry.getValue();
+			// Create the bean representing the repository.
+			Bean<?> repositoryBean = createRepositoryBean(repositoryType, qualifiers, beanManager);
+			LOGGER.info("Registering bean for '{}' with qualifiers {}.", repositoryType.getName(), qualifiers);
+			// Register the bean to the container.
+			afterBeanDiscovery.addBean(repositoryBean);
+		}
+	}
+
+	/**
+	 * Creates a {@link Bean}.
+	 * 
+	 * @param <T> The type of the repository.
+	 * @param repositoryType The class representing the repository.
+	 * @param beanManager The BeanManager instance.
+	 * @return The bean.
+	 */
+	private <T> Bean<T> createRepositoryBean(Class<T> repositoryType, Set<Annotation> qualifiers, BeanManager beanManager) {
+
+		// Determine the entity manager bean which matches the qualifiers of the repository.
+		Bean<EntityManager> entityManagerBean = entityManagers.get(qualifiers);
+
+		if (entityManagerBean == null) {
+			throw new UnsatisfiedResolutionException(String.format("Unable to resolve a bean for '%s' with qualifiers %s.",
+					EntityManager.class.getName(), qualifiers));
+		}
+
+		// Construct and return the repository bean.
+		return new JpaRepositoryBean<T>(beanManager, entityManagerBean, qualifiers, repositoryType);
+	}
+}

src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension

@@ -0,0 +1 @@
+org.springframework.data.jpa.repository.cdi.JpaRepositoryExtension

src/test/java/org/springframework/data/jpa/repository/cdi/CdiExtensionintegrationTests.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import org.apache.webbeans.cditest.CdiTestContainer;
+import org.apache.webbeans.cditest.CdiTestContainerLoader;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Integration tests for Spring Data JPA CDI extension.
+ * 
+ * @author Dirk Mahler
+ * @author Oliver Gierke
+ */
+public class CdiExtensionintegrationTests {
+
+	static CdiTestContainer container;
+
+	@BeforeClass
+	public static void setUp() throws Exception {
+		container = CdiTestContainerLoader.getCdiContainer();
+		container.bootContainer();
+	}
+
+	@Test
+	public void saveAndFindAll() {
+
+		RepositoryConsumer repositoryConsumer = container.getInstance(RepositoryConsumer.class);
+
+		Person person = new Person();
+		repositoryConsumer.save(person);
+		repositoryConsumer.findAll();
+	}
+}

src/test/java/org/springframework/data/jpa/repository/cdi/EntityManagerFactoryProducer.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+
+class EntityManagerFactoryProducer {
+
+	@Produces
+	@ApplicationScoped
+	public EntityManagerFactory createEntityManagerFactory() {
+		return Persistence.createEntityManagerFactory("cdi");
+	}
+
+	public void close(@Disposes EntityManagerFactory entityManagerFactory) {
+		entityManagerFactory.close();
+	}
+}

src/test/java/org/springframework/data/jpa/repository/cdi/Person.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+class Person {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private long id;
+
+	private String name;
+
+	public long getId() {
+		return id;
+	}
+
+	public void setId(long id) {
+		this.id = id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+}

src/test/java/org/springframework/data/jpa/repository/cdi/PersonDB.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
+@interface PersonDB {
+
+}

src/test/java/org/springframework/data/jpa/repository/cdi/PersonRepository.java

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import java.util.List;
+
+interface PersonRepository {
+
+	List<Person> findAll();
+
+	void save(Person person);
+}

src/test/java/org/springframework/data/jpa/repository/cdi/QualifiedEntityManagerProducer.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+class QualifiedEntityManagerProducer {
+
+	@Produces
+	@PersonDB
+	public EntityManager createEntityManager(EntityManagerFactory entityManagerFactory) {
+		return entityManagerFactory.createEntityManager();
+	}
+
+	public void close(@Disposes @PersonDB EntityManager entityManager) {
+		entityManager.close();
+	}
+}

src/test/java/org/springframework/data/jpa/repository/cdi/QualifiedPersonRepository.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import org.springframework.data.repository.Repository;
+
+@PersonDB
+interface QualifiedPersonRepository extends PersonRepository, Repository<Person, Long> {
+
+}

src/test/java/org/springframework/data/jpa/repository/cdi/RepositoryConsumer.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import javax.inject.Inject;
+
+@Transactional
+class RepositoryConsumer {
+
+	@Inject
+	private PersonRepository unqualifiedRepo;
+
+	@Inject
+	@PersonDB
+	private PersonRepository qualifiedRepo;
+
+	public void findAll() {
+		unqualifiedRepo.findAll();
+		qualifiedRepo.findAll();
+	}
+
+	public void save(Person person) {
+		unqualifiedRepo.save(person);
+		qualifiedRepo.save(person);
+	}
+}

src/test/java/org/springframework/data/jpa/repository/cdi/Transactional.java

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.interceptor.InterceptorBinding;
+
+@InterceptorBinding
+@Target({ ElementType.METHOD, ElementType.TYPE })
+@Retention(RetentionPolicy.RUNTIME)
+@interface Transactional {
+
+}

src/test/java/org/springframework/data/jpa/repository/cdi/TransactionalInterceptor.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import javax.enterprise.inject.Any;
+import javax.inject.Inject;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityTransaction;
+
+@Transactional
+@Interceptor
+class TransactionalInterceptor {
+
+	@Inject
+	@Any
+	private EntityManager entityManager;
+
+	@AroundInvoke
+	public Object runInTransaction(InvocationContext ctx) throws Exception {
+		EntityTransaction entityTransaction = this.entityManager.getTransaction();
+		boolean isNew = !entityTransaction.isActive();
+		try {
+			if (isNew) {
+				entityTransaction.begin();
+			}
+			Object result = ctx.proceed();
+			if (isNew) {
+				entityTransaction.commit();
+			}
+			return result;
+		} catch (RuntimeException r) {
+			if (isNew) {
+				entityTransaction.rollback();
+			}
+			throw r;
+		}
+	}
+}

src/test/java/org/springframework/data/jpa/repository/cdi/UnqualifiedEntityManagerProducer.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import javax.enterprise.inject.Disposes;
+import javax.enterprise.inject.Produces;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+
+class UnqualifiedEntityManagerProducer {
+
+	@Produces
+	public EntityManager createEntityManager(EntityManagerFactory entityManagerFactory) {
+		return entityManagerFactory.createEntityManager();
+	}
+
+	public void close(@Disposes EntityManager entityManager) {
+		entityManager.close();
+	}
+}

src/test/java/org/springframework/data/jpa/repository/cdi/UnqualifiedPersonRepository.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.jpa.repository.cdi;
+
+import org.springframework.data.repository.Repository;
+
+interface UnqualifiedPersonRepository extends PersonRepository, Repository<Person, Long> {
+
+}

src/test/resources/META-INF/beans.xml

@@ -0,0 +1,6 @@
+<?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">
+</beans>
+

src/test/resources/META-INF/persistence.xml

@@ -17,4 +17,18 @@
 		<class>org.springframework.data.jpa.domain.sample.User</class>
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
 	</persistence-unit>
+	<persistence-unit name="cdi">
+		<provider>org.hibernate.ejb.HibernatePersistence</provider>
+		<class>org.springframework.data.jpa.domain.sample.User</class>
+		<class>org.springframework.data.jpa.repository.cdi.Person</class>
+		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+		<properties>
+			<property name="hibernate.connection.username" value="sa" />
+			<property name="hibernate.connection.driver_class" value="org.hsqldb.jdbcDriver" />
+			<property name="hibernate.connection.password" value="" />
+			<property name="hibernate.connection.url" value="jdbc:hsqldb:mem:cdi" />
+			<property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" />
+			<property name="hibernate.hbm2ddl.auto" value="update" />
+		</properties>
+	</persistence-unit>
 </persistence>

src/test/resources/infrastructure.xml

@@ -10,6 +10,7 @@
 	<bean id="entityManagerFactory"
 		class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
 		<property name="dataSource" ref="dataSource" />
+		<property name="persistenceUnitName" value="default" />
 		<property name="jpaVendorAdapter" ref="vendorAdaptor" />
 		<property name="jpaProperties" ref="jpaProperties" />
 	</bean>

template.mf

@@ -10,6 +10,7 @@ Import-Template:
  com.mysema.query.*;version="${querydsl.version:[=.=.=,+1.0.0)}";resolution:=optional,
  javax.persistence.*;version="${jpa.version:[=.=.=,+1.0.0)}",
  javax.annotation.*;version="0.0.0",
+ javax.enterprise.*;version="${cdi.version:[=.=.=,+1.0.0)}";resolution:=optional,
  org.aopalliance.*;version="[1.0.0,2.0.0)", 
  org.apache.openjpa.persistence.*;version="${openjpa.version:[=.=.=,+1.0.0)}";resolution:=optional, 
  org.aspectj.*;version="${aspectj.version:[=.=.=,+1.0.0)}";resolution:=optional,