[jbpm-commits] JBoss JBPM SVN: r6848 - projects/jsf-console/branches/jsf-console-3.2-soa/console-jee5/src/main/webapp/WEB-INF.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-11-25 22:03:52 -0500 (Thu, 25 Nov 2010)
New Revision: 6848

Modified:
   projects/jsf-console/branches/jsf-console-3.2-soa/console-jee5/src/main/webapp/WEB-INF/jboss-web.xml
   projects/jsf-console/branches/jsf-console-3.2-soa/console-jee5/src/main/webapp/WEB-INF/web.xml
Log:
JBPM-2978 move mapped jndi names from jboss-web.xml to web.xml in jsf-console-jee5

Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console-jee5/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console-jee5/src/main/webapp/WEB-INF/jboss-web.xml	2010-11-25 17:12:29 UTC (rev 6847)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console-jee5/src/main/webapp/WEB-INF/jboss-web.xml	2010-11-26 03:03:52 UTC (rev 6848)
@@ -9,19 +9,4 @@
   -->
   <security-domain>java:/jaas/jbpm-console</security-domain>
   <context-root>jbpm-console</context-root>
-
-  <resource-ref>
-    <res-ref-name>jdbc/JbpmDataSource</res-ref-name>
-    <jndi-name>java:JbpmDS</jndi-name>
-  </resource-ref>
-
-  <resource-ref>
-    <res-ref-name>jms/JbpmConnectionFactory</res-ref-name>
-    <jndi-name>java:JmsXA</jndi-name>
-  </resource-ref>
-
-  <message-destination-ref>
-    <message-destination-ref-name>jms/JobQueue</message-destination-ref-name>
-    <jndi-name>queue/JbpmJobQueue</jndi-name>
-  </message-destination-ref>
 </jboss-web>

Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console-jee5/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console-jee5/src/main/webapp/WEB-INF/web.xml	2010-11-25 17:12:29 UTC (rev 6847)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console-jee5/src/main/webapp/WEB-INF/web.xml	2010-11-26 03:03:52 UTC (rev 6848)
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.5" 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/web-app_2_5.xsd">
+<web-app version="2.5" 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/web-app_2_5.xsd">
   <servlet>
     <description>Enable the JSF servlet, see also faces-config.xml</description>
     <servlet-name>Faces Servlet</servlet-name>
@@ -104,6 +106,7 @@
       the connection.datasource property in the Hibernate configuration.</description>
     <res-ref-name>jdbc/JbpmDataSource</res-ref-name>
     <res-type>javax.sql.DataSource</res-type>
+    <mapped-name>java:JbpmDS</mapped-name>
   </resource-ref>
 
   <resource-ref>
@@ -111,6 +114,7 @@
       processes that contain asynchronous continuations.</description>
     <res-ref-name>jms/JbpmConnectionFactory</res-ref-name>
     <res-type>javax.jms.ConnectionFactory</res-type>
+    <mapped-name>java:JmsXA</mapped-name>
   </resource-ref>
 
   <message-destination-ref>
@@ -118,5 +122,7 @@
       the queue from which JobListenerBean receives messages.</description>
     <message-destination-ref-name>jms/JobQueue</message-destination-ref-name>
     <message-destination-type>javax.jms.Queue</message-destination-type>
+    <message-destination-usage>Produces</message-destination-usage>
+    <mapped-name>queue/JbpmJobQueue</mapped-name>
   </message-destination-ref>
 </web-app>