From 2ae0df302f684af30eea1e8ec3d7bb8516c8e8d6 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 2 Apr 2014 21:56:03 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    65599:
 Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)       65487:
 MNT-10905: Alfresco 4.2 on JBoss EAP 6 with Java 7       - modified
 jboss-web.xml with new sample for JBoss EAP 6 deployment

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/web/WEB-INF/jboss-web.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/source/web/WEB-INF/jboss-web.xml b/source/web/WEB-INF/jboss-web.xml
index dde958aff..f0343eaed 100644
--- a/source/web/WEB-INF/jboss-web.xml
+++ b/source/web/WEB-INF/jboss-web.xml
@@ -5,8 +5,14 @@
  "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
 
 <jboss-web>
+  <!-- In this sample it is assumed that main data source MySqlDS is configured in standalone.xml -->
+  <!-- and activitiIdGeneratorDataSource reuses it. Modify if/as needed -->
    <resource-ref>
       <res-ref-name>jdbc/dataSource</res-ref-name>
-      <jndi-name>java:alfresco-datasource</jndi-name>
+      <jndi-name>java:jboss/datasources/MySqlDS</jndi-name>
+   </resource-ref>
+   <resource-ref>
+      <res-ref-name>jdbc/activitiIdGeneratorDataSource</res-ref-name>
+      <jndi-name>java:jboss/datasources/MySqlDS</jndi-name>
    </resource-ref>
 </jboss-web>