[jbpm-commits] JBoss JBPM SVN: r6506 - in jbpm4/trunk: modules/api and 26 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Sat Jul 17 10:15:49 EDT 2010


Author: alex.guizar at jboss.com
Date: 2010-07-17 10:15:48 -0400 (Sat, 17 Jul 2010)
New Revision: 6506

Added:
   jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/context.xml
Modified:
   jbpm4/trunk/modules/api/pom.xml
   jbpm4/trunk/modules/bpmn/pom.xml
   jbpm4/trunk/modules/db/pom.xml
   jbpm4/trunk/modules/devguide/pom.xml
   jbpm4/trunk/modules/distro/pom.xml
   jbpm4/trunk/modules/distro/src/main/files/install/build.xml
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/hsqldb.hibernate.cfg.xml
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/mysql.hibernate.cfg.xml
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/oracle.hibernate.cfg.xml
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/postgresql.hibernate.cfg.xml
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/sybase.hibernate.cfg.xml
   jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml
   jbpm4/trunk/modules/enterprise/pom.xml
   jbpm4/trunk/modules/examples/pom.xml
   jbpm4/trunk/modules/integration/console/pom.xml
   jbpm4/trunk/modules/integration/form-plugin/pom.xml
   jbpm4/trunk/modules/integration/graphView-plugin/pom.xml
   jbpm4/trunk/modules/integration/pom.xml
   jbpm4/trunk/modules/integration/report/pom.xml
   jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity.rptdesign
   jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity_old.rptdesign
   jbpm4/trunk/modules/integration/report/src/main/resources/process_summary.rptdesign
   jbpm4/trunk/modules/integration/report/src/main/resources/specific_system_overview.rptdesign
   jbpm4/trunk/modules/integration/tomcat/pom.xml
   jbpm4/trunk/modules/integration/tomcat/src/main/java/org/jbpm/integration/tomcat6/JbpmConsoleRealm.java
   jbpm4/trunk/modules/jboss/pom.xml
   jbpm4/trunk/modules/jpdl/pom.xml
   jbpm4/trunk/modules/log/pom.xml
   jbpm4/trunk/modules/migration/pom.xml
   jbpm4/trunk/modules/pvm/pom.xml
   jbpm4/trunk/modules/test-base/pom.xml
   jbpm4/trunk/modules/test-db/pom.xml
   jbpm4/trunk/modules/test-pojo/pom.xml
   jbpm4/trunk/modules/userguide/pom.xml
   jbpm4/trunk/pom.xml
Log:
JBPM-2915 employ global data source in jbpm4 tomcat installation
revert jbpm-4.4 release preparation


Modified: jbpm4/trunk/modules/api/pom.xml
===================================================================
--- jbpm4/trunk/modules/api/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/api/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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">
 
   <!-- Module info -->
   <modelVersion>4.0.0</modelVersion>
@@ -22,7 +23,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: jbpm4/trunk/modules/bpmn/pom.xml
===================================================================
--- jbpm4/trunk/modules/bpmn/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/bpmn/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $Id: pom.xml 5246 2009-07-06 11:07:48Z tom.baeyens 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">
 
   <!-- Module Info -->
   <modelVersion>4.0.0</modelVersion>
@@ -22,7 +23,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: jbpm4/trunk/modules/db/pom.xml
===================================================================
--- jbpm4/trunk/modules/db/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/db/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- ====================================================================== -->
+<!--  jBPM: Workflow in Java                                                -->
 <!--                                                                        -->
-<!--  JBoss, the OpenSource J2EE webOS                                      -->
-<!--                                                                        -->
 <!--  Distributable under LGPL license.                                     -->
 <!--  See terms of license at http://www.gnu.org.                           -->
-<!--                                                                        -->
 <!-- ====================================================================== -->
 
-<!-- $Id: pom.xml 3010 2008-11-20 08:30:16Z tom.baeyens 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">
+<!-- $Id$ -->
 
-  <!-- Module Info -->
+<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>
+
+  <!-- Module Info -->
   <name>jBPM 4 - DB</name>
   <groupId>org.jbpm.jbpm4</groupId>
   <artifactId>jbpm-db</artifactId>
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -44,7 +44,8 @@
                 <configuration>
                   <tasks>
                     <property name="project.output.dir" value="${project.build.outputDirectory}" />
-                    <ant antfile="scripts/antrun-schema.xml" target="create-schema" inheritRefs="yes" />
+                    <ant antfile="scripts/antrun-schema.xml" target="create-schema"
+                      inheritRefs="yes" />
                   </tasks>
                 </configuration>
               </execution>
@@ -84,7 +85,6 @@
 
       <build>
         <plugins>
-
           <plugin>
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
@@ -123,10 +123,12 @@
                     <property name="project.output.dir" value="${project.build.outputDirectory}" />
                     <property name="old.scripts.dir" value="${old.scripts.directory}" />
                     <!-- upgrade scripts could be written to distro directly -->
-                    <property name="upgrade.scripts.dir" value="${project.build.directory}/upgrade-${old.version}-to-${project.version}" />
+                    <property name="upgrade.scripts.dir"
+                      value="${project.build.directory}/upgrade-${old.version}-to-${project.version}" />
                     <!-- for some reason that i don't get, the user.home must be passed explicitly -->
                     <property name="user.home" value="${user.home}" />
-                    <ant antfile="scripts/antrun-schema.xml" target="schema-upgrade" inheritRefs="yes" />
+                    <ant antfile="scripts/antrun-schema.xml" target="schema-upgrade"
+                      inheritRefs="yes" />
                   </tasks>
                 </configuration>
               </execution>
@@ -135,7 +137,6 @@
         </plugins>
       </build>
     </profile>
-    
   </profiles>
 
   <!-- Dependencies -->
@@ -157,6 +158,4 @@
       <artifactId>postgresql</artifactId>
     </dependency>
   </dependencies>
-
-
 </project>
\ No newline at end of file


Property changes on: jbpm4/trunk/modules/db/pom.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: jbpm4/trunk/modules/devguide/pom.xml
===================================================================
--- jbpm4/trunk/modules/devguide/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/devguide/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-  <!-- ====================================================================== -->
-  <!--                                                                        -->
-  <!--  JBoss, the OpenSource J2EE webOS                                      -->
-  <!--                                                                        -->
-  <!--  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: pom.xml 2693 2008-10-31 09:12:32Z tom.baeyens at jboss.com $ -->
+<!-- $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>jBPM 4 - Developers Guide</name>
@@ -24,24 +22,13 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <dependencies>
-    <!-- 
-    <dependency>
-      <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-pvm</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    -->
-  </dependencies>
-
   <build>
     <!-- ### PLUGINS ###################################################### -->
     <plugins>
-
       <plugin>
         <groupId>org.jboss.maven.plugins</groupId>
         <artifactId>maven-jdocbook-plugin</artifactId>
@@ -89,10 +76,7 @@
             </format>
           </formats>
         </configuration>
-
       </plugin>
-
     </plugins>
   </build>
-
 </project>
\ No newline at end of file


Property changes on: jbpm4/trunk/modules/devguide/pom.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: jbpm4/trunk/modules/distro/pom.xml
===================================================================
--- jbpm4/trunk/modules/distro/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/distro/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,9 @@
 
 <!-- $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>jBPM 4 - Distro</name>
@@ -20,7 +22,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -17,21 +17,13 @@
   <!-- USER CUSTOMIZABLE PROPERTIES -->
   <!-- {hsqldb | mysql | oracle | postgresql} -->
   <property name="database" value="hsqldb" />
-  <!-- {standalone | jta | spring} -->
-  <property name="tx" value="standalone" />
 
   <!-- INTERNAL PROPERTY DEFAULTS -->
   <condition property="jbpm.home" value="${jbpm.parent.dir}/jbpm-4.x" else="${basedir}/..">
     <isset property="jbpm.parent.dir" />
   </condition>
-  <!-- jdbc | datasource -->
-  <property name="hibernate.connection.type" value="jdbc" />
-  <!-- jdk | none -->
-  <property name="logging" value="jdk" />
   <property name="cfg.dest.dir" value="${jbpm.home}/install/generated/cfg" />
   <property name="install.src.dir" value="${jbpm.home}/install/src" />
-  <!-- default | testsuite -->
-  <property name="mail.cfg" value="default" />
 
   <property name="bind.address" value="localhost" />
 
@@ -143,7 +135,6 @@
     <antcall target="install.examples.into.jboss" />
     <antcall target="load.example.identities" />
     <antcall target="install.eclipse" />
-    <antcall target="start.eclipse" />
   </target>
 
   <!-- ### DEMO TEARDOWN JBOSS ##################################################### -->
@@ -154,40 +145,67 @@
   </target>
 
   <!-- ### CLEAN CONFIGURATION DIR ########################################### -->
-  <target name="clean.cfg.dir" description="Deletes the ${cfg.dest.dir}">
+  <target name="clean.cfg.dir" description="Deletes the generated configuration">
     <delete dir="${cfg.dest.dir}" />
   </target>
 
-  <!-- ### CREATE CONFIGURATION ########################################### -->
-  <target name="create.cfg" description="Creates a configuration in ${cfg.dest.dir}">
-    <mkdir dir="${cfg.dest.dir}" />
-    <copy tofile="${cfg.dest.dir}/jbpm.cfg.xml"
-          file="${install.src.dir}/cfg/jbpm/${tx}.jbpm.cfg.xml"
-          overwrite="true" failonerror="false"  />
-    <copy tofile="${cfg.dest.dir}/jbpm.hibernate.cfg.xml"
-          file="${install.src.dir}/cfg/hibernate/${hibernate.connection.type}/${database}.hibernate.cfg.xml"
-          overwrite="true">
-      <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" />
-    </copy>
-    <replace file="${cfg.dest.dir}/jbpm.hibernate.cfg.xml"
-             token="$${bind.address}"
-             value="${bind.address}" />
-    <copy todir="${cfg.dest.dir}" overwrite="true">
-      <fileset dir="${install.src.dir}/cfg/logging/${logging}" />
-    </copy>
-    <copy tofile="${cfg.dest.dir}/jbpm.mail.properties"
-          file="${install.src.dir}/cfg/mail/jbpm.mail.${mail.cfg}.properties"
-          overwrite="true">
-      <filterset>
-        <filter token="bind.address" value="${bind.address}" />
-      </filterset>
-    </copy>
+  <macrodef name="generatecfg">
+    <!-- {standalone | jta | spring | tomcat} -->
+    <attribute name="transaction" default="standalone" />
+    <!-- jdbc | datasource -->
+    <attribute name="connection" default="jdbc" />
+    <!-- jdk | none -->
+    <attribute name="log" default="jdk" />
+    <!-- default | testsuite -->
+    <attribute name="mail" default="default" />
 
-    <!-- If the target environment uses Spring, also copy the applicationContext.xml file-->
-    <condition property="is.spring.environment">
-      <contains string="${tx}" substring="spring" />
-    </condition>
-    <antcall target="internal.copy.spring.applicationContext" />
+    <sequential>
+      <mkdir dir="${cfg.dest.dir}" />
+      <copy tofile="${cfg.dest.dir}/jbpm.cfg.xml"
+            file="${install.src.dir}/cfg/jbpm/@{transaction}.jbpm.cfg.xml"
+            overwrite="true"
+            failonerror="false" />
+      <copy tofile="${cfg.dest.dir}/jbpm.hibernate.cfg.xml"
+            file="${install.src.dir}/cfg/hibernate/@{connection}/${database}.hibernate.cfg.xml"
+            overwrite="true">
+        <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" />
+      </copy>
+      <replace file="${cfg.dest.dir}/jbpm.hibernate.cfg.xml"
+               token="$${bind.address}"
+               value="${bind.address}" />
+      <copy todir="${cfg.dest.dir}" overwrite="true">
+        <fileset dir="${install.src.dir}/cfg/logging/@{log}" />
+      </copy>
+      <copy tofile="${cfg.dest.dir}/jbpm.mail.properties"
+            file="${install.src.dir}/cfg/mail/jbpm.mail.@{mail}.properties"
+            overwrite="true">
+        <filterset>
+          <filter token="bind.address" value="${bind.address}" />
+        </filterset>
+      </copy>
+
+      <!-- If the target environment uses Spring, also copy the applicationContext.xml file-->
+      <condition property="is.spring.environment">
+        <contains string="@{transaction}" substring="spring" />
+      </condition>
+      <antcall target="internal.copy.spring.applicationContext" />
+    </sequential>
+  </macrodef>
+
+  <!-- ### CREATE CONFIGURATION ########################################### -->
+  <target name="create.cfg" description="Generates a configuration">
+    <!-- {standalone | jta | spring} -->
+    <property name="tx" value="standalone" />
+    <!-- jdbc | datasource -->
+    <property name="hibernate.connection.type" value="jdbc" />
+    <!-- jdk | none -->
+    <property name="logging" value="jdk" />
+    <!-- default | testsuite -->
+    <property name="mail.cfg" value="default" />
+    <generatecfg transaction="${tx}"
+                 connection="${hibernate.connection.type}"
+                 log="${logging}"
+                 mail="${mail.cfg}" />
   </target>
 
   <target name="internal.copy.spring.applicationContext" if="is.spring.environment">
@@ -201,7 +219,7 @@
   <!-- ### CREATE USER WEBAPP ########################################## -->
   <target name="create.user.webapp"
           depends="create.cfg"
-          description="Generates a configuration in dir /install/generated/user-webapp">
+          description="Generates a custom web application">
     <delete dir="${jbpm.home}/install/generated/user-webapp" />
     <mkdir dir="${jbpm.home}/install/generated/user-webapp/WEB-INF/classes" />
     <mkdir dir="${jbpm.home}/install/generated/user-webapp/WEB-INF/lib" />
@@ -266,50 +284,47 @@
   <!-- ### INSTALL JBOSS ################################################## -->
   <target name="install.jboss"
           depends="get.jboss"
-          description="Downloads jboss to ${jboss.distro.dir} if its not available and then unzips jboss">
+          description="Downloads jboss if unavailable and then extracts it">
     <unzip src="${jboss.distro.path}" dest="${jboss.parent.dir}" />
     <chmod perm="a+x" file="${jboss.home}/bin/run.sh" />
     <chmod perm="a+x" file="${jboss.home}/bin/shutdown.sh" />
   </target>
 
   <!-- ### GET JBOSS ###################################################### -->
-  <target name="get.jboss"
-          unless="is.jboss.distro.available"
-          description="Downloads jboss into ${jboss.distro.dir}">
+  <target name="get.jboss" unless="is.jboss.distro.available" description="Downloads jboss">
     <mkdir dir="${jboss.distro.dir}" />
     <get src="${jboss.distro.url}" dest="${jboss.distro.path}" />
   </target>
 
   <!-- ### INSTALL JBPM INTO JBOSS ######################### -->
-  <target name="install.jbpm.into.jboss"
-          depends="create.cfg"
-          description="Installs jBPM into JBoss">
+  <target name="install.jbpm.into.jboss" description="Installs jBPM into JBoss">
+    <property name="tx" value="jta" />
+    <generatecfg connection="datasource" />
+
     <!-- copy static configuration files -->
     <copy todir="${jboss.server.config.dir}" overwrite="true">
       <fileset dir="${jbpm.home}/install/src/jboss/config" />
     </copy>
 
-    <!-- copy the right hibernate configuration file -->
-    <copy file="${jbpm.home}/install/src/cfg/hibernate/datasource/${database}.hibernate.cfg.xml"
-          tofile="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar/jbpm.hibernate.cfg.xml"
-          overwrite="true" />
+    <!-- copy generated configuration files -->
+    <copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true">
+      <fileset dir="${cfg.dest.dir}">
+        <include name="jbpm.hibernate.cfg.xml" />
+        <include name="jbpm.mail.properties" />
+      </fileset>
+    </copy>
 
-    <!-- copy the right datasource configuration file and replace the jdbc properties with
-         the values in the jdbc/${database}.properties file -->
+    <!-- copy the data source descriptor file -->
     <copy file="${jbpm.home}/install/src/jboss/datasources/jbpm-${database}-ds.xml"
           todir="${jboss.server.config.dir}/deploy/jbpm"
           overwrite="true">
       <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" />
     </copy>
+    <!-- replace the jdbc properties with the values from jdbc/${database}.properties -->
     <replace file="${jboss.server.config.dir}/deploy/jbpm/jbpm-${database}-ds.xml"
              token="$${bind.address}"
              value="${bind.address}" />
 
-    <!-- copy the right mail properties file -->
-    <copy file="${cfg.dest.dir}/jbpm.mail.properties"
-          todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar"
-          overwrite="true" />
-
     <!-- unzip console.war -->
     <mkdir dir="${jboss.server.config.dir}/deploy/jbpm/gwt-console-jbpm.war" />
     <unzip src="${jbpm.home}/lib/gwt-console-jbpm.war"
@@ -328,7 +343,6 @@
 
       <fileset dir="${jbpm.home}/lib">
         <include name="antlr-runtime.jar" />
-        <!-- include name="core.jar" /-->
         <include name="drools-api.jar" />
         <include name="drools-core.jar" />
         <include name="drools-compiler.jar" />
@@ -399,13 +413,11 @@
   <!-- ### START JBOSS ################################################### -->
   <target name="start.jboss"
           description="starts jboss and waits till jboss is booted, then lets jboss run in the background">
-    <exec executable="${jboss.home}/bin/run.bat"
-          os="Windows 7,Windows Vista,Windows XP,Windows 2000"
-          spawn="yes">
+    <exec executable="${jboss.home}/bin/run.bat" spawn="yes" osfamily="windows">
       <arg value="-b" />
       <arg value="${bind.address}" />
     </exec>
-    <exec executable="${jboss.home}/bin/run.sh" spawn="yes" os="Linux,Mac OS X">
+    <exec executable="${jboss.home}/bin/run.sh" spawn="yes" osfamily="unix">
       <arg value="-b" />
       <arg value="${bind.address}" />
     </exec>
@@ -422,13 +434,12 @@
   <!-- ### STOP JBOSS ################################################### -->
   <target name="stop.jboss"
           description="signals jboss to stop, but doesn't wait till its finished">
-    <exec executable="${jboss.home}/bin/shutdown.bat"
-          os="Windows 7,Windows Vista,Windows XP,Windows 2000">
+    <exec executable="${jboss.home}/bin/shutdown.bat" osfamily="windows">
       <arg value="-s" />
       <arg value="jnp://${bind.address}:1099" />
       <arg value="-S" />
     </exec>
-    <exec executable="${jboss.home}/bin/shutdown.sh" os="Linux,Mac OS X">
+    <exec executable="${jboss.home}/bin/shutdown.sh" osfamily="unix">
       <arg value="-s" />
       <arg value="jnp://${bind.address}:1099" />
       <arg value="-S" />
@@ -446,7 +457,6 @@
     <antcall target="load.example.identities" />
     <antcall target="start.tomcat" />
     <antcall target="install.eclipse" />
-    <antcall target="start.eclipse" />
   </target>
 
   <!-- ### DEMO TEARDOWN TOMCAT ################################################ -->
@@ -472,7 +482,7 @@
   <!-- ### INSTALL TOMCAT ################################################## -->
   <target name="install.tomcat"
           depends="get.tomcat"
-          description="Downloads tomcat to ${tomcat.distro.dir} if its not available and then unzips tomcat">
+          description="Downloads tomcat if unavailable and then extracts it">
     <unzip src="${tomcat.distro.path}" dest="${tomcat.parent.dir}" />
     <antcall target="install.tomcat.unix" />
   </target>
@@ -488,25 +498,27 @@
   <!-- ### GET TOMCAT ###################################################### -->
   <target name="get.tomcat"
           unless="is.tomcat.distro.available"
-          description="Downloads tomcat into ${tomcat.distro.dir} if it is not available">
+          description="Downloads tomcat if unavailable">
     <mkdir dir="${tomcat.distro.dir}" />
     <get src="${tomcat.distro.url}" dest="${tomcat.distro.path}" />
   </target>
 
   <!-- ### INSTALL JBPM INTO TOMCAT ####################################### -->
-  <target name="install.jbpm.into.tomcat"
-          depends="create.cfg"
-          description="Installs jBPM into tomcat">
+  <target name="install.jbpm.into.tomcat" description="Installs jBPM into tomcat">
     <property name="is.tomcat" value="true" />
+    <!-- generate configuration -->
+    <generatecfg connection="tomcat" />
 
-    <!-- create the jbpm configuration jar file and drop in /lib -->
-    <jar destfile="${tomcat.home}/lib/jbpm.cfg.jar">
+    <!-- create the jbpm configuration jar file in lib/ -->
+    <jar destfile="${tomcat.home}/lib/jbpm-cfg.jar">
       <fileset dir="${jbpm.home}/install/generated/cfg">
-        <exclude name="logging.properties" />
+        <include name="jbpm.cfg.xml" />
+        <include name="jbpm.hibernate.cfg.xml" />
+        <include name="jbpm.mail.properties" />
       </fileset>
     </jar>
 
-    <!-- Copy jBPM third party libs into /lib -->
+    <!-- copy jBPM third party libs into lib/ -->
     <copy todir="${tomcat.home}/lib" overwrite="true">
       <fileset dir="${jbpm.home}">
         <include name="jbpm.jar" />
@@ -518,7 +530,6 @@
         <include name="bsh.jar" />
         <include name="commons-collections.jar" />
         <include name="commons-logging.jar" />
-        <!-- include name="core.jar" /-->
         <include name="dom4j.jar" />
         <include name="drools-api.jar" />
         <include name="drools-core.jar" />
@@ -548,46 +559,39 @@
       </fileset>
     </copy>
 
-    <!-- Copy jbpm-console wars and configuration into /webapps -->
-
+    <!-- copy jbpm-console wars and configuration into webapps/ -->
     <mkdir dir="${tomcat.home}/webapps/jbpm-console" />
-    <mkdir dir="${tomcat.home}/webapps/gwt-console-server" />
-
     <unzip src="${jbpm.home}/lib/gwt-console-jbpm.war"
            dest="${tomcat.home}/webapps/jbpm-console" />
+    <copy file="${install.src.dir}/tomcat/context.xml"
+          todir="${tomcat.home}/webapps/jbpm-console/META-INF" />
 
+    <mkdir dir="${tomcat.home}/webapps/gwt-console-server" />
     <unzip src="${jbpm.home}/lib/gwt-console-server-jbpm.war"
            dest="${tomcat.home}/webapps/gwt-console-server" />
+    <copy file="${install.src.dir}/tomcat/context.xml"
+          todir="${tomcat.home}/webapps/gwt-console-server/META-INF" />
 
-    <move todir="${tomcat.home}/lib">
-      <fileset dir="${tomcat.home}/webapps/jbpm-console/WEB-INF/lib">
-        <include name="guice*.jar" />
-        <include name="errai*.jar" />
-        <include name="mvel*.jar" />
-      </fileset>
-      <fileset dir="${tomcat.home}/webapps/jbpm-console/WEB-INF/classes">
-        <include name="ErraiService.properties" />
-        <include name="ErraiApp.properties" />
-      </fileset>
-    </move>
-
-    <!-- Copy Signavio war into /webapps -->
+    <!-- copy signavio war to webapps/ -->
     <antcall target="install.signavio.into.tomcat" />
 
-
     <!-- reporting -->
     <property name="birt.dir" value="${tomcat.home}/birt" />
     <mkdir dir="${birt.dir}" />
     <unzip src="${jbpm.home}/lib/report-engine.zip" dest="${birt.dir}" />
     <unzip src="${jbpm.home}/lib/jbpm-console-reports.jar" dest="${birt.dir}" />
+    <replace dir="${birt.dir}"
+             includes="*.rptdesign"
+             token="java:JbpmDS"
+             value="java:comp/env/jdbc/JbpmDS"/>
 
-    <!-- copy database driver -->
+    <!-- copy database driver to lib/ -->
     <property name="database.driver.destination.dir" value="${tomcat.home}/lib" />
     <antcall target="internal.copy.database.driver" />
 
-    <!-- tweak the tomcat server config for the security domain -->
+    <!-- tweak the tomcat server config for the security realm -->
     <copy file="${install.src.dir}/tomcat/server.xml"
-          tofile="${tomcat.home}/conf/server.xml"
+          todir="${tomcat.home}/conf"
           overwrite="true">
       <filterset filtersfile="${jdbc.properties.dir}/${database}.properties" />
     </copy>
@@ -674,25 +678,20 @@
     <exec executable="${tomcat.home}/bin/catalina.bat"
           dir="${tomcat.home}/bin"
           spawn="yes"
-          os="Windows 7,Windows Vista,Windows XP,Windows 2000">
+          osfamily="windows">
       <arg value="stop" />
     </exec>
     <exec executable="${tomcat.home}/bin/catalina.sh"
           dir="${tomcat.home}/bin"
           spawn="yes"
-          os="Linux,Mac OS X">
+          osfamily="unix">
       <arg value="stop" />
     </exec>
   </target>
 
   <!-- ### CREATE JBPM SCHEMA ############################################# -->
-  <target name="create.jbpm.schema"
-          depends="create.cfg"
-          description="creates the jbpm tables in the database">
-    <echo message="creating jbpm schema..." />
-    <copy tofile="${cfg.dest.dir}/jbpm.cfg.xml"
-          file="${install.src.dir}/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml"
-          overwrite="true" />
+  <target name="create.jbpm.schema" description="creates the jbpm tables in the database">
+    <generatecfg transaction="standalone.testsuite" />
     <java classname="org.jbpm.db.Create" fork="true">
       <arg value="${database}" />
       <classpath>
@@ -710,12 +709,8 @@
 
   <!-- ### UPGRADE JBPM SCHEMA ############################################# -->
   <target name="upgrade.jbpm.schema"
-          depends="create.cfg"
           description="Upgrades the jBPM tables in the database to the current version">
-    <echo message="upgrading jbpm schema..." />
-    <copy tofile="${cfg.dest.dir}/jbpm.cfg.xml"
-          file="${install.src.dir}/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml"
-          overwrite="true" />
+    <generatecfg transaction="standalone.testsuite" />
     <java classname="org.jbpm.db.Upgrade" fork="true">
       <arg value="${database}" />
       <classpath>
@@ -801,9 +796,7 @@
   <!-- ### START ECLIPSE ################################################## -->
   <target name="start.eclipse" description="starts eclipse">
     <!-- Windows -->
-    <exec executable="${jbpm.home}/eclipse/eclipse.exe"
-          spawn="yes"
-          os="Windows 7,Windows Vista,Windows XP,Windows 2000">
+    <exec executable="${jbpm.home}/eclipse/eclipse.exe" spawn="yes" osfamily="windows">
       <arg value="-data" />
       <arg value="${jbpm.home}/workspace" />
     </exec>

Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/hsqldb.hibernate.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/hsqldb.hibernate.cfg.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/hsqldb.hibernate.cfg.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -10,7 +10,7 @@
     <property name="hibernate.connection.datasource">java:JbpmDS</property>
     <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
     <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
-    <property name="jta.UserTransaction">UserTransaction</property>
+    <property name="hibernate.format_sql">true</property>
 
     <mapping resource="jbpm.repository.hbm.xml" />
     <mapping resource="jbpm.execution.hbm.xml" />

Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/mysql.hibernate.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/mysql.hibernate.cfg.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/mysql.hibernate.cfg.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -10,7 +10,7 @@
     <property name="hibernate.connection.datasource">java:JbpmDS</property>
     <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
     <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
-    <property name="jta.UserTransaction">UserTransaction</property>
+    <property name="hibernate.format_sql">true</property>
 
     <mapping resource="jbpm.repository.hbm.xml" />
     <mapping resource="jbpm.execution.hbm.xml" />

Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/oracle.hibernate.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/oracle.hibernate.cfg.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/oracle.hibernate.cfg.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -10,7 +10,7 @@
     <property name="hibernate.connection.datasource">java:JbpmDS</property>
     <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
     <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
-    <property name="jta.UserTransaction">UserTransaction</property>
+    <property name="hibernate.format_sql">true</property>
 
     <mapping resource="jbpm.repository.hbm.xml" />
     <mapping resource="jbpm.execution.hbm.xml" />

Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/postgresql.hibernate.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/postgresql.hibernate.cfg.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/postgresql.hibernate.cfg.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -10,7 +10,7 @@
     <property name="hibernate.connection.datasource">java:JbpmDS</property>
     <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
     <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
-    <property name="jta.UserTransaction">UserTransaction</property>
+    <property name="hibernate.format_sql">true</property>
 
     <mapping resource="jbpm.repository.hbm.xml" />
     <mapping resource="jbpm.execution.hbm.xml" />

Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/sybase.hibernate.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/sybase.hibernate.cfg.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/datasource/sybase.hibernate.cfg.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -10,7 +10,7 @@
     <property name="hibernate.connection.datasource">java:JbpmDS</property>
     <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
     <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
-    <property name="jta.UserTransaction">UserTransaction</property>
+    <property name="hibernate.format_sql">true</property>
 
     <mapping resource="jbpm.repository.hbm.xml" />
     <mapping resource="jbpm.execution.hbm.xml" />

Added: jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/context.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/context.xml	                        (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/context.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Context>
+  <ResourceLink name="jdbc/JbpmDS" global="jdbc/jbpm" type="javax.sql.DataSource" />
+  <Realm className="org.jbpm.integration.tomcat6.JbpmConsoleRealm" dataSourceName="jdbc/jbpm" />
+</Context>


Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/context.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/tomcat/server.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -1,50 +1,103 @@
-<?xml version='1.0' encoding='utf-8'?>
-  <!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements. See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version
-    2.0 (the "License"); you may not use this file except in compliance
-    with the License. You may obtain a copy of the License at
+<?xml version="1.0" encoding="UTF-8"?>
 
-    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-    applicable law or agreed to in writing, software distributed under
-    the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
-    OR CONDITIONS OF ANY KIND, either express or implied. See the
-    License for the specific language governing permissions and
-    limitations under the License.
-  -->
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+-->
 <Server port="8005" shutdown="SHUTDOWN">
-
+  <!--APR library loader. Documentation at /docs/apr.html -->
   <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
   <Listener className="org.apache.catalina.core.JasperListener" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <!-- JMX Support for the Tomcat server. Documentation at /docs/non-existent.html -->
   <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
   <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
 
-  <Service name="Catalina">
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
 
-    <Connector address="${bind.address}" port="8080" protocol="HTTP/1.1" connectionTimeout="20000" redirectPort="8443" />
+    <!-- jBPM data source also used by JbpmConsoleRealm -->
+    <Resource name="jdbc/jbpm" auth="Container" type="javax.sql.DataSource"
+              username="@jdbc.username@" password="@jdbc.password@"
+              driverClassName="@jdbc.driver@" url="@jdbc.url@" />
+  </GlobalNamingResources>
 
-    <Connector address="${bind.address}" port="8009" protocol="AJP/1.3" redirectPort="8443" />
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container", 
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">  
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL HTTP/1.1 Connector on port 8080
+    -->
+    <Connector address="${bind.address}" port="8080" protocol="HTTP/1.1" 
+               connectionTimeout="20000" redirectPort="8443" />
 
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector address="${bind.address}" port="8009" protocol="AJP/1.3"
+               redirectPort="8443" />
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
     <Engine name="Catalina" defaultHost="localhost">
+      <!-- Editable user database that can also be used by
+           UserDatabaseRealm to authenticate users
+      -->
+      <Resource name="UserDatabase" auth="Container"
+                type="org.apache.catalina.UserDatabase"
+                description="User database that can be updated and saved"
+                factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+                pathname="conf/tomcat-users.xml" />
 
-      <Host name="localhost" appBase="webapps" unpackWARs="true"
-        autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false">
-
+      <!-- Define the default virtual host
+           Note: XML Schema validation will not work with Xerces 2.2.
+       -->
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="true" autoDeploy="true"
+            xmlValidation="false" xmlNamespaceAware="false">
         <!--
-          Current workaround for using the JBPM identity tables on Tomcat.
-          Setting the Realm on the context with path /jbpm-console did not seem
-          to work. Note that this workaround means that the cmplete localhost
-          domain will use this realm !
-         -->
-        <Realm className="org.jbpm.integration.tomcat6.JbpmConsoleRealm"
-               driverName="@jdbc.driver@"
-               connectionUrl="@jdbc.url@"
-               connectionName="@jdbc.username@"
-               connectionPassword="@jdbc.password@" />
-
+          Current workaround for using the JBPM identity tables on Tomcat. Setting the Realm on
+          the context with path /jbpm-console did not seem to work. Note that this workaround
+          means that the complete localhost domain will use this realm !
+        -->
       </Host>
     </Engine>
   </Service>
-</Server>
\ No newline at end of file
+</Server>

Modified: jbpm4/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/enterprise/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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>jBPM 4 - Enterprise</name>
@@ -21,7 +22,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -74,94 +75,4 @@
       </plugin>
     </plugins>
   </build>
-  
-<!-- 
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-        <filtering>true</filtering>
-      </testResource>
-    </testResources>
-
-    <plugins>
-
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <executions>
-
-          <execution>
-            <id>assembly-test-dependencies</id>
-            <phase>generate-test-resources</phase>
-            <goals>
-              <goal>directory-single</goal>
-            </goals>
-            <configuration>
-              <finalName>test-dependencies</finalName>
-              <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
-              <appendAssemblyId>false</appendAssemblyId>
-              <descriptors>
-                <descriptor>scripts/assembly-test-dependencies.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>build-test-jars</id>
-            <phase>process-test-classes</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <property name="build.dir" value="${project.build.directory}" />
-                <property name="test.resources.dir" value="${build.dir}/test-classes" />
-                <property name="build.finalName" value="${project.build.finalName}" />
-                <ant antfile="scripts/antrun-test-jars.xml" target="build-jars" />
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>org/jbpm/enterprise/internal/ejb/TimerTest.java</exclude>
-            <exclude>org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>no-bind-address</id>
-      <activation>
-        <property>
-          <name>!bind.address</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <skipTests>true</skipTests>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-  </profiles>
-
- -->
 </project>
\ No newline at end of file

Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/examples/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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">
 
   <!-- Module Info -->
   <modelVersion>4.0.0</modelVersion>
@@ -22,7 +23,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: jbpm4/trunk/modules/integration/console/pom.xml
===================================================================
--- jbpm4/trunk/modules/integration/console/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/integration/console/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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>jBPM 4 - Integration Console</name>
@@ -22,7 +23,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm-integration</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
   </parent>
 
   <!-- Properties -->

Modified: jbpm4/trunk/modules/integration/form-plugin/pom.xml
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/integration/form-plugin/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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>jBPM 4 - Integration Form Plugin</name>
@@ -22,7 +23,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm-integration</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
   </parent>
 
   <!-- Dependencies -->

Modified: jbpm4/trunk/modules/integration/graphView-plugin/pom.xml
===================================================================
--- jbpm4/trunk/modules/integration/graphView-plugin/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/integration/graphView-plugin/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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>jBPM 4 - Integration GraphView Plugin</name>
@@ -21,7 +22,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm-integration</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
   </parent>
 
   <!-- Dependencies -->

Modified: jbpm4/trunk/modules/integration/pom.xml
===================================================================
--- jbpm4/trunk/modules/integration/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/integration/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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>jBPM 4 - Integration</name>
@@ -23,7 +24,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: jbpm4/trunk/modules/integration/report/pom.xml
===================================================================
--- jbpm4/trunk/modules/integration/report/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/integration/report/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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>jBPM 4 - Integration Reports</name>
@@ -21,6 +22,6 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm-integration</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
   </parent>
 </project>

Modified: jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity.rptdesign
===================================================================
--- jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity.rptdesign	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity.rptdesign	2010-07-17 14:15:48 UTC (rev 6506)
@@ -12,7 +12,7 @@
             <property name="odaDriverClass">org.hsqldb.jdbcDriver</property>
             <property name="odaURL">jdbc:hsqldb:hsql://localhost:1701</property>
             <property name="odaUser">sa</property>
-            <property name="odaJndiName">java:/JbpmDS</property>
+            <property name="odaJndiName">java:JbpmDS</property>
         </oda-data-source>
     </data-sources>
     <data-sets>

Modified: jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity_old.rptdesign
===================================================================
--- jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity_old.rptdesign	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/integration/report/src/main/resources/overall_activity_old.rptdesign	2010-07-17 14:15:48 UTC (rev 6506)
@@ -14,7 +14,7 @@
             <property name="odaURL">jdbc:mysql://localhost:3306/jbpmdb</property>
             <property name="odaUser">jbpm</property>
             <encrypted-property name="odaPassword" encryptionID="base64">amJwbQ==</encrypted-property>
-            <property name="odaJndiName">java:/JbpmDS</property>
+            <property name="odaJndiName">java:JbpmDS</property>
         </oda-data-source>
     </data-sources>
     <data-sets>

Modified: jbpm4/trunk/modules/integration/report/src/main/resources/process_summary.rptdesign
===================================================================
--- jbpm4/trunk/modules/integration/report/src/main/resources/process_summary.rptdesign	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/integration/report/src/main/resources/process_summary.rptdesign	2010-07-17 14:15:48 UTC (rev 6506)
@@ -30,7 +30,7 @@
             <property name="odaURL">jdbc:mysql://localhost:3306/jbpmdb</property>
             <property name="odaUser">jbpm</property>
             <encrypted-property name="odaPassword" encryptionID="base64">amJwbQ==</encrypted-property>
-            <property name="odaJndiName">java:/JbpmDS</property>
+            <property name="odaJndiName">java:JbpmDS</property>
         </oda-data-source>
     </data-sources>
     <data-sets>

Modified: jbpm4/trunk/modules/integration/report/src/main/resources/specific_system_overview.rptdesign
===================================================================
--- jbpm4/trunk/modules/integration/report/src/main/resources/specific_system_overview.rptdesign	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/integration/report/src/main/resources/specific_system_overview.rptdesign	2010-07-17 14:15:48 UTC (rev 6506)
@@ -104,7 +104,7 @@
             <property name="odaDriverClass">org.hsqldb.jdbcDriver</property>
             <property name="odaURL">jdbc:hsqldb:hsql://localhost:1701</property>
             <property name="odaUser">sa</property>
-            <property name="odaJndiName">java:/JbpmDS</property>
+            <property name="odaJndiName">java:JbpmDS</property>
         </oda-data-source>
     </data-sources>
     <data-sets>

Modified: jbpm4/trunk/modules/integration/tomcat/pom.xml
===================================================================
--- jbpm4/trunk/modules/integration/tomcat/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/integration/tomcat/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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>jBPM 4 - Integration Tomcat 6</name>
@@ -21,7 +22,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm-integration</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
   </parent>
 
   <!-- Dependencies -->

Modified: jbpm4/trunk/modules/integration/tomcat/src/main/java/org/jbpm/integration/tomcat6/JbpmConsoleRealm.java
===================================================================
--- jbpm4/trunk/modules/integration/tomcat/src/main/java/org/jbpm/integration/tomcat6/JbpmConsoleRealm.java	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/integration/tomcat/src/main/java/org/jbpm/integration/tomcat6/JbpmConsoleRealm.java	2010-07-17 14:15:48 UTC (rev 6506)
@@ -26,114 +26,120 @@
 
 import java.security.Principal;
 import java.sql.Connection;
-import java.sql.Driver;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Properties;
 
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+
+import org.apache.catalina.ServerFactory;
+import org.apache.catalina.core.StandardServer;
 import org.apache.catalina.realm.GenericPrincipal;
 import org.apache.catalina.realm.JDBCRealm;
 import org.apache.catalina.realm.RealmBase;
+import org.apache.naming.ContextBindings;
 
-
 /**
- * Basic implementation of a Realm authenticator for the jBPM identity tables
- * using plain JDBC queries.
- * 
- * The default provided JDBCRealm cannot be used, since the tables need
- * to follow a schema which does not map to the jBPM identity tables.
- * See http://tomcat.apache.org/tomcat-6.0-doc/realm-howto.html#JDBCRealm.
- * 
+ * <p>
+ * Basic implementation of a Realm authenticator for the jBPM identity tables using plain JDBC
+ * queries.
+ * </p>
+ * <p>
+ * The default provided JDBCRealm cannot be used, since the tables need to follow a schema which
+ * does not map to the jBPM identity tables.
+ * </p>
+ * <p>
  * This code is based on the {@link JDBCRealm} code.
+ * </p>
  * 
+ * @see <a href="http://tomcat.apache.org/tomcat-6.0-doc/realm-howto.html">Realm How-To</a>
  * @author Joram Barrez
+ * @author Alejandro Guizar
  */
 public class JbpmConsoleRealm extends RealmBase {
-  
+
   private String driverName;
-  
   private String connectionUrl;
-  
   private String connectionName;
-  
   private String connectionPassword;
-  
-  private Driver driver;
-   
+
+  private String dataSourceName;
+  private boolean localDataSource;
+  private DataSource dataSource;
+
   public Principal authenticate(String user, String credentials) {
-    Connection conn = null;
     try {
-      
-      conn = openConnection();
-      Long userId = retrieveUserId(conn, user, credentials);
-      
-      if (userId != null) {
-        List<String> roles = retrieveRoles(conn, userId);
-        return new GenericPrincipal(this, user, credentials, roles);
-      }
-      
-    } catch (Exception e) {
-      containerLog.error(e);
-    } finally {
-      if (conn != null) {
-        try {
-          conn.close();
-        } catch (SQLException e) {
-          containerLog.error(e);
+      Connection conn = openConnection();
+      try {
+        long userId = retrieveUserId(conn, user, credentials);
+        if (userId != -1) {
+          List<String> roles = retrieveRoles(conn, userId);
+          return new GenericPrincipal(this, user, credentials, roles);
         }
       }
+      finally {
+        conn.close();
+      }
     }
+    catch (SQLException e) {
+      containerLog.error(e);
+    }
     return null;
   }
-  
-  private Long retrieveUserId(Connection conn, String username, String password) throws SQLException {
-    Long result = null;
-    PreparedStatement stm = null;
+
+  private long retrieveUserId(Connection conn, String username, String password)
+    throws SQLException {
+    PreparedStatement stm = conn.prepareStatement("SELECT DBID_\n"
+      + "FROM JBPM4_ID_USER\n"
+      + "WHERE ID_=? AND PASSWORD_=?");
     try {
-      stm = conn.prepareStatement("SELECT DBID_ FROM JBPM4_ID_USER WHERE ID_=? AND PASSWORD_=?");
       stm.setString(1, username);
       stm.setString(2, password);
       ResultSet rs = stm.executeQuery();
-      while (rs.next()) {
+      if (rs.next()) {
         return rs.getLong(1);
       }
-    } finally {
+    }
+    finally {
       stm.close();
     }
-    return result;
+    return -1;
   }
-  
+
   private List<String> retrieveRoles(Connection conn, Long userDbId) throws SQLException {
-    List<String> roles = new ArrayList<String>();
-    PreparedStatement stm = null;
+    PreparedStatement stm = conn.prepareStatement("SELECT JBPM4_ID_GROUP.NAME_\n"
+      + "FROM JBPM4_ID_GROUP\n"
+      + "INNER JOIN JBPM4_ID_MEMBERSHIP ON JBPM4_ID_MEMBERSHIP.GROUP_=JBPM4_ID_GROUP.DBID_\n"
+      + "INNER JOIN JBPM4_ID_USER ON JBPM4_ID_MEMBERSHIP.USER_=JBPM4_ID_USER.DBID_\n"
+      + "WHERE JBPM4_ID_USER.DBID_=?");
     try {
-      stm = conn.prepareStatement("SELECT JBPM4_ID_GROUP.NAME_ FROM JBPM4_ID_GROUP " +
-                "INNER JOIN JBPM4_ID_MEMBERSHIP ON JBPM4_ID_MEMBERSHIP.GROUP_=JBPM4_ID_GROUP.DBID_ " +
-                "INNER JOIN JBPM4_ID_USER ON JBPM4_ID_MEMBERSHIP.USER_=JBPM4_ID_USER.DBID_ " +
-                "WHERE JBPM4_ID_USER.DBID_=?");
       stm.setLong(1, userDbId);
       ResultSet rs = stm.executeQuery();
+      List<String> roles = new ArrayList<String>();
       while (rs.next()) {
         roles.add(rs.getString(1));
       }
-    } finally {
+      return roles;
+    }
+    finally {
       stm.close();
     }
-    return roles;
   }
-  
+
   public Principal authenticate(String user, byte[] credentials) {
     return authenticate(user, new String(credentials));
   }
-  
-  public Principal authenticate(String arg0, String arg1, String arg2, String arg3, String arg4, String arg5, String arg6, String arg7) {
+
+  public Principal authenticate(String arg0, String arg1, String arg2, String arg3,
+    String arg4, String arg5, String arg6, String arg7) {
     throw new UnsupportedOperationException();
   }
-  
+
   /**
    * Return the password associated with the principal user name.
    */
@@ -141,7 +147,6 @@
   protected String getPassword(String username) {
     throw new UnsupportedOperationException();
   }
-  
 
   /**
    * Return the principal associated with the given username.
@@ -150,104 +155,90 @@
   protected Principal getPrincipal(String userName) {
     throw new UnsupportedOperationException();
   }
-  
 
   protected String getName() {
-    return this.getClass().getName();
+    return getClass().getName();
   }
 
   public String getInfo() {
     return "JbpmConsoleRealm";
   }
-  
-  
+
   private Connection openConnection() throws SQLException {
-    
-    if (driver == null) {
+    if (dataSourceName != null) {
+      if (dataSource == null) {
+        try {
+          Context context;
+          if (localDataSource) {
+            context = (Context) ContextBindings.getClassLoader().lookup("comp/env");
+          }
+          else {
+            StandardServer server = (StandardServer) ServerFactory.getServer();
+            context = server.getGlobalNamingContext();
+          }
+          dataSource = (DataSource) context.lookup(dataSourceName);
+        }
+        catch (NamingException e) {
+          SQLException sqlException = new SQLException("failed to retrieve " + dataSourceName);
+          sqlException.initCause(e);
+          throw sqlException;
+        }
+      }
+      return dataSource.getConnection();
+    }
+    else {
       try {
-        driver = (Driver) Class.forName(driverName).newInstance();
-        DriverManager.setLoginTimeout(10);
-      } catch (Exception e) {
-        throw new RuntimeException("Could not instantiate driver " + driverName);
+        Class.forName(driverName);
+        Connection connection = DriverManager.getConnection(connectionUrl,
+          connectionName,
+          connectionPassword);
+        connection.setReadOnly(true);
+        return connection;
       }
+      catch (ClassNotFoundException e) {
+        SQLException sqlException = new SQLException("could not find " + driverName);
+        sqlException.initCause(e);
+        throw sqlException;
+      }
     }
-    
-    
-    Properties props = new Properties();
-    props.put("user", connectionName);
-    props.put("password", connectionPassword);
-    
-    Connection conn = driver.connect(connectionUrl, props);
-    conn.setReadOnly(true);
-    return conn;
   }
-  
-  /**
-   * @return the driverName
-   */
+
+  public String getDataSourceName() {
+    return dataSourceName;
+  }
+
+  public void setDataSourceName(String dataSourceName) {
+    this.dataSourceName = dataSourceName;
+  }
+
   public String getDriverName() {
     return driverName;
   }
 
-
-  
-  /**
-   * @param driverName the driverName to set
-   */
   public void setDriverName(String driverName) {
     this.driverName = driverName;
   }
 
-
-  
-  /**
-   * @return the connectionUrl
-   */
   public String getConnectionUrl() {
     return connectionUrl;
   }
 
-
-  
-  /**
-   * @param connectionUrl the connectionUrl to set
-   */
   public void setConnectionUrl(String connectionUrl) {
     this.connectionUrl = connectionUrl;
   }
 
-
-  
-  /**
-   * @return the connectionName
-   */
   public String getConnectionName() {
     return connectionName;
   }
 
-
-  
-  /**
-   * @param connectionName the connectionName to set
-   */
   public void setConnectionName(String connectionName) {
     this.connectionName = connectionName;
   }
 
-
-  
-  /**
-   * @return the connectionPassword
-   */
   public String getConnectionPassword() {
     return connectionPassword;
   }
 
-
-  
-  /**
-   * @param connectionPassword the connectionPassword to set
-   */
   public void setConnectionPassword(String connectionPassword) {
     this.connectionPassword = connectionPassword;
   }

Modified: jbpm4/trunk/modules/jboss/pom.xml
===================================================================
--- jbpm4/trunk/modules/jboss/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/jboss/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+
+<!-- ====================================================================== -->
+<!--  jBPM: Workflow in Java                                                -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!-- ====================================================================== -->
+
+<!-- $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">
   <modelVersion>4.0.0</modelVersion>
 
   <name>jBPM 4 - JBoss Integration</name>
@@ -12,19 +23,14 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
   </parent>
 
-  <!-- Properties -->
-  <properties>
-  </properties>
-
   <!-- Dependencies -->
   <dependencies>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
-      <artifactId>jbpm-jpdl</artifactId>      
+      <artifactId>jbpm-jpdl</artifactId>
     </dependency>
   </dependencies>
-
 </project>


Property changes on: jbpm4/trunk/modules/jboss/pom.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: jbpm4/trunk/modules/jpdl/pom.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/jpdl/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $Id: pom.xml 1790 2008-07-31 12:13:06Z tom.baeyens 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>jBPM 4 - jPDL</name>
@@ -21,7 +22,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: jbpm4/trunk/modules/log/pom.xml
===================================================================
--- jbpm4/trunk/modules/log/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/log/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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">
 
   <!-- Module Info -->
   <modelVersion>4.0.0</modelVersion>
@@ -22,7 +23,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: jbpm4/trunk/modules/migration/pom.xml
===================================================================
--- jbpm4/trunk/modules/migration/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/migration/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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>jBPM 4 - Migration - Tool</name>
@@ -21,7 +22,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: jbpm4/trunk/modules/pvm/pom.xml
===================================================================
--- jbpm4/trunk/modules/pvm/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/pvm/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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>jBPM 4 - PVM</name>
@@ -21,7 +22,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: jbpm4/trunk/modules/test-base/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-base/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/test-base/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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>jBPM 4 - Test Base</name>
   <groupId>org.jbpm.jbpm4</groupId>
@@ -20,7 +21,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: jbpm4/trunk/modules/test-db/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-db/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/test-db/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,7 +9,8 @@
 
 <!-- $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>jBPM 4 - Test DB</name>
   <groupId>org.jbpm.jbpm4</groupId>
@@ -20,7 +21,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: jbpm4/trunk/modules/test-pojo/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-pojo/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/test-pojo/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- ====================================================================== -->
+<!--  jBPM: Workflow in Java                                                -->
 <!--                                                                        -->
-<!--  JBoss, the OpenSource J2EE webOS                                      -->
-<!--                                                                        -->
 <!--  Distributable under LGPL license.                                     -->
 <!--  See terms of license at http://www.gnu.org.                           -->
-<!--                                                                        -->
 <!-- ====================================================================== -->
 
 <!-- $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>jBPM 4 - Test POJO</name>
   <groupId>org.jbpm.jbpm4</groupId>
@@ -22,7 +21,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

Modified: jbpm4/trunk/modules/userguide/pom.xml
===================================================================
--- jbpm4/trunk/modules/userguide/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/modules/userguide/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-  <!-- ====================================================================== -->
-  <!--                                                                        -->
-  <!--  JBoss, the OpenSource J2EE webOS                                      -->
-  <!--                                                                        -->
-  <!--  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: pom.xml 2693 2008-10-31 09:12:32Z tom.baeyens at jboss.com $ -->
+<!-- $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>
 
@@ -24,7 +23,7 @@
   <parent>
     <groupId>org.jbpm.jbpm4</groupId>
     <artifactId>jbpm</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.4-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 


Property changes on: jbpm4/trunk/modules/userguide/pom.xml
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml	2010-07-17 07:57:15 UTC (rev 6505)
+++ jbpm4/trunk/pom.xml	2010-07-17 14:15:48 UTC (rev 6506)
@@ -9,13 +9,14 @@
 
 <!-- $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>jBPM 4</name>
   <groupId>org.jbpm.jbpm4</groupId>
   <artifactId>jbpm</artifactId>
-  <version>4.5-SNAPSHOT</version>
+  <version>4.4-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!-- Parent -->
@@ -490,6 +491,7 @@
       </releases>
       <snapshots>
         <enabled>true</enabled>
+        <updatePolicy>never</updatePolicy>
       </snapshots>
     </repository>
   </repositories>
@@ -501,7 +503,6 @@
       <url>http://repository.jboss.org/nexus/content/groups/public/</url>
       <releases>
         <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
       </releases>
       <snapshots>
         <enabled>true</enabled>



More information about the jbpm-commits mailing list