[jbpm-commits] JBoss JBPM SVN: r3942 - in jbpm4/trunk/modules: distro/scripts and 6 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Feb 19 04:58:39 EST 2009
Author: heiko.braun at jboss.com
Date: 2009-02-19 04:58:39 -0500 (Thu, 19 Feb 2009)
New Revision: 3942
Added:
jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/DbGenTest.java
jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/process.jpdl.xml
Removed:
jbpm4/trunk/modules/examples/scripts/
Modified:
jbpm4/trunk/modules/distro/pom.xml
jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml
jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml
jbpm4/trunk/modules/examples/pom.xml
jbpm4/trunk/modules/jpdl/pom.xml
jbpm4/trunk/modules/jpdl/scripts/assembly-config.xml
Log:
Ship pre-populated hypersonic DB with installer
Modified: jbpm4/trunk/modules/distro/pom.xml
===================================================================
--- jbpm4/trunk/modules/distro/pom.xml 2009-02-19 09:43:09 UTC (rev 3941)
+++ jbpm4/trunk/modules/distro/pom.xml 2009-02-19 09:58:39 UTC (rev 3942)
@@ -69,8 +69,15 @@
<classifier>config</classifier>
<version>${version}</version>
</dependency>
+
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
+ <artifactId>jbpm-examples</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jbpm.jbpm4</groupId>
<artifactId>jbpm-task</artifactId>
<version>${version}</version>
</dependency>
Modified: jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-02-19 09:43:09 UTC (rev 3941)
+++ jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml 2009-02-19 09:58:39 UTC (rev 3942)
@@ -65,8 +65,7 @@
<include>*:jbpm-jboss5:jar:config</include>
</includes>
<unpack>true</unpack>
- </dependencySet>
-
+ </dependencySet>
</dependencySets>
<fileSets>
Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-19 09:43:09 UTC (rev 3941)
+++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml 2009-02-19 09:58:39 UTC (rev 3942)
@@ -234,6 +234,9 @@
<file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/>
<singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic"
target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
+ <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" condition="isHypersonic">
+ <include name="hypersonic/jbpm4DB.*" />
+ </fileset>
<!-- Database MySQL -->
<file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/>
Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml 2009-02-19 09:43:09 UTC (rev 3941)
+++ jbpm4/trunk/modules/examples/pom.xml 2009-02-19 09:58:39 UTC (rev 3942)
@@ -98,24 +98,6 @@
</executions>
</plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>${project.build.finalName}</finalName>
- <appendAssemblyId>true</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-config.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Modified: jbpm4/trunk/modules/jpdl/pom.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/pom.xml 2009-02-19 09:43:09 UTC (rev 3941)
+++ jbpm4/trunk/modules/jpdl/pom.xml 2009-02-19 09:58:39 UTC (rev 3942)
@@ -136,6 +136,20 @@
<!-- Profiles -->
<profiles>
+ <profile>
+ <id>distro</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>false</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
</project>
\ No newline at end of file
Modified: jbpm4/trunk/modules/jpdl/scripts/assembly-config.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/scripts/assembly-config.xml 2009-02-19 09:43:09 UTC (rev 3941)
+++ jbpm4/trunk/modules/jpdl/scripts/assembly-config.xml 2009-02-19 09:58:39 UTC (rev 3942)
@@ -1,5 +1,5 @@
<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
<id>config</id>
<formats>
<format>jar</format>
@@ -9,13 +9,22 @@
<fileSet>
<directory>${project.build.outputDirectory}</directory>
<outputDirectory>/</outputDirectory>
- <includes>
+ <includes>
<include>jbpm.cfg.xml</include>
<include>logging.properties</include>
<include>hibernate.cfg.xml</include>
<include>hibernate.cfg.*.xml</include>
<include>jbpm-*-ds.xml</include>
</includes>
- </fileSet>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>hypersonic/jbpm4DB.log</include>
+ <include>hypersonic/jbpm4DB.properties</include>
+ <include>hypersonic/jbpm4DB.script</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
\ No newline at end of file
Added: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/DbGenTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/DbGenTest.java (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/test/xml/DbGenTest.java 2009-02-19 09:58:39 UTC (rev 3942)
@@ -0,0 +1,49 @@
+/*
+ * 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.test.xml;
+
+import org.jbpm.test.JbpmTestCase;
+import org.jbpm.Execution;
+
+/**
+ * A simple test execution that force the generation of the
+ * hypersomic database structure.
+ *
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public class DbGenTest extends JbpmTestCase
+{
+
+ public void testWaitStatesSequence() {
+ deployJpdlResource("org/jbpm/test/xml/process.jpdl.xml");
+
+ Execution execution = executionService.startProcessInstanceByKey("StateSequence");
+ assertEquals("a", execution.getActivityName());
+
+ String executionId = execution.getId();
+ execution = executionService.signalExecutionById(executionId);
+ assertEquals("b", execution.getActivityName());
+
+ execution = executionService.signalExecutionById(executionId);
+ assertEquals("c", execution.getActivityName());
+ }
+}
Added: jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/process.jpdl.xml
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/process.jpdl.xml (rev 0)
+++ jbpm4/trunk/modules/jpdl/src/test/resources/org/jbpm/test/xml/process.jpdl.xml 2009-02-19 09:58:39 UTC (rev 3942)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process name="StateSequence" xmlns="http://jbpm.org/4/jpdl">
+
+ <start g="16,18,48,48">
+ <flow to="a" />
+ </start>
+
+ <state name="a" g="96,16,75,52">
+ <flow to="b" />
+ </state>
+
+ <state name="b" g="203,16,73,52">
+ <flow to="c" />
+ </state>
+
+ <state name="c" g="308,16,76,52" />
+
+</process>
\ No newline at end of file
More information about the jbpm-commits
mailing list