2:26 a.m.
Author: alex.guizar(a)jboss.com
Date: 2009-12-10 03:26:13 -0500 (Thu, 10 Dec 2009)
New Revision: 5939
Removed:
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/BootstrapListener.java
Modified:
projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml
projects/jsf-console/branches/jsf-console-3.2-soa/soa/src/main/webapp/WEB-INF/web.xml
Log:
JBPM-2678: correct soa overlay configuration
remove unused bootstrap listener
Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2009-12-10 04:36:26
UTC (rev 5938)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/pom.xml 2009-12-10 08:26:13
UTC (rev 5939)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ====================================================================== -->
-<!-- jBPM: Workflow in Java -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ====================================================================== -->
+ <!-- ====================================================================== -->
+ <!-- jBPM: Workflow in Java -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- ====================================================================== -->
-<!-- $Id$ -->
+ <!-- $Id$ -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
@@ -73,6 +73,15 @@
<configuration>
<classifier>soa</classifier>
<primaryArtifact>false</primaryArtifact>
+ <overlays>
+ <overlay>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>soa-webapp</artifactId>
+ </overlay>
+ <overlay>
+ <!-- empty groupId/artifactId means the current build -->
+ </overlay>
+ </overlays>
</configuration>
</plugin>
</plugins>
Modified:
projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml
===================================================================
---
projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml 2009-12-10
04:36:26 UTC (rev 5938)
+++
projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/WEB-INF/web.xml 2009-12-10
08:26:13 UTC (rev 5939)
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
<servlet>
- <description>
- Enable the JSF servlet. See faces-config.xml for Faces-specific configuration.
- </description>
+ <description>Enable the JSF servlet. See faces-config.xml for Faces-specific
configuration.</description>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
@@ -41,7 +40,8 @@
</welcome-file-list>
<!--
- This role list should be changed to include all the relevant roles for your
environment.
+ This role list should be changed to include all the relevant roles for your
+ environment.
-->
<security-role>
<role-name>admin</role-name>
@@ -51,9 +51,9 @@
</security-role>
<!--
- Security constraints - optionally customize the role name to require a login before
access is
- allowed to the application. Also, be sure to edit jboss-web.xml to configure the
security domain
- if you are deploying inside JBoss AS.
+ Security constraints - optionally customize the role name to require a login
+ before access is allowed. Also, be sure to edit jboss-web.xml to configure
+ the security domain if you are deploying inside JBoss AS.
-->
<security-constraint>
<web-resource-collection>
@@ -102,52 +102,33 @@
</listener>
<!== Job executor launcher -->
- <!-- Bootstrap listener ==>
<listener>
- <description>
- Builds the Hibernate session factory on initialization.
- This will create the database tables in new installations,
- provided the hibernate.hbm2ddl.auto property is set.
- </description>
- <listener-class>org.jbpm.web.BootstrapListener</listener-class>
- </listener>
- <!== Bootstrap listener -->
-
- <listener>
- <description>
- Closes the jBPM configuration on destruction, releasing resources.
+ <description>Closes the jBPM configuration on destruction, releasing
resources.
This listener should appear after the job executor launcher,
- to avoid reopening the configuration.
- </description>
+ 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.
+ <description>Logical name of the data source that provides connections to the
persistence service.
Must match the hibernate.connection.datasource property in the Hibernate
- configuration file.
- </description>
+ configuration file.</description>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
<resource-ref>
- <description>
- Logical name of the factory that provides JMS connections to the message service.
- Required for processes that contain asynchronous continuations.
- </description>
+ <description>Logical name of the factory that provides JMS connections to the
message service.
+ Required for processes that contain asynchronous
continuations.</description>
<res-ref-name>jms/JbpmConnectionFactory</res-ref-name>
<res-type>javax.jms.ConnectionFactory</res-type>
<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>
+ <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>
@@ -155,11 +136,9 @@
</ejb-local-ref>
<message-destination-ref>
- <description>
- The message service sends job messages to the queue referenced here. To ensure
+ <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
- message-destination-link element points to a common logical destination, JobQueue.
- </description>
+ message-destination-link element points to a common logical destination,
JobQueue.</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>
Deleted:
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/BootstrapListener.java
===================================================================
---
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/BootstrapListener.java 2009-12-10
04:36:26 UTC (rev 5938)
+++
projects/jsf-console/branches/jsf-console-3.2-soa/gpd-deployer/src/main/java/org/jbpm/web/BootstrapListener.java 2009-12-10
08:26:13 UTC (rev 5939)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.web;
-
-import org.jbpm.JbpmConfiguration;
-import org.jbpm.JbpmContext;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContextEvent;
-
-/**
- * Eagerly initializes the hibernate session factory.
- * <p>
- * Building the session factory in advance prevents the webapp from making a
- * noticeable pause upon the first login. This is particularly desirable in
- * applications configured to create the database schema on startup by setting
- * property <code>hibernate.hbm2ddl.auto</code> to
<code>create</code>.
- * </p>
- * <h3>Configuration</h3> Servlet context initialization parameters
- * <table border="1">
- * <tr>
- * <th>Name</th>
- * <th>Description</th>
- * <th>Default value</th>
- * </tr>
- * <tr>
- * <td>jbpm.configuration.resource</td>
- * <td>name of classpath resource containing the configuration</td>
- * <td>jbpm.cfg.xml</td>
- * </tr>
- * </table>
- *
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class BootstrapListener implements ServletContextListener {
-
- private static final Log log = LogFactory.getLog(BootstrapListener.class);
-
- public void contextInitialized(ServletContextEvent event) {
- String jbpmCfgResource = event.getServletContext()
- .getInitParameter("jbpm.configuration.resource");
- JbpmConfiguration jbpmConfiguration =
JbpmConfiguration.getInstance(jbpmCfgResource);
-
- JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
- try {
- log.info("bootstrap hibernate session factory");
- jbpmContext.getSessionFactory();
- }
- catch (RuntimeException e) {
- jbpmContext.setRollbackOnly();
- throw e;
- }
- finally {
- jbpmContext.close();
- }
- }
-
- public void contextDestroyed(ServletContextEvent servletContextEvent) {
- }
-}
Modified:
projects/jsf-console/branches/jsf-console-3.2-soa/soa/src/main/webapp/WEB-INF/web.xml
===================================================================
---
projects/jsf-console/branches/jsf-console-3.2-soa/soa/src/main/webapp/WEB-INF/web.xml 2009-12-10
04:36:26 UTC (rev 5938)
+++
projects/jsf-console/branches/jsf-console-3.2-soa/soa/src/main/webapp/WEB-INF/web.xml 2009-12-10
08:26:13 UTC (rev 5939)
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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">
<servlet>
- <description>
- Enable the JSF servlet. See faces-config.xml for Faces-specific configuration.
- </description>
+ <description>Enable the JSF servlet. See faces-config.xml for Faces-specific
configuration.</description>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
@@ -41,7 +40,8 @@
</welcome-file-list>
<!--
- This role list should be changed to include all the relevant roles for your
environment.
+ This role list should be changed to include all the relevant roles for your
+ environment.
-->
<security-role>
<role-name>admin</role-name>
@@ -51,9 +51,9 @@
</security-role>
<!--
- Security constraints - optionally customize the role name to require a login before
access is
- allowed to the application. Also, be sure to edit jboss-web.xml to configure the
security domain
- if you are deploying inside JBoss AS.
+ Security constraints - optionally customize the role name to require a login
+ before access is allowed. Also, be sure to edit jboss-web.xml to configure
+ the security domain if you are deploying inside JBoss AS.
-->
<security-constraint>
<web-resource-collection>
@@ -103,49 +103,32 @@
<!== Job executor launcher -->
<listener>
- <description>
- Builds the Hibernate session factory on initialization.
- This will create the database tables in new installations,
- provided the hibernate.hbm2ddl.auto property is set.
- </description>
- <listener-class>org.jbpm.web.BootstrapListener</listener-class>
- </listener>
-
- <listener>
- <description>
- Closes the jBPM configuration on destruction, releasing resources.
+ <description>Closes the jBPM configuration on destruction, releasing
resources.
This listener should appear after the job executor launcher,
- to avoid reopening the configuration.
- </description>
+ 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.
+ <description>Logical name of the data source that provides connections to the
persistence service.
Must match the hibernate.connection.datasource property in the Hibernate
- configuration file.
- </description>
+ configuration file.</description>
<res-ref-name>jdbc/JbpmDataSource</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<res-auth>Container</res-auth>
</resource-ref>
<resource-ref>
- <description>
- Logical name of the factory that provides JMS connections to the message service.
- Required for processes that contain asynchronous continuations.
- </description>
+ <description>Logical name of the factory that provides JMS connections to the
message service.
+ Required for processes that contain asynchronous
continuations.</description>
<res-ref-name>jms/JbpmConnectionFactory</res-ref-name>
<res-type>javax.jms.ConnectionFactory</res-type>
<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>
+ <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>
@@ -153,11 +136,9 @@
</ejb-local-ref>
<message-destination-ref>
- <description>
- The message service sends job messages to the queue referenced here. To ensure
+ <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
- message-destination-link element points to a common logical destination, JobQueue.
- </description>
+ message-destination-link element points to a common logical destination,
JobQueue.</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>