[jbpm-commits] JBoss JBPM SVN: r4116 - projects/jsf-console/trunk/console/src/main/webapp/WEB-INF.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Mar 3 05:51:13 EST 2009
Author: heiko.braun at jboss.com
Date: 2009-03-03 05:51:13 -0500 (Tue, 03 Mar 2009)
New Revision: 4116
Modified:
projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jboss-web.xml
projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml
Log:
Rollback alejandro's changes
Modified: projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jboss-web.xml 2009-03-03 09:28:34 UTC (rev 4115)
+++ projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jboss-web.xml 2009-03-03 10:51:13 UTC (rev 4116)
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss-web PUBLIC
- "-//JBoss//DTD Web Application 2.4//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+<!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd">
+
<jboss-web>
<!--
- Specify the security domain to use. This will be java:/jaas/<name> where
+ Specify the security domain to use. This will be java:/jaas/<name> where
<name> is one of the names configured in your login-config.xml.
-->
<security-domain>java:/jaas/jbpm-console</security-domain>
@@ -13,7 +12,7 @@
<resource-ref>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
- <jndi-name>java:JbpmDS</jndi-name>
+ <jndi-name>java:/JbpmDS</jndi-name>
</resource-ref>
<resource-ref>
@@ -21,11 +20,12 @@
<jndi-name>java:JmsXA</jndi-name>
</resource-ref>
- <ejb-local-ref>
+ <ejb-ref>
<ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
- <jndi-name>java:jbpm/TimerEntityBean</jndi-name>
- </ejb-local-ref>
-
+ <jndi-name>java:ejb/TimerEntityBean</jndi-name>
+ </ejb-ref>
+
+ <!-- workaround for "mapped-name is required" exception in JBoss 5.0.0.CR1 -->
<message-destination-ref>
<message-destination-ref-name>jms/JobQueue</message-destination-ref-name>
<jndi-name>queue/JbpmJobQueue</jndi-name>
Modified: projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml 2009-03-03 09:28:34 UTC (rev 4115)
+++ projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml 2009-03-03 10:51:13 UTC (rev 4116)
@@ -2,7 +2,7 @@
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<!--
- * Force initialization of the hibernate sessions in jbpm.
+ * Force initialization of the hibernate sessions in jbpm.
* This will create the DB tables on new installations.
* If that's not needed the listener can be removed.
-->
@@ -104,7 +104,8 @@
</login-config>
<!== Login configuration option #1 -->
- <!-- Login configuration option #2 - use basic auth ==>
+ <!--
+ Login configuration option #2 - use basic auth ==>
<login-config>
<auth-method>BASIC</auth-method>
<realm-name>jBPM Administration Console</realm-name>
@@ -117,15 +118,14 @@
Starts the job executor on servlet context initialization and stops it on servlet context destruction.
</description>
<listener-class>org.jbpm.web.JobExecutorLauncher</listener-class>
- </listener>
- <!== Job executor launcher -->
+ </listener> <!== Job executor launcher -->
<listener>
<description>
- Closes the jBPM configuration on servlet context destruction, releasing
- application resources. This listener should appear after the job executor
- launcher to avoid reopening the configuration.
- </description>
+ Closes the jBPM configuration on servlet context destruction, releasing
+ application resources. This listener should appear after the job executor
+ launcher to avoid reopening the configuration.
+ </description>
<listener-class>org.jbpm.web.JbpmConfigurationCloser</listener-class>
</listener>
@@ -150,16 +150,16 @@
<res-auth>Container</res-auth>
</resource-ref>
- <ejb-local-ref>
- <description>
- Link to the local entity bean that implements the scheduler service.
- Required for processes that contain timers.
- </description>
- <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home>
- <local>org.jbpm.ejb.LocalTimerEntity</local>
- </ejb-local-ref>
+ <ejb-ref>
+ <description>
+ Link to the local entity bean that implements the scheduler service. Required for
+ processes that contain timers.
+ </description>
+ <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
+ <ejb-ref-type>Entity</ejb-ref-type>
+ <home>org.jbpm.ejb.TimerEntityHome</home>
+ <remote>org.jbpm.ejb.TimerEntity</remote>
+ </ejb-ref>
<message-destination-ref>
<description>
More information about the jbpm-commits
mailing list