8:31 p.m.
Author: alex.guizar(a)jboss.com
Date: 2009-03-02 21:31:55 -0500 (Mon, 02 Mar 2009)
New Revision: 4102
Modified:
projects/jsf-console/trunk/console/pom.xml
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
projects/jsf-console/trunk/jbpm4jsf/pom.xml
projects/jsf-console/trunk/pom.xml
projects/jsf-console/trunk/soa/pom.xml
projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/jboss-web.xml
projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/web.xml
Log:
JBPM-2078: correct bad references in webapp deployment descriptor
update version to 3.2.7-SNAPSHOT
Modified: projects/jsf-console/trunk/console/pom.xml
===================================================================
--- projects/jsf-console/trunk/console/pom.xml 2009-03-02 22:19:34 UTC (rev 4101)
+++ projects/jsf-console/trunk/console/pom.xml 2009-03-03 02:31:55 UTC (rev 4102)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.2.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
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-02
22:19:34 UTC (rev 4101)
+++ projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/jboss-web.xml 2009-03-03
02:31:55 UTC (rev 4102)
@@ -1,10 +1,11 @@
<?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>
@@ -12,7 +13,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>
@@ -20,12 +21,11 @@
<jndi-name>java:JmsXA</jndi-name>
</resource-ref>
- <ejb-ref>
+ <ejb-local-ref>
<ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
- <jndi-name>java:ejb/TimerEntityBean</jndi-name>
- </ejb-ref>
-
- <!-- workaround for "mapped-name is required" exception in JBoss 5.0.0.CR1
-->
+ <jndi-name>java:jbpm/TimerEntityBean</jndi-name>
+ </ejb-local-ref>
+
<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-02 22:19:34
UTC (rev 4101)
+++ projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml 2009-03-03 02:31:55
UTC (rev 4102)
@@ -2,8 +2,8 @@
<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.
- * This will create the DB tables on new installations.
+ * 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.
-->
<listener>
@@ -94,45 +94,45 @@
</form-login-config>
</login-config>
- <!-- Login configuration option #1 - use the login page ==>
- <login-config>
- <auth-method>FORM</auth-method>
+ <!-- Login configuration option #1 - use the login page ==>
+ <login-config>
+ <auth-method>FORM</auth-method>
<form-login-config>
- <form-login-page>/ua/login.jsf</form-login-page>
- <form-error-page>/ua/login.jsf?error=true</form-error-page>
- </form-login-config>
- </login-config>
+ <form-login-page>/ua/login.jsf</form-login-page>
+ <form-error-page>/ua/login.jsf?error=true</form-error-page>
+ </form-login-config>
+ </login-config>
<!== Login configuration option #1 -->
- <!--
- Login configuration option #2 - use basic auth ==>
- <login-config>
- <auth-method>BASIC</auth-method>
+ <!-- Login configuration option #2 - use basic auth ==>
+ <login-config>
+ <auth-method>BASIC</auth-method>
<realm-name>jBPM Administration Console</realm-name>
- </login-config>
+ </login-config>
<!== Login configuration option #2 -->
- <!-- Job executor launcher ==>
- <listener>
- <description>
+ <!-- Job executor launcher ==>
+ <listener>
+ <description>
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 -->
+ </description>
+ <listener-class>org.jbpm.web.JobExecutorLauncher</listener-class>
+ </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>
<resource-ref>
<description>
Logical name of the data source that provides connections to the persistence
service.
- Must match the hibernate.connection.datasource property in the Hibernate
+ Must match the hibernate.connection.datasource property in the Hibernate
configuration file.
</description>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
@@ -150,21 +150,21 @@
<res-auth>Container</res-auth>
</resource-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>
+ <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>
<message-destination-ref>
<description>
- The message service sends job messages to the queue referenced here. To ensure
- this is the same queue from which the JobListenerBean receives messages, the
+ The message service sends job messages to the queue referenced here. To ensure
+ this is the same queue from which the JobListenerBean receives messages, the
message-destination-link element points to a common logical destination, JobQueue.
</description>
<message-destination-ref-name>jms/JobQueue</message-destination-ref-name>
Modified: projects/jsf-console/trunk/jbpm4jsf/pom.xml
===================================================================
--- projects/jsf-console/trunk/jbpm4jsf/pom.xml 2009-03-02 22:19:34 UTC (rev 4101)
+++ projects/jsf-console/trunk/jbpm4jsf/pom.xml 2009-03-03 02:31:55 UTC (rev 4102)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.2.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/jsf-console/trunk/pom.xml
===================================================================
--- projects/jsf-console/trunk/pom.xml 2009-03-02 22:19:34 UTC (rev 4101)
+++ projects/jsf-console/trunk/pom.xml 2009-03-03 02:31:55 UTC (rev 4102)
@@ -16,7 +16,7 @@
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
<packaging>pom</packaging>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.2.7-SNAPSHOT</version>
<!-- Parent -->
<parent>
@@ -40,7 +40,7 @@
<javax.el.version>1.2</javax.el.version>
<javax.faces.version>1.2_03</javax.faces.version>
<javax.servlet.version>2.5</javax.servlet.version>
- <jbpm.version>3.3.1-SNAPSHOT</jbpm.version>
+ <jbpm.version>3.2.7-SNAPSHOT</jbpm.version>
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
<junit.version>3.8.1</junit.version>
<sun.facelets.version>1.1.15.B1</sun.facelets.version>
Modified: projects/jsf-console/trunk/soa/pom.xml
===================================================================
--- projects/jsf-console/trunk/soa/pom.xml 2009-03-02 22:19:34 UTC (rev 4101)
+++ projects/jsf-console/trunk/soa/pom.xml 2009-03-03 02:31:55 UTC (rev 4102)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jsf-console-parent</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.2.7-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/jboss-web.xml
===================================================================
--- projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/jboss-web.xml 2009-03-02
22:19:34 UTC (rev 4101)
+++ projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/jboss-web.xml 2009-03-03
02:31:55 UTC (rev 4102)
@@ -1,7 +1,8 @@
<?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
@@ -12,7 +13,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>
@@ -20,12 +21,11 @@
<jndi-name>java:JmsXA</jndi-name>
</resource-ref>
- <ejb-ref>
+ <ejb-local-ref>
<ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
- <jndi-name>java:ejb/TimerEntityBean</jndi-name>
- </ejb-ref>
+ <jndi-name>java:jbpm/TimerEntityBean</jndi-name>
+ </ejb-local-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/soa/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/web.xml 2009-03-02 22:19:34 UTC
(rev 4101)
+++ projects/jsf-console/trunk/soa/src/main/webapp/WEB-INF/web.xml 2009-03-03 02:31:55 UTC
(rev 4102)
@@ -104,8 +104,7 @@
</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>
@@ -118,7 +117,8 @@
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>
@@ -150,16 +150,16 @@
<res-auth>Container</res-auth>
</resource-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>
+ <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>
<message-destination-ref>
<description>