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

@@ -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>