[jbpm-commits] JBoss JBPM SVN: r3298 - in projects/jsf-console/trunk: console and 2 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Dec 9 16:33:53 EST 2008


Author: thomas.diesler at jboss.com
Date: 2008-12-09 16:33:53 -0500 (Tue, 09 Dec 2008)
New Revision: 3298

Modified:
   projects/jsf-console/trunk/console/pom.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
Log:
version=3.3.1-SNAPSHOT

Modified: projects/jsf-console/trunk/console/pom.xml
===================================================================
--- projects/jsf-console/trunk/console/pom.xml	2008-12-09 21:02:47 UTC (rev 3297)
+++ projects/jsf-console/trunk/console/pom.xml	2008-12-09 21:33:53 UTC (rev 3298)
@@ -10,8 +10,7 @@
   <!-- ====================================================================== -->
 
   <!-- $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">
+<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">
   <modelVersion>4.0.0</modelVersion>
   <name>JBoss jBPM3 - Console</name>
   <groupId>org.jbpm.jbpm3</groupId>
@@ -22,8 +21,8 @@
   <parent>
     <groupId>org.jbpm.jbpm3</groupId>
     <artifactId>jsf-console-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <version>3.3.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <!-- Dependencies -->
@@ -38,10 +37,6 @@
           <groupId>javax.faces</groupId>
           <artifactId>jsf-impl</artifactId>
         </exclusion>
-        <exclusion>
-          <groupId>org.jbpm.jbpm3</groupId>
-          <artifactId>jbpm-identity</artifactId>
-        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -56,8 +51,7 @@
     <!-- Provided Dependencies -->
     <dependency>
       <groupId>org.jbpm.jbpm3</groupId>
-      <artifactId>jbpm-core</artifactId>
-      <version>${jbpm.version}</version>
+      <artifactId>jbpm-jpdl</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>

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	2008-12-09 21:02:47 UTC (rev 3297)
+++ projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml	2008-12-09 21:33:53 UTC (rev 3298)
@@ -1,203 +1,176 @@
 <?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"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+<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. 
+    * If that's not needed the listener can be removed.
+  -->
+  <listener>
+    <listener-class>org.jbpm.web.BootstrapListener</listener-class>
+  </listener>
 
-   <!--
-      * 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>
-      <listener-class>
-         org.jbpm.web.BootstrapListener
-      </listener-class>
-   </listener>
+  <servlet>
+    <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>
+  </servlet>
 
-    <servlet>
-        <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>
-    </servlet>
+  <!-- Mapping for all plain pages. -->
+  <servlet-mapping>
+    <servlet-name>Faces Servlet</servlet-name>
+    <url-pattern>*.jsf</url-pattern>
+  </servlet-mapping>
 
-    <!-- Mapping for all plain pages. -->
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>*.jsf</url-pattern>
-    </servlet-mapping>
+  <!-- This mapping is for the process images. -->
+  <servlet-mapping>
+    <servlet-name>Faces Servlet</servlet-name>
+    <url-pattern>/sa/pi/*</url-pattern>
+  </servlet-mapping>
 
-    <!-- This mapping is for the process images. -->
-    <servlet-mapping>
-        <servlet-name>Faces Servlet</servlet-name>
-        <url-pattern>/sa/pi/*</url-pattern>
-    </servlet-mapping>
+  <context-param>
+    <description> Use Documents Saved as *.xhtml </description>
+    <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+    <param-value>.xhtml</param-value>
+  </context-param>
 
-    <context-param>
-        <description> Use Documents Saved as *.xhtml </description>
-        <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
-        <param-value>.xhtml</param-value>
-    </context-param>
+  <context-param>
+    <description> Facelets debug output </description>
+    <param-name>facelets.DEVELOPMENT</param-name>
+    <param-value>false</param-value>
+  </context-param>
 
-    <context-param>
-        <description> Facelets debug output </description>
-        <param-name>facelets.DEVELOPMENT</param-name>
-        <param-value>false</param-value>
-    </context-param>
+  <!-- A simple JSP to redirect to the basic search page. -->
+  <welcome-file-list>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
 
-    <!-- A simple JSP to redirect to the basic search page. -->
-    <welcome-file-list>
-        <welcome-file>index.jsp</welcome-file>
-    </welcome-file-list>
+  <servlet>
+    <description> This is the GDP's deployer servlet </description>
+    <servlet-name>GDP Deployer Servlet</servlet-name>
+    <servlet-class>org.jbpm.web.ProcessUploadServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
 
-    <servlet>
-        <description> This is the GDP's deployer servlet </description>
-        <servlet-name>GDP Deployer Servlet</servlet-name>
-        <servlet-class>org.jbpm.web.ProcessUploadServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
+  <servlet-mapping>
+    <servlet-name>GDP Deployer Servlet</servlet-name>
+    <url-pattern>/upload/*</url-pattern>
+  </servlet-mapping>
 
-    <servlet-mapping>
-        <servlet-name>GDP Deployer Servlet</servlet-name>
-        <url-pattern>/upload/*</url-pattern>
-    </servlet-mapping>
+  <!--
+   This role list should be changed to include all the relevant roles for your
+   environment.
+  -->
+  <security-role>
+    <role-name>admin</role-name>
+  </security-role>
+  <security-role>
+    <role-name>user</role-name>
+  </security-role>
 
-    <!--
-       This role list should be changed to include all the relevant roles for your
-       environment.
-    -->
-    <security-role>
-        <role-name>admin</role-name>
-    </security-role>
-    <security-role>
-        <role-name>user</role-name>
-    </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-constraint>
+    <web-resource-collection>
+      <web-resource-name>Secure Area</web-resource-name>
+      <url-pattern>/sa/*</url-pattern>
+      <http-method>GET</http-method>
+      <http-method>POST</http-method>
+    </web-resource-collection>
+    <auth-constraint>
+      <role-name>user</role-name>
+    </auth-constraint>
+  </security-constraint>
 
-    <!--
-       Security constraints - optionally customize the role name to require
-       a login before access is allowed to the application.
+  <!-- Example Login page - lists user names -->
+  <login-config>
+    <auth-method>FORM</auth-method>
+    <form-login-config>
+      <form-login-page>/ua/login-example.jsf</form-login-page>
+      <form-error-page>/ua/login-example.jsf?error=true</form-error-page>
+    </form-login-config>
+  </login-config>
 
-       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>
-            <web-resource-name>Secure Area</web-resource-name>
-            <url-pattern>/sa/*</url-pattern>
-            <http-method>GET</http-method>
-            <http-method>POST</http-method>
-        </web-resource-collection>
-        <auth-constraint>
-            <role-name>user</role-name>
-        </auth-constraint>
-    </security-constraint>
+  <!-- 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> 
+  <!== Login configuration option #1 -->
 
-    <!-- Example Login page - lists user names -->
-    <login-config>
-        <auth-method>FORM</auth-method>
-        <form-login-config>
-            <form-login-page>/ua/login-example.jsf</form-login-page>
-            <form-error-page>/ua/login-example.jsf?error=true</form-error-page>
-        </form-login-config>
-    </login-config>
+  <!--
+    Login configuration option #2 - use basic auth ==> 
+  <login-config> 
+    <auth-method>BASIC</auth-method> 
+    <realm-name>jBPM Administration Console</realm-name>
+  </login-config> 
+  <!== Login configuration option #2 -->
 
-    <!-- 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>
-    <!== Login configuration option #1 -->
+  <!-- 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 -->
 
-    <!-- Login configuration option #2 - use basic auth ==>
-    <login-config>
-        <auth-method>BASIC</auth-method>
-        <realm-name>jBPM Administration Console</realm-name>
-    </login-config>
-    <!== Login configuration option #2 -->
-
-    <!-- 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 -->
-
-    <listener>
-        <description>
+  <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>
-        <listener-class>org.jbpm.web.JbpmConfigurationCloser</listener-class>
-    </listener>
+    <listener-class>org.jbpm.web.JbpmConfigurationCloser</listener-class>
+  </listener>
 
-    <!-- Job executor servlet ==>
-    <servlet>
-        <description>
-            This servlet has the purpose of executing pending jobs. Deprecated,
-            replaced by JobExecutorLauncher.
-        </description>
-        <servlet-name>JobExecutorServlet</servlet-name>
-        <servlet-class>org.jbpm.job.executor.JobExecutorServlet</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>JobExecutorServlet</servlet-name>
-        <url-pattern>/jobs</url-pattern>
-    </servlet-mapping>
-    <!== Job executor servlet -->
+  <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 
+      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 data source that provides connections to the persistence service.
-            Must match the hibernate.connection.datasource property in the Hibernate 
-            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>
+    <res-ref-name>jms/JbpmConnectionFactory</res-ref-name>
+    <res-type>javax.jms.ConnectionFactory</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>
-        <res-ref-name>jms/JbpmConnectionFactory</res-ref-name>
-        <res-type>javax.jms.ConnectionFactory</res-type>
-        <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-link>TimerEntityBean</ejb-link>
-    </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 
+      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>
+    <message-destination-link>JobQueue</message-destination-link>
+  </message-destination-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 
-            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>
-        <message-destination-link>JobQueue</message-destination-link>
-    </message-destination-ref>
-
 </web-app>

Modified: projects/jsf-console/trunk/jbpm4jsf/pom.xml
===================================================================
--- projects/jsf-console/trunk/jbpm4jsf/pom.xml	2008-12-09 21:02:47 UTC (rev 3297)
+++ projects/jsf-console/trunk/jbpm4jsf/pom.xml	2008-12-09 21:33:53 UTC (rev 3298)
@@ -24,8 +24,8 @@
   <parent>
     <groupId>org.jbpm.jbpm3</groupId>
     <artifactId>jsf-console-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
-    <relativePath>../../pom.xml</relativePath>
+    <version>3.3.1-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <!-- Dependencies -->
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>org.jbpm.jbpm3</groupId>
       <artifactId>jbpm-identity</artifactId>
-      <version>${jbpm.version}</version>
+      <scope>provided</scope>
     </dependency>
     
     <dependency>

Modified: projects/jsf-console/trunk/pom.xml
===================================================================
--- projects/jsf-console/trunk/pom.xml	2008-12-09 21:02:47 UTC (rev 3297)
+++ projects/jsf-console/trunk/pom.xml	2008-12-09 21:33:53 UTC (rev 3298)
@@ -10,20 +10,19 @@
   <!-- ====================================================================== -->
 
   <!-- $Id: pom.xml 7412 2008-06-06 13:42:30Z thomas.diesler at jboss.com $ -->
-<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">
+<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">
   <modelVersion>4.0.0</modelVersion>
   <name>JBoss jBPM3</name>
   <groupId>org.jbpm.jbpm3</groupId>
   <artifactId>jsf-console-parent</artifactId>
   <packaging>pom</packaging>
-  <version>3.3.0-SNAPSHOT</version>
+  <version>3.3.1-SNAPSHOT</version>
 
   <!-- Parent -->
   <parent>
     <groupId>org.jbpm</groupId>
     <artifactId>jbpm-parent</artifactId>
-    <version>1.0.0.GA</version>
+    <version>1.0.1.GA</version>
   </parent>
 
   <!-- Modules -->
@@ -34,13 +33,13 @@
 
   <!-- Properties -->
   <properties>
-   <commons.fileupload.version>1.2.1</commons.fileupload.version>
+    <commons.fileupload.version>1.2.1</commons.fileupload.version>
     <commons.io.version>1.4</commons.io.version>
     <commons.logging.version>1.1.1</commons.logging.version>
     <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.0.CR1</jbpm.version>
+    <jbpm.version>3.3.1-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.14</sun.facelets.version>
@@ -49,8 +48,17 @@
   <!-- DependencyManagement -->
   <dependencyManagement>
     <dependencies>
-    
-     <dependency>
+      <dependency>
+        <groupId>org.jbpm.jbpm3</groupId>
+        <artifactId>jbpm-jpdl</artifactId>
+        <version>${jbpm.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jbpm.jbpm3</groupId>
+        <artifactId>jbpm-identity</artifactId>
+        <version>${jbpm.version}</version>
+      </dependency>
+      <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>
         <version>${commons.fileupload.version}</version>
@@ -60,30 +68,17 @@
         <artifactId>commons-io</artifactId>
         <version>${commons.io.version}</version>
       </dependency>
-    <dependency>
+      <dependency>
         <groupId>commons-logging</groupId>
         <artifactId>commons-logging</artifactId>
         <version>${commons.logging.version}</version>
       </dependency>
-         <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>${javax.servlet.version}</version>
-      </dependency>
-     
       <dependency>
-        <groupId>org.jboss.gravel</groupId>
-        <artifactId>gravel</artifactId>
-        <version>${jboss.gravel.version}</version>
-      </dependency>
-    
-     <dependency>
         <groupId>com.sun.facelets</groupId>
         <artifactId>jsf-facelets</artifactId>
         <version>${sun.facelets.version}</version>
       </dependency>
-
- <dependency>
+      <dependency>
         <groupId>javax.el</groupId>
         <artifactId>el-api</artifactId>
         <version>${javax.el.version}</version>
@@ -98,36 +93,17 @@
         <artifactId>jsf-impl</artifactId>
         <version>${javax.faces.version}</version>
       </dependency>
-     </dependencies>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>${javax.servlet.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.gravel</groupId>
+        <artifactId>gravel</artifactId>
+        <version>${jboss.gravel.version}</version>
+      </dependency>
+    </dependencies>
   </dependencyManagement>
 
-  <!-- Dependencies -->
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
- <!-- DistributionManagement -->
-  <distributionManagement>
-    <site>
-      <id>jbws.dyndns.org</id>
-      <url>file:///home/tdiesler/workspace/jbpm-site</url>
-    </site>
-  </distributionManagement>
-
-   <!-- Repositories -->
-  <repositories>
-    <repository>
-      <id>repository.jboss.org</id>
-      <url>http://repository.jboss.org/maven2</url>
-    </repository>
-  </repositories>
- </project>
+</project>




More information about the jbpm-commits mailing list