JBoss JBPM SVN: r2784 - projects/jsf-console/tags.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-11-06 15:53:21 -0500 (Thu, 06 Nov 2008)
New Revision: 2784
Added:
projects/jsf-console/tags/jsf-console-3.3.0.GA/
Log:
Create release tag
Copied: projects/jsf-console/tags/jsf-console-3.3.0.GA (from rev 2783, projects/jsf-console/trunk)
17 years, 5 months
JBoss JBPM SVN: r2783 - in projects/jsf-console/trunk: console and 1 other directories.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-11-06 15:49:55 -0500 (Thu, 06 Nov 2008)
New Revision: 2783
Modified:
projects/jsf-console/trunk/console/pom.xml
projects/jsf-console/trunk/jbpm4jsf/pom.xml
projects/jsf-console/trunk/pom.xml
Log:
Fix artifacts ids
Modified: projects/jsf-console/trunk/console/pom.xml
===================================================================
--- projects/jsf-console/trunk/console/pom.xml 2008-11-06 19:50:22 UTC (rev 2782)
+++ projects/jsf-console/trunk/console/pom.xml 2008-11-06 20:49:55 UTC (rev 2783)
@@ -15,13 +15,13 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss jBPM3 - Console</name>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console-war</artifactId>
+ <artifactId>jsf-console</artifactId>
<packaging>war</packaging>
<!-- Parent -->
<parent>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console</artifactId>
+ <artifactId>jsf-console-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: projects/jsf-console/trunk/jbpm4jsf/pom.xml
===================================================================
--- projects/jsf-console/trunk/jbpm4jsf/pom.xml 2008-11-06 19:50:22 UTC (rev 2782)
+++ projects/jsf-console/trunk/jbpm4jsf/pom.xml 2008-11-06 20:49:55 UTC (rev 2783)
@@ -23,7 +23,7 @@
<!-- Parent -->
<parent>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console</artifactId>
+ <artifactId>jsf-console-parent</artifactId>
<version>3.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -93,4 +93,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: projects/jsf-console/trunk/pom.xml
===================================================================
--- projects/jsf-console/trunk/pom.xml 2008-11-06 19:50:22 UTC (rev 2782)
+++ projects/jsf-console/trunk/pom.xml 2008-11-06 20:49:55 UTC (rev 2783)
@@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
<name>JBoss jBPM3</name>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console</artifactId>
+ <artifactId>jsf-console-parent</artifactId>
<packaging>pom</packaging>
<version>3.3.0-SNAPSHOT</version>
17 years, 5 months
JBoss JBPM SVN: r2782 - in projects/jsf-console/trunk/console/src/main: webapp/WEB-INF and 1 other directory.
by do-not-reply@jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-11-06 14:50:22 -0500 (Thu, 06 Nov 2008)
New Revision: 2782
Added:
projects/jsf-console/trunk/console/src/main/java/org/jbpm/web/BootstrapListener.java
Modified:
projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml
Log:
Added bootstrap listener that forces initialization of the hibenrate sssions used by jbpm.
Added: projects/jsf-console/trunk/console/src/main/java/org/jbpm/web/BootstrapListener.java
===================================================================
--- projects/jsf-console/trunk/console/src/main/java/org/jbpm/web/BootstrapListener.java (rev 0)
+++ projects/jsf-console/trunk/console/src/main/java/org/jbpm/web/BootstrapListener.java 2008-11-06 19:50:22 UTC (rev 2782)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.web;
+
+import org.jbpm.JbpmConfiguration;
+import org.jbpm.JbpmContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletContextEvent;
+
+/**
+ * Force initialization of the hibernate sessions in jbpm.
+ * This will create the DB tables on new installations.
+ * If that's not needed the listener can be removed.
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class BootstrapListener implements ServletContextListener
+{
+ private JbpmConfiguration jbpmConfiguration;
+ private static final Log log = LogFactory.getLog(BootstrapListener.class);
+
+ public void contextInitialized(ServletContextEvent servletContextEvent)
+ {
+ String jbpmCfgResource =
+ servletContextEvent.getServletContext()
+ .getInitParameter("jbpm.configuration.resource");
+ jbpmConfiguration = JbpmConfiguration.getInstance(jbpmCfgResource);
+
+ JbpmContext jbpmContext = jbpmConfiguration.createJbpmContext();
+ try
+ {
+ log.info("Bootstrap Hibernate session");
+ jbpmContext.getGraphSession();
+ }
+ catch (RuntimeException e)
+ {
+ jbpmContext.setRollbackOnly();
+
+ throw e;
+ }
+ finally
+ {
+ jbpmContext.close();
+ }
+ }
+
+ public void contextDestroyed(ServletContextEvent servletContextEvent)
+ {
+
+ }
+}
Modified: projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml
===================================================================
--- projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml 2008-11-06 16:39:49 UTC (rev 2781)
+++ projects/jsf-console/trunk/console/src/main/webapp/WEB-INF/web.xml 2008-11-06 19:50:22 UTC (rev 2782)
@@ -4,6 +4,18 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+ <!--
+ * Force initialization of the hibernate sessions in jbpm.
+ * This will create the DB tables on new installations.
+ * If that's not needed the listener can be removed.
+ -->
+ <listener>
+ <listener-class>
+ org.jbpm.web.BootstrapListener
+ </listener-class>
+ </listener>
+
<servlet>
<description>Enable the JSF servlet. See faces-config.xml for Faces-specific configuration</description>
<servlet-name>Faces Servlet</servlet-name>
17 years, 5 months
JBoss JBPM SVN: r2781 - jbpm3/trunk/modules/core.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-11-06 11:39:49 -0500 (Thu, 06 Nov 2008)
New Revision: 2781
Modified:
jbpm3/trunk/modules/core/pom.xml
Log:
[JBPM-1810] Fix clean, drop, create schema with JbpmSchema
Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/core/pom.xml 2008-11-06 16:34:21 UTC (rev 2780)
+++ jbpm3/trunk/modules/core/pom.xml 2008-11-06 16:39:49 UTC (rev 2781)
@@ -223,7 +223,7 @@
<excludes>
<!-- Concurrent execution not supported on hsqldb -->
<exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
- <!-- https://jira.jboss.org/jira/browse/JBPM-???? -->
+ <!-- https://jira.jboss.org/jira/browse/JBPM-1810 -->
<exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
</configuration>
@@ -252,7 +252,7 @@
<excludes>
<!-- Concurrent execution not supported on hsqldb -->
<exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
- <!-- https://jira.jboss.org/jira/browse/JBPM-???? -->
+ <!-- https://jira.jboss.org/jira/browse/JBPM-1810 -->
<exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
</configuration>
@@ -283,7 +283,7 @@
<exclude>org/jbpm/graph/node/ProcessStateDbTest.java</exclude>
<!-- https://jira.jboss.org/jira/browse/JBPM-1166 -->
<exclude>org/jbpm/seam/JobExecutorCustomizationTest.java</exclude>
- <!-- https://jira.jboss.org/jira/browse/JBPM-???? -->
+ <!-- https://jira.jboss.org/jira/browse/JBPM-1810 -->
<exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
</configuration>
@@ -315,7 +315,7 @@
<exclude>org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java</exclude>
<!-- https://jira.jboss.org/jira/browse/JBPM-1782 -->
<exclude>org/jbpm/jpdl/exe/JoinExecutionDbTest.java</exclude>
- <!-- https://jira.jboss.org/jira/browse/JBPM-???? -->
+ <!-- https://jira.jboss.org/jira/browse/JBPM-1810 -->
<exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
</configuration>
@@ -344,7 +344,7 @@
<excludes>
<!-- https://jira.jboss.org/jira/browse/JBPM-1764 -->
<exclude>org/jbpm/job/executor/JobExecutorDbTest</exclude>
- <!-- https://jira.jboss.org/jira/browse/JBPM-???? -->
+ <!-- https://jira.jboss.org/jira/browse/JBPM-1810 -->
<exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
</configuration>
17 years, 5 months
JBoss JBPM SVN: r2780 - in jbpm3/trunk/modules/core: src/test/java/org/jbpm/db and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-11-06 11:34:21 -0500 (Thu, 06 Nov 2008)
New Revision: 2780
Added:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/JbpmSchemaDbTest.java
Modified:
jbpm3/trunk/modules/core/pom.xml
Log:
[JBPM-1810] Fix clean, drop, create schema with JbpmSchema
Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/core/pom.xml 2008-11-06 15:51:44 UTC (rev 2779)
+++ jbpm3/trunk/modules/core/pom.xml 2008-11-06 16:34:21 UTC (rev 2780)
@@ -223,6 +223,8 @@
<excludes>
<!-- Concurrent execution not supported on hsqldb -->
<exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
+ <!-- https://jira.jboss.org/jira/browse/JBPM-???? -->
+ <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
</configuration>
</plugin>
@@ -250,6 +252,8 @@
<excludes>
<!-- Concurrent execution not supported on hsqldb -->
<exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
+ <!-- https://jira.jboss.org/jira/browse/JBPM-???? -->
+ <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
</configuration>
</plugin>
@@ -279,6 +283,8 @@
<exclude>org/jbpm/graph/node/ProcessStateDbTest.java</exclude>
<!-- https://jira.jboss.org/jira/browse/JBPM-1166 -->
<exclude>org/jbpm/seam/JobExecutorCustomizationTest.java</exclude>
+ <!-- https://jira.jboss.org/jira/browse/JBPM-???? -->
+ <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
</configuration>
</plugin>
@@ -309,6 +315,8 @@
<exclude>org/jbpm/graph/exe/SubProcessPlusConcurrencyDbTest.java</exclude>
<!-- https://jira.jboss.org/jira/browse/JBPM-1782 -->
<exclude>org/jbpm/jpdl/exe/JoinExecutionDbTest.java</exclude>
+ <!-- https://jira.jboss.org/jira/browse/JBPM-???? -->
+ <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
</configuration>
</plugin>
@@ -336,6 +344,8 @@
<excludes>
<!-- https://jira.jboss.org/jira/browse/JBPM-1764 -->
<exclude>org/jbpm/job/executor/JobExecutorDbTest</exclude>
+ <!-- https://jira.jboss.org/jira/browse/JBPM-???? -->
+ <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude>
</excludes>
</configuration>
</plugin>
Added: jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/JbpmSchemaDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/JbpmSchemaDbTest.java (rev 0)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/JbpmSchemaDbTest.java 2008-11-06 16:34:21 UTC (rev 2780)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.db;
+
+import org.hibernate.cfg.Configuration;
+import org.jbpm.AbstractJbpmTestCase;
+
+/**
+ * Test the JbpmSchema utility
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Nov-2008
+ */
+public class JbpmSchemaDbTest extends AbstractJbpmTestCase
+{
+ public void testCleanSchema()
+ {
+ Configuration config = new Configuration().configure();
+ JbpmSchema jbpmSchema = new JbpmSchema(config);
+ jbpmSchema.cleanSchema();
+ }
+
+ public void testDropSchema()
+ {
+ Configuration config = new Configuration().configure();
+ JbpmSchema jbpmSchema = new JbpmSchema(config);
+ jbpmSchema.dropSchema();
+ }
+
+ public void testCreateSchema()
+ {
+ Configuration config = new Configuration().configure();
+ JbpmSchema jbpmSchema = new JbpmSchema(config);
+ jbpmSchema.createSchema();
+ }
+}
Property changes on: jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/JbpmSchemaDbTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 5 months
JBoss JBPM SVN: r2779 - projects/spec/trunk.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-11-06 10:51:44 -0500 (Thu, 06 Nov 2008)
New Revision: 2779
Added:
projects/spec/trunk/eclipse/
Log:
Add eclipse
Copied: projects/spec/trunk/eclipse (from rev 2651, projects/spec/tags/jbpm-spec-1.0.0-Alpha1/eclipse)
17 years, 5 months
JBoss JBPM SVN: r2778 - in jbpm3/trunk: modules/core/src/main/resources and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-11-06 10:46:14 -0500 (Thu, 06 Nov 2008)
New Revision: 2778
Modified:
jbpm3/trunk/modules/core/src/main/resources/jbpm-sybase-ds.xml
jbpm3/trunk/profiles.xml.example
Log:
Sybase datasource does not support URL parameter
Modified: jbpm3/trunk/modules/core/src/main/resources/jbpm-sybase-ds.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/jbpm-sybase-ds.xml 2008-11-06 15:24:34 UTC (rev 2777)
+++ jbpm3/trunk/modules/core/src/main/resources/jbpm-sybase-ds.xml 2008-11-06 15:46:14 UTC (rev 2778)
@@ -6,7 +6,9 @@
<jndi-name>JbpmDS</jndi-name>
<xa-datasource-class>net.sourceforge.jtds.jdbcx.JtdsDataSource</xa-datasource-class>
- <xa-datasource-property name="URL">${jdbc.sybase.url}</xa-datasource-property>
+ <xa-datasource-property name="ServerName">${jdbc.sybase.server}</xa-datasource-property>
+ <xa-datasource-property name="PortNumber">${jdbc.sybase.port}</xa-datasource-property>
+ <xa-datasource-property name="DatabaseName">${jdbc.sybase.database}</xa-datasource-property>
<xa-datasource-property name="User">${jdbc.sybase.username}</xa-datasource-property>
<xa-datasource-property name="Password">${jdbc.sybase.password}</xa-datasource-property>
Modified: jbpm3/trunk/profiles.xml.example
===================================================================
--- jbpm3/trunk/profiles.xml.example 2008-11-06 15:24:34 UTC (rev 2777)
+++ jbpm3/trunk/profiles.xml.example 2008-11-06 15:46:14 UTC (rev 2778)
@@ -28,6 +28,9 @@
<jdbc.postgresql.password></jdbc.postgresql.password>
<jdbc.sybase.url>jdbc:jtds:sybase://dev01.qa.atl.jboss.com:4100/jbpmteam</jdbc.sybase.url>
+ <jdbc.sybase.server>dev01.qa.atl.jboss.com</jdbc.sybase.server>
+ <jdbc.sybase.port>4100</jdbc.sybase.port>
+ <jdbc.sybase.database>jbpmteam</jdbc.sybase.database>
<jdbc.sybase.username>jbpmteam</jdbc.sybase.username>
<jdbc.sybase.password>jbpmteam</jdbc.sybase.password>
-->
17 years, 5 months
JBoss JBPM SVN: r2777 - in jbpm3/trunk: modules/core/src/main/resources and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-11-06 10:24:34 -0500 (Thu, 06 Nov 2008)
New Revision: 2777
Modified:
jbpm3/trunk/modules/core/src/main/resources/jbpm-postgresql-ds.xml
jbpm3/trunk/profiles.xml.example
Log:
PostgreSQL datasource does not support URL
Modified: jbpm3/trunk/modules/core/src/main/resources/jbpm-postgresql-ds.xml
===================================================================
--- jbpm3/trunk/modules/core/src/main/resources/jbpm-postgresql-ds.xml 2008-11-06 14:39:45 UTC (rev 2776)
+++ jbpm3/trunk/modules/core/src/main/resources/jbpm-postgresql-ds.xml 2008-11-06 15:24:34 UTC (rev 2777)
@@ -5,7 +5,9 @@
<jndi-name>JbpmDS</jndi-name>
<xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
- <xa-datasource-property name="URL">${jdbc.postgresql.url}</xa-datasource-property>
+ <xa-datasource-property name="ServerName">${jdbc.postgresql.server}</xa-datasource-property>
+ <xa-datasource-property name="PortNumber">${jdbc.postgresql.port}</xa-datasource-property>
+ <xa-datasource-property name="DatabaseName">${jdbc.postgresql.database}</xa-datasource-property>
<xa-datasource-property name="User">${jdbc.postgresql.username}</xa-datasource-property>
<xa-datasource-property name="Password">${jdbc.postgresql.password}</xa-datasource-property>
Modified: jbpm3/trunk/profiles.xml.example
===================================================================
--- jbpm3/trunk/profiles.xml.example 2008-11-06 14:39:45 UTC (rev 2776)
+++ jbpm3/trunk/profiles.xml.example 2008-11-06 15:24:34 UTC (rev 2777)
@@ -21,6 +21,9 @@
<jdbc.mysql.password></jdbc.mysql.password>
<jdbc.postgresql.url>jdbc:postgresql://localhost:5432/jbpmtest</jdbc.postgresql.url>
+ <jdbc.postgresql.server>localhost</jdbc.postgresql.server>
+ <jdbc.postgresql.port>5432</jdbc.postgresql.port>
+ <jdbc.postgresql.database>jbpmtest</jdbc.postgresql.database>
<jdbc.postgresql.username>jbpmtest</jdbc.postgresql.username>
<jdbc.postgresql.password></jdbc.postgresql.password>
17 years, 5 months
JBoss JBPM SVN: r2776 - in jbpm3/trunk: modules/distribution/src/main/resources/installer and 1 other directory.
by do-not-reply@jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-11-06 09:39:45 -0500 (Thu, 06 Nov 2008)
New Revision: 2776
Modified:
jbpm3/trunk/hudson/hudson-home/command.sh
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
Log:
[IZPACK-153] Add jbpm configs to docs/examples/jbpm
Modified: jbpm3/trunk/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/command.sh 2008-11-06 13:29:16 UTC (rev 2775)
+++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-11-06 14:39:45 UTC (rev 2776)
@@ -63,9 +63,10 @@
# FIXME: Autoinstall does not respect conditions
# http://jira.codehaus.org/browse/IZPACK-153
-mv $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.keep
rm $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-*-ds.xml
-mv $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.keep $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.xml
+rm $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml
+cp $JBOSS_HOME/docs/examples/jbpm/jbpm-$DATABASE-ds.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-$DATABASE-ds.xml
+cp $JBOSS_HOME/docs/examples/jbpm/hibernate.cfg.$DATABASE.xml $JBOSS_HOME/server/$JBOSS_SERVER/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml
#
# start jbossas
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-11-06 13:29:16 UTC (rev 2775)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-11-06 14:39:45 UTC (rev 2776)
@@ -184,40 +184,49 @@
<!-- jbpm-destinations-service -->
<file src="@{resources.dir}/destination/jbpm-destinations-service.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" />
+ <!-- database configs to docs/examples/jbpm -->
+ <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-core-config" targetdir="${installPath}/docs/examples/jbpm" override="true">
+ <include name="hibernate.cfg.hsqldb.xml"/>
+ <include name="hibernate.cfg.mysql.xml"/>
+ <include name="hibernate.cfg.postgresql.xml"/>
+ <include name="hibernate.cfg.sybase.xml"/>
+ <include name="jbpm-hsqldb-ds.xml"/>
+ <include name="jbpm-mysql-ds.xml"/>
+ <include name="jbpm-postgresql-ds.xml"/>
+ <include name="jbpm-sybase-ds.xml"/>
+ </fileset>
+
<!-- Database Hypsersonic -->
+ <file src="@{deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-hsqldb-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/>
+ <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic"
+ target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
<fileset dir="@{resources.dir}/database" targetdir="${installPath}/server/${jbossTargetServer}/data" condition="isHypersonic">
<include name="hypersonic/jbpmDB.*" />
</fileset>
- <file src="@{deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-hsqldb-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/>
- <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic"
- target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
<!-- Database MySQL -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
- override="true" condition="isMySQL">
- <include name="mysql-connector-java.jar" />
- </fileset>
<file src="@{deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-mysql-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/>
<singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.mysql.xml" condition="isMySQL"
target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL">
+ <include name="mysql-connector-java.jar" />
+ </fileset>
<!-- Database PostgreSQL -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
- override="true" condition="isPostgreSQL">
- <include name="postgresql.jar" />
- </fileset>
<file src="@{deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-postgresql-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isPostgreSQL"/>
<singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.postgresql.xml" condition="isPostgreSQL"
target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isPostgreSQL">
+ <include name="postgresql.jar" />
+ </fileset>
<!-- Database Sybase -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
- override="true" condition="isSybase">
- <include name="jtds.jar" />
- </fileset>
<file src="@{deploy.artifacts.dir}/resources/jbpm-core-config/jbpm-sybase-ds.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isSybase"/>
<singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.sybase.xml" condition="isSybase"
target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isSybase">
+ <include name="jtds.jar" />
+ </fileset>
</pack>
<!-- Optional Components -->
@@ -242,11 +251,8 @@
<!-- GWT Console -->
<pack name="GWT-Console" required="no" parent="Optional Components" preselected="no">
<description>GWT-Console (Preview, use at your own risk)</description>
- <file src="@{deploy.artifacts.dir}/lib/gwt-console.war"
- targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/" unpack="false" override="true" />
-
- <file src="@{deploy.artifacts.dir}/lib/gwt-console-server.war"
- targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="true" override="true" />
+ <file src="@{deploy.artifacts.dir}/lib/gwt-console.war" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
+ <file src="@{deploy.artifacts.dir}/lib/gwt-console-server.war" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
</pack>
</packs>
17 years, 5 months
JBoss JBPM SVN: r2775 - jbpm3/trunk/modules/core/src/test/java/org/jbpm/seam.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-11-06 08:29:16 -0500 (Thu, 06 Nov 2008)
New Revision: 2775
Modified:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/seam/JobExecutorCustomizationTest.java
Log:
increased max time to 20 seconds
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/seam/JobExecutorCustomizationTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/seam/JobExecutorCustomizationTest.java 2008-11-06 10:56:20 UTC (rev 2774)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/seam/JobExecutorCustomizationTest.java 2008-11-06 13:29:16 UTC (rev 2775)
@@ -42,7 +42,7 @@
jobExecutor.start();
try {
- waitForJobs(8000, 0);
+ waitForJobs(20000, 0);
} finally {
jobExecutor.stop();
}
17 years, 5 months