Author: alex.guizar(a)jboss.com Date: 2010-07-18 02:00:34 -0400 (Sun, 18 Jul 2010) New Revision: 6507 Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/hsqldb.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/mysql.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/oracle.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/postgresql.hibernate.cfg.xml jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/sybase.hibernate.cfg.xml Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml jbpm4/trunk/pom.xml Log: JBPM-2915 check in tomcat hibernate configurations refine tomcat start, stop and eclipse install, start targets from install script Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-07-17 14:15:48 UTC (rev 6506) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2010-07-18 06:00:34 UTC (rev 6507) @@ -95,29 +95,21 @@ </condition> <!-- ECLIPSE CONDITIONS --> - <condition property="eclipse.filename" value="eclipse-jee-galileo-win32.zip"> + <condition property="eclipse.filename" value="eclipse-java-galileo-SR2-win32.zip"> <os family="windows" /> </condition> - <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-macosx-cocoa.tar"> + <condition property="eclipse.filename" value="eclipse-java-galileo-SR2-macosx-cocoa.tar.gz"> <os name="Mac OS X" /> </condition> - <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz"> - <os name="Mac OS X" /> - </condition> - <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-linux-gtk.tar"> + <condition property="eclipse.filename" value="eclipse-java-galileo-SR2-linux-gtk.tar.gz"> <os name="Linux" arch="i386" /> </condition> - <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz"> - <os name="Linux" arch="i386" /> - </condition> - <condition property="eclipse.tarfilename" value="eclipse-jee-galileo-linux-gtk-x86_64.tar"> + <condition property="eclipse.filename" + value="eclipse-java-galileo-SR2-linux-gtk-x86_64.tar.gz"> <os name="Linux" arch="x86_64" /> </condition> - <condition property="eclipse.filename" value="${eclipse.tarfilename}.gz"> - <os name="Linux" arch="x86_64" /> - </condition> <property name="eclipse.distro.url" - value="http://www.eclipse.org/downloads/download.php?file=/technolog... /> + value="http://www.eclipse.org/downloads/download.php?file=/technolog... /> <property name="eclipse.distro.dir" value="downloads" /> <property name="eclipse.parent.dir" value="${jbpm.home}" /> <property name="eclipse.distro.path" value="${eclipse.distro.dir}/${eclipse.filename}" /> @@ -125,7 +117,7 @@ <!-- ### DEMO SETUP JBOSS ##################################################### --> <target name="demo.setup.jboss" depends="install.jboss, install.jbpm.into.jboss" - description="installs jboss and jbpm, starts jboss, creates the db schema, deploys examples, loads example identities, installs and starts eclipse"> + description="Install JBoss AS, HSQL, jBPM and Eclipse; start HSQL server and JBoss AS"> <antcall target="internal.enable.jboss.debug.jboss500" /> <antcall target="internal.enable.jboss.debug.jboss510" /> <antcall target="install.hsqldb.server" /> @@ -138,14 +130,14 @@ </target> <!-- ### DEMO TEARDOWN JBOSS ##################################################### --> - <target name="demo.teardown.jboss" description="drops the db schema and stops jboss"> + <target name="demo.teardown.jboss" description="Stop HSQL server and JBoss AS"> <antcall target="drop.jbpm.schema" /> <antcall target="stop.hsqldb.server" /> <antcall target="stop.jboss" /> </target> <!-- ### CLEAN CONFIGURATION DIR ########################################### --> - <target name="clean.cfg.dir" description="Deletes the generated configuration"> + <target name="clean.cfg.dir" description="Delete the generated configuration"> <delete dir="${cfg.dest.dir}" /> </target> @@ -193,7 +185,7 @@ </macrodef> <!-- ### CREATE CONFIGURATION ########################################### --> - <target name="create.cfg" description="Generates a configuration"> + <target name="create.cfg" description="Generate a configuration"> <!-- {standalone | jta | spring} --> <property name="tx" value="standalone" /> <!-- jdbc | datasource --> @@ -219,7 +211,7 @@ <!-- ### CREATE USER WEBAPP ########################################## --> <target name="create.user.webapp" depends="create.cfg" - description="Generates a custom web application"> + description="Generate 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" /> @@ -270,34 +262,34 @@ <!-- ### REINSTALL JBOSS ################################################ --> <target name="reinstall.jboss" depends="delete.jboss, install.jboss" - description="Deletes the previous jboss installation and re-installs jboss" /> + description="Delete JBoss AS and install it again" /> <target name="reinstall.jboss.and.jbpm" depends="delete.jboss, install.jboss, install.jbpm.into.jboss" - description="Deletes the previous jboss installation and re-installs jboss and installs jbpm in it" /> + description="Delete JBoss AS, install it again along with jBPM" /> <!-- ### DELETE JBOSS ################################################### --> - <target name="delete.jboss" description="Deletes jboss installation"> + <target name="delete.jboss" description="Delete JBoss AS"> <delete dir="${jboss.home}" /> </target> <!-- ### INSTALL JBOSS ################################################## --> - <target name="install.jboss" - depends="get.jboss" - description="Downloads jboss if unavailable and then extracts it"> + <target name="install.jboss" depends="get.jboss" description="Download and install JBoss AS"> <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"> + <target name="get.jboss" + unless="is.jboss.distro.available" + description="Download JBoss AS if unavailable"> <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" description="Installs jBPM into JBoss"> + <target name="install.jbpm.into.jboss" description="Deploy jBPM to JBoss AS"> <property name="tx" value="jta" /> <generatecfg connection="datasource" /> @@ -402,7 +394,7 @@ </target> <!-- ### INSTALL EXAMPLES INTO JBOSS ################################################ --> - <target name="install.examples.into.jboss"> + <target name="install.examples.into.jboss" description="Deploy example processes to JBoss AS"> <ant antfile="${jbpm.home}/examples/build.xml" target="create.and.deploy.examples" /> <mkdir dir="${jboss.server.config.dir}/deploy/jbpm/userlibs" /> <copy file="${examples.file}" @@ -411,8 +403,7 @@ </target> <!-- ### START JBOSS ################################################### --> - <target name="start.jboss" - description="starts jboss and waits till jboss is booted, then lets jboss run in the background"> + <target name="start.jboss" description="Start JBoss AS and wait for it to become available"> <exec executable="${jboss.home}/bin/run.bat" spawn="yes" osfamily="windows"> <arg value="-b" /> <arg value="${bind.address}" /> @@ -432,8 +423,7 @@ </target> <!-- ### STOP JBOSS ################################################### --> - <target name="stop.jboss" - description="signals jboss to stop, but doesn't wait till its finished"> + <target name="stop.jboss" description="Signal JBoss AS to stop"> <exec executable="${jboss.home}/bin/shutdown.bat" osfamily="windows"> <arg value="-s" /> <arg value="jnp://${bind.address}:1099" /> @@ -449,7 +439,7 @@ <!-- ### DEMO SETUP TOMCAT ################################################ --> <target name="demo.setup.tomcat" depends="delete.tomcat, install.tomcat, install.jbpm.into.tomcat" - description="installs tomcat, installs jbpm into tomcat, starts tomcat, creates the jBPM DB schema, deploys examples, loads example identities, installs and starts eclipse"> + description="Install Tomcat, HSQL and jBPM; start HSQL server and Tomcat"> <antcall target="install.hsqldb.server" /> <antcall target="start.hsqldb.server" /> <antcall target="create.jbpm.schema" /> @@ -462,49 +452,45 @@ <!-- ### DEMO TEARDOWN TOMCAT ################################################ --> <target name="demo.teardown.tomcat" depends="stop.tomcat, stop.hsqldb.server" - description="stops tomcat and then the hsqldb server if needed"> + description="Stop HSQL server and Tomcat"> </target> <!-- ### REINSTALL TOMCAT ################################################ --> <target name="reinstall.tomcat" depends="delete.tomcat, install.tomcat" - description="Deletes the previous tomcat installation and re-installs tomcat" /> + description="Delete Tomcat and install it again" /> <target name="reinstall.tomcat.and.jbpm" depends="delete.tomcat, install.tomcat, install.jbpm.into.tomcat" - description="Deletes the previous tomcat installation and re-installs tomcat and installs jbpm in it" /> + description="Delete Tomcat, install it again along with jBPM" /> <!-- ### DELETE TOMCAT ################################################### --> - <target name="delete.tomcat" description="Deletes tomcat installation"> + <target name="delete.tomcat" description="Delete Tomcat"> <delete dir="${tomcat.home}" /> </target> <!-- ### INSTALL TOMCAT ################################################## --> - <target name="install.tomcat" - depends="get.tomcat" - description="Downloads tomcat if unavailable and then extracts it"> + <target name="install.tomcat" depends="get.tomcat" description="Download and install Tomcat"> <unzip src="${tomcat.distro.path}" dest="${tomcat.parent.dir}" /> <antcall target="install.tomcat.unix" /> </target> <target name="install.tomcat.unix" if="is.unix"> <chmod perm="a+x"> - <fileset dir="${tomcat.home}/bin"> - <include name="*.sh" /> - </fileset> + <fileset dir="${tomcat.home}/bin" includes="*.sh" /> </chmod> </target> <!-- ### GET TOMCAT ###################################################### --> <target name="get.tomcat" unless="is.tomcat.distro.available" - description="Downloads tomcat if unavailable"> + description="Download 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" description="Installs jBPM into tomcat"> + <target name="install.jbpm.into.tomcat" description="Deploy jBPM to Tomcat"> <property name="is.tomcat" value="true" /> <!-- generate configuration --> <generatecfg connection="tomcat" /> @@ -583,7 +569,7 @@ <replace dir="${birt.dir}" includes="*.rptdesign" token="java:JbpmDS" - value="java:comp/env/jdbc/JbpmDS"/> + value="java:comp/env/jdbc/JbpmDS" /> <!-- copy database driver to lib/ --> <property name="database.driver.destination.dir" value="${tomcat.home}/lib" /> @@ -601,7 +587,7 @@ </target> <!-- ### INSTALL EXAMPLES INTO TOMCAT ################################################ --> - <target name="install.examples.into.tomcat" description="deploys all the example processes"> + <target name="install.examples.into.tomcat" description="Deploy example processes to Tomcat"> <ant antfile="${jbpm.home}/examples/build.xml" target="create.and.deploy.examples" /> <copy file="${examples.file}" todir="${tomcat.home}/lib" overwrite="true" /> </target> @@ -660,37 +646,27 @@ </target> <!-- ### START TOMCAT ################################################### --> - <target name="start.tomcat" - description="Starts Tomcat and waits till it is booted, then lets Tomcat run in the background"> - <taskdef name="start-tomcat" classname="org.jbpm.pvm.internal.ant.StartTomcatTask"> - <classpath> - <fileset dir="${jbpm.home}"> - <include name="jbpm.jar" /> - </fileset> - </classpath> - </taskdef> - <start-tomcat tomcathome="${tomcat.home}" /> + <target name="start.tomcat" description="Start Tomcat and wait for it to become available"> + <exec executable="${tomcat.home}/bin/startup.bat" osfamily="windows" /> + <exec executable="${tomcat.home}/bin/startup.sh" osfamily="unix" /> + <waitfor maxwait="2" + maxwaitunit="minute" + checkevery="15" + checkeveryunit="second" + timeoutproperty="tomcat.timeout"> + <socket server="${bind.address}" port="8080" /> + </waitfor> + <fail if="tomcat.timeout" message="tomcat did not start within 2 minutes" /> </target> <!-- ### STOP TOMCAT ################################################### --> - <target name="stop.tomcat" - description="Signals Tomcat to stop, but doesn't wait till its finished"> - <exec executable="${tomcat.home}/bin/catalina.bat" - dir="${tomcat.home}/bin" - spawn="yes" - osfamily="windows"> - <arg value="stop" /> - </exec> - <exec executable="${tomcat.home}/bin/catalina.sh" - dir="${tomcat.home}/bin" - spawn="yes" - osfamily="unix"> - <arg value="stop" /> - </exec> + <target name="stop.tomcat" description="Signal Tomcat to stop"> + <exec executable="${tomcat.home}/bin/shutdown.bat" osfamily="windows" /> + <exec executable="${tomcat.home}/bin/shutdown.sh" osfamily="unix" /> </target> <!-- ### CREATE JBPM SCHEMA ############################################# --> - <target name="create.jbpm.schema" description="creates the jbpm tables in the database"> + <target name="create.jbpm.schema" description="Create the jBPM tables in the database"> <generatecfg transaction="standalone.testsuite" /> <java classname="org.jbpm.db.Create" fork="true"> <arg value="${database}" /> @@ -708,8 +684,7 @@ </target> <!-- ### UPGRADE JBPM SCHEMA ############################################# --> - <target name="upgrade.jbpm.schema" - description="Upgrades the jBPM tables in the database to the current version"> + <target name="upgrade.jbpm.schema" description="Upgrade the jBPM tables in the database"> <generatecfg transaction="standalone.testsuite" /> <java classname="org.jbpm.db.Upgrade" fork="true"> <arg value="${database}" /> @@ -727,7 +702,7 @@ </target> <!-- ### DROP JBPM SCHEMA ############################################### --> - <target name="drop.jbpm.schema" description="drops the jbpm tables from the database"> + <target name="drop.jbpm.schema" description="Drop the jBPM tables from the database"> <echo message="dropping jbpm schema in db ${jdbc.url}" /> <sql driver="${jdbc.driver}" url="${jdbc.url}" @@ -745,7 +720,7 @@ <!-- ### LOAD EXAMPLE IDENTITIES ######################################## --> <target name="load.example.identities" - description="loads the example users and groups into the database"> + description="Load the example users and groups into the database"> <echo message="loading example identities in ${jdbc.url}" /> <sql driver="${jdbc.driver}" url="${jdbc.url}" @@ -762,7 +737,7 @@ </target> <!-- ### START HSQLDB DATABASE MGR ##################################### --> - <target name="hsqldb.databasemanager" description="start the hsqldb database manager"> + <target name="hsqldb.databasemanager" description="Start the HSQL database manager"> <java classname="org.hsqldb.util.DatabaseManager" fork="true"> <arg value="-url" /> <arg value="jdbc:hsqldb:hsql://${bind.address}:1701" /> @@ -777,7 +752,7 @@ <!-- ### INSTALL ECLIPSE ################################################ --> <target name="install.eclipse" depends="get.eclipse" - description="unzips eclipse, downloads eclipse if it is not available in ${eclipse.distro.dir}"> + description="Download and install Eclipse"> <antcall target="internal.install.eclipse.unix" /> <antcall target="internal.install.eclipse.windows" /> </target> @@ -788,29 +763,29 @@ </condition> <target name="get.eclipse" unless="is.eclipse.distro.available" - description="downloads eclipse to ${eclipse.distro.dir}"> + description="Download Eclipse if unavailable"> <mkdir dir="${eclipse.distro.dir}" /> <get src="${eclipse.distro.url}" dest="${eclipse.distro.path}" /> </target> <!-- ### START ECLIPSE ################################################## --> - <target name="start.eclipse" description="starts eclipse"> + <target name="start.eclipse" description="Start Eclipse"> <!-- Windows --> <exec executable="${jbpm.home}/eclipse/eclipse.exe" spawn="yes" osfamily="windows"> <arg value="-data" /> <arg value="${jbpm.home}/workspace" /> </exec> <!-- Linux --> - <chmod file="${jbpm.home}/eclipse/eclipse" perm="a+x" os="Linux" /> - <exec executable="${jbpm.home}/eclipse/eclipse" os="Linux"> + <exec executable="${jbpm.home}/eclipse/eclipse" spawn="yes" os="Linux"> <arg value="-data" /> <arg value="${jbpm.home}/workspace" /> + <!-- Work around bugs.eclipse.org/290395 --> + <env key="GDK_NATIVE_WINDOWS" value="true" /> </exec> <!-- Mac OS X --> - <chmod file="${jbpm.home}/eclipse/Eclipse.app/Contents/MacOS/eclipse" - perm="a+x" - os="Mac OS X" /> - <exec executable="${jbpm.home}/eclipse/Eclipse.app/Contents/MacOS/eclipse" os="Mac OS X"> + <exec executable="${jbpm.home}/eclipse/Eclipse.app/Contents/MacOS/eclipse" + spawn="yes" + os="Mac OS X"> <arg value="-data" /> <arg value="${jbpm.home}/workspace" /> </exec> @@ -818,7 +793,7 @@ <target name="install.signavio.into.jboss" depends="internal.set.signavio.repo.dir" - description="installs signavio into jboss"> + description="Deploy Signavio to JBoss AS"> <!-- Current version of Signavio needs to be unpacked in /deploy to work correctly --> <unzip src="${signavio.src.dir}/${signavio.war.file.name}" dest="${jboss.server.deploy.dir}/${signavio.war.file.name}" /> @@ -826,7 +801,7 @@ <target name="install.signavio.into.tomcat" depends="internal.set.signavio.repo.dir" - description="installs signavio into tomcat"> + description="Deploy Signavio to Tomcat"> <copy file="${signavio.src.dir}/${signavio.war.file.name}" todir="${tomcat.webapps.dir}" /> </target> @@ -928,10 +903,12 @@ </target> <target name="internal.install.eclipse.unix" if="is.unix"> - <gunzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${eclipse.distro.dir}" /> - <untar src="${eclipse.distro.dir}/${eclipse.tarfilename}" - dest="${jbpm.home}" - overwrite="true" /> - <delete file="${eclipse.distro.dir}/${eclipse.tarfilename}" /> + <!-- call native command to preserve file permissions and avoid the intermediate tar --> + <exec executable="tar" osfamily="unix"> + <arg value="-C" /> + <arg file="${jbpm.home}" /> + <arg value="-xzf" /> + <arg file="${eclipse.distro.dir}/${eclipse.filename}" /> + </exec> </target> </project> Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/hsqldb.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/hsqldb.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/hsqldb.hibernate.cfg.xml 2010-07-18 06:00:34 UTC (rev 6507) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDS</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/hsqldb.hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + native Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/mysql.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/mysql.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/mysql.hibernate.cfg.xml 2010-07-18 06:00:34 UTC (rev 6507) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property> + <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDS</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/mysql.hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + native Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/oracle.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/oracle.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/oracle.hibernate.cfg.xml 2010-07-18 06:00:34 UTC (rev 6507) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + <property name="hibernate.dialect">org.hibernate.dialect.Oracle9iDialect</property> + <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDS</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/oracle.hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + native Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/postgresql.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/postgresql.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/postgresql.hibernate.cfg.xml 2010-07-18 06:00:34 UTC (rev 6507) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property> + <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDS</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/postgresql.hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + native Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/sybase.hibernate.cfg.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/sybase.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/sybase.hibernate.cfg.xml 2010-07-18 06:00:34 UTC (rev 6507) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + <property name="hibernate.dialect">org.hibernate.dialect.SybaseDialect</property> + <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDS</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + </session-factory> +</hibernate-configuration> Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/hibernate/tomcat/sybase.hibernate.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + native Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2010-07-17 14:15:48 UTC (rev 6506) +++ jbpm4/trunk/pom.xml 2010-07-18 06:00:34 UTC (rev 6507) @@ -28,17 +28,17 @@ <!-- Modules --> <modules> - <module>modules/log</module> <module>modules/api</module> - <module>modules/test-base</module> - <module>modules/pvm</module> - <module>modules/jpdl</module> <module>modules/bpmn</module> + <module>modules/examples</module> <module>modules/integration</module> - <module>modules/examples</module> + <module>modules/jpdl</module> + <module>modules/log</module> + <module>modules/migration</module> + <module>modules/pvm</module> + <module>modules/test-base</module> <module>modules/test-db</module> <module>modules/test-pojo</module> - <module>modules/migration</module> </modules> <!-- Properties --> @@ -743,6 +743,12 @@ <module>modules/jboss</module> <module>modules/db</module> <module>modules/distro</module> + <!-- integration/enterprise --> + <module>modules/test-cactus</module> + <module>modules/test-enterprise/test-enterprise-ejb</module> + <module>modules/test-enterprise/test-enterprise-suite</module> + <!-- load --> + <module>modules/test-load</module> </modules> </profile> </profiles>