commit ea9bb13dda3a542b1b8e60eacd2f07c61deb2839
Author: Pete Muir <pmuir@bleepbleep.org.uk>
Date:   Tue Feb 21 15:24:50 2012 +0000

    Use deployable datasources
    
    * Use a different datasource for test and app

diff --git a/kitchensink/src/main/resources/META-INF/persistence.xml b/kitchensink/src/main/resources/META-INF/persistence.xml
index ea3fca0..8d7bcff 100644
--- a/kitchensink/src/main/resources/META-INF/persistence.xml
+++ b/kitchensink/src/main/resources/META-INF/persistence.xml
@@ -6,8 +6,10 @@
         http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
    <persistence-unit name="primary">
       <!-- If you are running in a production environment, add a managed 
-         data source, the example data source is just for proofs of concept! -->
-      <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
+         data source, this example data source is just for devleopment and testing! -->
+      <!-- The datasource is deployed as WEB-INF/kitchensink-quickstart-ds.xml, you
+         can find it in the source at src/main/webapp/WEB-INF/kitchen-sinkquickstart-ds.xml -->
+      <jta-data-source>java:jboss/datasources/KitchensinkQuickstartDS</jta-data-source>
       <properties>
          <!-- Properties for Hibernate -->
          <property name="hibernate.hbm2ddl.auto" value="create-drop" />
diff --git a/kitchensink/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml b/kitchensink/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml
new file mode 100644
index 0000000..9f2a944
--- /dev/null
+++ b/kitchensink/src/main/webapp/WEB-INF/kitchensink-quickstart-ds.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This is an unmanaged datasource. It should be used for proofs of concept 
+   or testing only. It uses H2, an in memory database that ships with JBoss 
+   AS. -->
+<datasources xmlns="http://www.jboss.org/ironjacamar/schema"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.jboss.org/ironjacamar/schema http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+   <!-- The datasource is bound into JNDI at this location. We reference 
+      this in META-INF/persistence.xml -->
+   <datasource jndi-name="java:jboss/datasources/KitchensinkQuickstartDS"
+      pool-name="kitchensink-quickstart" enabled="true"
+      use-java-context="true">
+      <connection-url>jdbc:h2:mem:kitchensink-quickstart;DB_CLOSE_DELAY=-1</connection-url>
+      <driver>h2</driver>
+      <security>
+         <user-name>sa</user-name>
+         <password>sa</password>
+      </security>
+   </datasource>
+</datasources>
+ 
\ No newline at end of file
diff --git a/kitchensink/src/test/resources/META-INF/test-persistence.xml b/kitchensink/src/test/resources/META-INF/test-persistence.xml
new file mode 100644
index 0000000..02f764a
--- /dev/null
+++ b/kitchensink/src/test/resources/META-INF/test-persistence.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.0"
+   xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="
+        http://java.sun.com/xml/ns/persistence
+        http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+   <persistence-unit name="primary">
+      <!-- We use a different datasource for tests, so as to not overwrite 
+         production data. This is an unmanaged data source, backed by H2, an in memory 
+         database. Production applications should use a managed datasource. -->
+      <!-- The datasource is deployed as WEB-INF/test-ds.xml, 
+         you can find it in the source at src/test/resources/test-ds.xml -->
+      <jta-data-source>java:jboss/datasources/KitchensinkQuickstartTestDS</jta-data-source>
+      <properties>
+         <!-- Properties for Hibernate -->
+         <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+         <property name="hibernate.show_sql" value="false" />
+      </properties>
+   </persistence-unit>
+</persistence>
\ No newline at end of file
diff --git a/kitchensink/src/test/resources/test-ds.xml b/kitchensink/src/test/resources/test-ds.xml
new file mode 100644
index 0000000..05ee910
--- /dev/null
+++ b/kitchensink/src/test/resources/test-ds.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This is an unmanaged datasource. It should be used for proofs of concept 
+   or testing only. It uses H2, an in memory database that ships with JBoss 
+   AS. -->
+<datasources xmlns="http://www.jboss.org/ironjacamar/schema"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.jboss.org/ironjacamar/schema http://docs.jboss.org/ironjacamar/schema/datasources_1_0.xsd">
+   <!-- The datasource is bound into JNDI at this location. We reference 
+      this in META-INF/persistence.xml -->
+   <datasource jndi-name="java:jboss/datasources/KitchensinkQuickstartTestDS"
+      pool-name="kitchensink-quickstart-test" enabled="true"
+      use-java-context="true">
+      <connection-url>jdbc:h2:mem:kitchensink-quickstart-test;DB_CLOSE_DELAY=-1</connection-url>
+      <driver>h2</driver>
+      <security>
+         <user-name>sa</user-name>
+         <password>sa</password>
+      </security>
+   </datasource>
+</datasources>
+ 
\ No newline at end of file