Merge branch 'master' of github.com:javaee-samples/javaee7-samples

Author: arun-gupta

jpa/datasourcedefinition/pom.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.javaee7.jpa</groupId>
+        <artifactId>jpa-samples</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>datasourcedefinition</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.3.173</version>
+        </dependency>
+    </dependencies>
+</project>

jpa/datasourcedefinition/src/main/java/org/javaee7/jpa/datasourcedefinition/DataSourceDefinitionHolder.java

@@ -0,0 +1,14 @@
+package org.javaee7.jpa.datasourcedefinition;
+
+import javax.annotation.sql.DataSourceDefinition;
+import javax.ejb.Stateless;
+
+/**
+ * @author Alexis Hassler
+ */
+@DataSourceDefinition(name = "java:global/MyApp/MyDataSource",
+                      className = "org.h2.jdbcx.JdbcDataSource",
+                      url = "jdbc:h2:mem:test")
+@Stateless
+public class DataSourceDefinitionHolder {
+}

jpa/datasourcedefinition/src/test/java/org/javaee7/jpa/datasourcedefinition/DataSourceDefinitionTest.java

@@ -0,0 +1,44 @@
+package org.javaee7.jpa.datasourcedefinition;
+
+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;
+import org.jboss.shrinkwrap.resolver.api.maven.Maven;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.Resource;
+import javax.sql.DataSource;
+
+import java.io.File;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+/**
+ * @author Alexis Hassler
+ */
+@RunWith(Arquillian.class)
+public class DataSourceDefinitionTest {
+    @Deployment
+    public static Archive<?> deploy() {
+        File h2Library = Maven.resolver().loadPomFromFile("pom.xml")
+                .resolve("com.h2database:h2").withoutTransitivity()
+                .asSingleFile();
+
+        return ShrinkWrap.create(WebArchive.class)
+                .addClasses(DataSourceDefinitionHolder.class)
+                .addAsLibraries(h2Library);
+    }
+
+    @Resource(lookup = "java:global/MyApp/MyDataSource") DataSource dataSource;
+
+    @Test
+    public void should_bean_be_injected() throws Exception {
+        assertThat(dataSource, is(notNullValue()));
+        assertThat(dataSource.getConnection(), is(notNullValue()));
+    }
+}

jpa/datasourcedefinition/src/test/resources/arquillian.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://jboss.org/schema/arquillian" xsi:schemaLocation="http://jboss.org/schema/arquillian
+                         http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+    <defaultProtocol type="Servlet 3.0"/>
+
+    <container qualifier="test" default="true">
+        <configuration>
+            <property name="jbossHome">${serverRoot:target/wildfly-8.0.0.Beta1}</property>
+            <property name="serverConfig">${serverProfile:standalone-full.xml}</property>
+        </configuration>
+    </container>
+
+</arquillian>

jpa/pom.xml

@@ -34,6 +34,7 @@
         <module>unsynchronized-pc</module>
         <module>extended-pc</module>
         <module>jpa-converter</module>
+        <module>datasourcedefinition</module>
     </modules>
 
 </project>