JBoss JBPM SVN: r2082 - jbpm3/trunk/modules/jpdl/core/src/main/resources.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-09-03 08:18:10 -0400 (Wed, 03 Sep 2008)
New Revision: 2082
Modified:
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml
Log:
removed commented hibernate settings in core that actually belong to enterprise
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml 2008-09-03 11:03:03 UTC (rev 2081)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.cache.xml 2008-09-03 12:18:10 UTC (rev 2082)
@@ -1,4 +1,4 @@
-
+
<!-- ################################### -->
<!-- # cache settings # -->
<!-- # strategy="nonstrict-read-write" # -->
@@ -60,71 +60,6 @@
<collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.swimlanes" usage="nonstrict-read-write" />
<collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.tasks" usage="nonstrict-read-write" />
- <!-- ############################ -->
- <!-- # cache settings # -->
- <!-- # strategy="transactional" # -->
- <!-- # can be used with hibernate.cache.provider_class=org.hibernate.cache.TreeCacheProvider # -->
- <!-- ############################ -->
-
- <!--
-
- <class-cache class="org.jbpm.context.def.VariableAccess" usage="transactional" />
-
- <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="transactional" />
-
- <collection-cache collection="org.jbpm.graph.action.Script.variableAccesses" usage="transactional" />
-
- <class-cache class="org.jbpm.graph.def.Action" usage="transactional" />
-
- <class-cache class="org.jbpm.graph.def.Event" usage="transactional" />
- <collection-cache collection="org.jbpm.graph.def.Event.actions" usage="transactional" />
-
- <class-cache class="org.jbpm.graph.def.ExceptionHandler" usage="transactional" />
- <collection-cache collection="org.jbpm.graph.def.ExceptionHandler.actions" usage="transactional" />
-
- <class-cache class="org.jbpm.graph.def.Node" usage="transactional" />
- <collection-cache collection="org.jbpm.graph.def.Node.events" usage="transactional" />
- <collection-cache collection="org.jbpm.graph.def.Node.exceptionHandlers" usage="transactional" />
- <collection-cache collection="org.jbpm.graph.def.Node.leavingTransitions" usage="transactional" />
- <collection-cache collection="org.jbpm.graph.def.Node.arrivingTransitions" usage="transactional" />
-
- <class-cache class="org.jbpm.graph.def.ProcessDefinition" usage="transactional" />
- <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.events" usage="transactional" />
- <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.exceptionHandlers" usage="transactional" />
- <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.nodes" usage="transactional" />
- <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.actions" usage="transactional" />
- <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.definitions" usage="transactional" />
-
- <collection-cache collection="org.jbpm.graph.def.SuperState.nodes" usage="transactional" />
-
- <class-cache class="org.jbpm.graph.def.Transition" usage="transactional" />
- <collection-cache collection="org.jbpm.graph.def.Transition.events" usage="transactional" />
- <collection-cache collection="org.jbpm.graph.def.Transition.exceptionHandlers" usage="transactional" />
-
- <collection-cache collection="org.jbpm.graph.node.Decision.decisionConditions" usage="transactional" />
-
- <collection-cache collection="org.jbpm.graph.node.ProcessState.variableAccesses" usage="transactional" />
-
- <collection-cache collection="org.jbpm.graph.node.TaskNode.tasks" usage="transactional" />
-
- <class-cache class="org.jbpm.instantiation.Delegation" usage="transactional" />
-
- <class-cache class="org.jbpm.module.def.ModuleDefinition" usage="transactional" />
-
- <collection-cache collection="org.jbpm.taskmgmt.def.Swimlane.tasks" usage="transactional" />
-
- <class-cache class="org.jbpm.taskmgmt.def.TaskController" usage="transactional" />
- <collection-cache collection="org.jbpm.taskmgmt.def.TaskController.variableAccesses" usage="transactional" />
-
- <class-cache class="org.jbpm.taskmgmt.def.Task" usage="transactional" />
- <collection-cache collection="org.jbpm.taskmgmt.def.Task.events" usage="transactional" />
- <collection-cache collection="org.jbpm.taskmgmt.def.Task.exceptionHandlers" usage="transactional" />
-
- <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.swimlanes" usage="transactional" />
- <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.tasks" usage="transactional" />
-
- -->
-
<!--
==================================================================================
END org.jboss.jbpm:jbpm-jpdl-core hibernate.cfg.xml
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml 2008-09-03 11:03:03 UTC (rev 2081)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml 2008-09-03 12:18:10 UTC (rev 2082)
@@ -2,40 +2,20 @@
<!-- ################################### -->
<!-- # common settings # -->
<!-- ################################### -->
-
+
+ <!-- Simple memory-only cache -->
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-
+
+ <!-- Automatic schema creation -->
<property name="hibernate.hbm2ddl.auto">create</property>
+ <!-- logging properties -->
+ <property name="hibernate.format_sql">true</property>
+ <property name="hibernate.use_sql_comments">true</property>
+
<!-- ############################################ -->
<!-- # mapping files with external dependencies # -->
<!-- ############################################ -->
<!-- Additional mappings defined per module go here -->
<mapping resource="hibernate.extra.hbm.xml" />
-
- <!-- DataSource properties (begin) ===
- <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDataSource</property>
- ==== DataSource properties (end) -->
-
- <!-- JTA transaction properties (begin) ===
- <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
- <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
- ==== JTA transaction properties (end) -->
-
- <!-- following mapping files have a dependency on the JCR API
- <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/>
- -->
-
- <!-- CMT transaction properties (begin) ===
- <property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property>
- <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
- ==== CMT transaction properties (end) -->
-
- <!-- logging properties
- <property name="hibernate.show_sql">true</property>
- <property name="hibernate.format_sql">true</property>
- <property name="hibernate.use_sql_comments">true</property>
- -->
-
-
\ No newline at end of file
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2081 - in jbpm3/trunk/modules/enterprise: scripts and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-03 07:03:03 -0400 (Wed, 03 Sep 2008)
New Revision: 2081
Added:
jbpm3/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml
Modified:
jbpm3/trunk/modules/enterprise/pom.xml
Log:
Use assemble plugin
Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-03 10:42:24 UTC (rev 2080)
+++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-03 11:03:03 UTC (rev 2081)
@@ -154,6 +154,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
+ <id>config-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
@@ -166,19 +167,19 @@
</descriptors>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
<execution>
+ <id>dependency-assembly</id>
<phase>generate-test-resources</phase>
<goals>
- <goal>copy-dependencies</goal>
+ <goal>directory-single</goal>
</goals>
<configuration>
- <outputDirectory>${project.build.directory}/test-dependencies</outputDirectory>
- <includeScope>test</includeScope>
+ <finalName>test-dependencies</finalName>
+ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-test-dependencies.xml</descriptor>
+ </descriptors>
</configuration>
</execution>
</executions>
Added: jbpm3/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml (rev 0)
+++ jbpm3/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml 2008-09-03 11:03:03 UTC (rev 2081)
@@ -0,0 +1,28 @@
+<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">
+
+ <id>test-dependencies</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+
+ <!-- Dependency Sets -->
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:aspectjrt:jar</include>
+ <include>*:cactus.integration.shared.api:jar</include>
+ <include>*:cactus.core.framework.wrapper.javaEE.14</include>
+ <include>*:cactus.core.framework.javaEE.13-14</include>
+ <include>*:cactus.core.framework.javaEE.12-13-14</include>
+ <include>*:junit:jar</include>
+ </includes>
+ <unpack>false</unpack>
+ <scope>test</scope>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Property changes on: jbpm3/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2080 - in jbpm3/trunk/modules/enterprise: scripts and 6 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-09-03 06:42:24 -0400 (Wed, 03 Sep 2008)
New Revision: 2080
Added:
jbpm3/trunk/modules/enterprise/scripts/antrun-jbpm-config.xml
jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.cache.xml
jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.common.xml
jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.mapping.xml
jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.hsqldb.xml
jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.mysql.xml
jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.postgresql.xml
jbpm3/trunk/modules/enterprise/src/test/resources/WEB-INF/
Removed:
jbpm3/trunk/modules/enterprise/src/test/resources/webapp/
Modified:
jbpm3/trunk/modules/enterprise/pom.xml
jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml
jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java
jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java
Log:
rehabilitated enterprise tests - work in progress
[JBPM-1708] EjbSchedulerTest: sporadic assertion failures in testSchedulePast and testScheduleMultiple, due to reliance on Thread.sleep
AsyncProcessingTest: testBulkJobs fails due to persisting stale state exceptions
[JBPM-1709] JtaDbPersistenceTest is back to work, see notes in Jira
Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-03 10:05:32 UTC (rev 2079)
+++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-03 10:42:24 UTC (rev 2080)
@@ -24,7 +24,22 @@
<artifactId>jbpm</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
-
+
+ <!-- Profiles -->
+ <profiles>
+ <profile>
+ <id>no-database</id>
+ <activation>
+ <property>
+ <name>!database</name>
+ </property>
+ </activation>
+ <properties>
+ <database>hsqldb</database>
+ </properties>
+ </profile>
+ </profiles>
+
<!-- Dependencies -->
<dependencies>
<!-- jBPM Dependencies -->
@@ -60,7 +75,14 @@
<dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId>
+ <version>1.8.0</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>org.mortbay.jetty</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.client</groupId>
@@ -72,7 +94,14 @@
<dependency>
<groupId>org.apache.cactus</groupId>
<artifactId>cactus.integration.shared.api</artifactId>
+ <version>1.8.0</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>org.mortbay.jetty</artifactId>
+ <groupId>org.mortbay.jetty</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -93,6 +122,7 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
+ <id>build-test-jars</id>
<phase>test-compile</phase>
<goals>
<goal>run</goal>
@@ -105,6 +135,19 @@
</tasks>
</configuration>
</execution>
+ <execution>
+ <id>concat-hibernate-config</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <property name="database" value="${database}" />
+ <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" />
+ </tasks>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -151,6 +194,7 @@
<configuration>
<excludes>
<exclude>jbpm.cfg.xml</exclude>
+ <exclude>hibernate.*</exclude>
</excludes>
</configuration>
</plugin>
@@ -161,8 +205,6 @@
<!-- https://jira.jboss.org/jira/browse/JBPM-1708 -->
<exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude>
<exclude>org/jbpm/msg/jms/AsyncProcessingTest.java</exclude>
- <!-- https://jira.jboss.org/jira/browse/JBPM-1709 -->
- <exclude>org/jbpm/persistence/jta/JtaDbPersistenceTest.java</exclude>
</excludes>
</configuration>
</plugin>
Added: jbpm3/trunk/modules/enterprise/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/antrun-jbpm-config.xml (rev 0)
+++ jbpm3/trunk/modules/enterprise/scripts/antrun-jbpm-config.xml 2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,60 @@
+<?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. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id: antrun-jbpm-config.xml 2069 2008-09-02 12:30:53Z thomas.diesler(a)jboss.com $ -->
+
+<project default="concat">
+
+ <property name="project.build.directory" value="${basedir}/target"/>
+ <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
+
+ <macrodef name="macro-database-cfg">
+ <attribute name="database" />
+ <sequential>
+
+ <available property="database.properties.available" file="${project.resources.directory}/hibernate.properties.(a){database}.xml"/>
+ <fail message="hibernate.properties.(a){database}.xml not available" unless="database.properties.available"/>
+
+ <echo message="Concat hibernate.cfg.(a){database}.xml using hibernate.properties.(a){database}.xml" />
+
+ <!-- Concat hibernate.cfg.xml -->
+ <concat destfile="${project.build.directory}/classes/hibernate.cfg.(a){database}.xml">
+ <header trimleading="yes"><![CDATA[<?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>
+ ]]></header>
+ <fileset file="${project.resources.directory}/hibernate.common.xml" />
+ <fileset file="${project.resources.directory}/hibernate.properties.(a){database}.xml" />
+ <fileset file="${project.resources.directory}/hibernate.mapping.xml" />
+ <fileset file="${project.resources.directory}/hibernate.cache.xml" />
+ <footer trimleading="yes"><![CDATA[
+ </session-factory>
+ </hibernate-configuration>
+ ]]></footer>
+ </concat>
+ </sequential>
+ </macrodef>
+
+ <target name="concat">
+
+ <macro-database-cfg database="hsqldb"/>
+ <macro-database-cfg database="mysql"/>
+ <macro-database-cfg database="postgresql"/>
+
+ <echo message="Copy hibernate.cfg.${database}.xml to hibernate.cfg.xml" />
+ <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" tofile="${project.build.directory}/classes/hibernate.cfg.xml"/>
+ </target>
+</project>
\ No newline at end of file
Modified: jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2008-09-03 10:05:32 UTC (rev 2079)
+++ jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml 2008-09-03 10:42:24 UTC (rev 2080)
@@ -21,18 +21,27 @@
<mkdir dir="${tests.output.dir}/test-libs"/>
<!-- enterprise-test -->
- <war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/webapp/WEB-INF/web.xml">
- <classes dir="${tests.output.dir}/test-classes"/>
+ <war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jbpm/**" />
+ <exclude name="org/jbpm/enterprise/test/**" />
+ </classes>
<lib dir="${tests.output.dir}/test-dependencies">
<include name="aspectjrt*.jar"/>
<include name="cactus*.jar"/>
<include name="junit*.jar"/>
</lib>
- <webinf dir="${tests.resources.dir}/webapp/WEB-INF">
- <include name="jboss-web.xml"/>
+ <webinf dir="${tests.resources.dir}/WEB-INF">
+ <exclude name="web.xml"/>
</webinf>
</war>
-
+
+ <jar destfile="${tests.output.dir}/test-libs/enterprise-test.jar">
+ <fileset dir="${tests.output.dir}/test-classes">
+ <include name="org/jbpm/enterprise/test/**" />
+ </fileset>
+ </jar>
+
<!-- Please add alphabetically -->
</target>
Modified: jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml 2008-09-03 10:05:32 UTC (rev 2079)
+++ jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml 2008-09-03 10:42:24 UTC (rev 2080)
@@ -7,10 +7,14 @@
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
<fileSet>
- <directory>src/main/resources</directory>
+ <directory>${project.build.outputDirectory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
+ <include>hibernate.cfg.xml</include>
+ <include>hibernate.cfg.*.xml</include>
<include>jbpm.cfg.xml</include>
+ <include>jbpm.mail.templates.xml</include>
+ <include>tree.cache.xml</include>
</includes>
</fileSet>
</fileSets>
Added: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.cache.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.cache.xml (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.cache.xml 2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,67 @@
+
+ <!-- ################################### -->
+ <!-- # cache settings # -->
+ <!-- # strategy="nonstrict-read-write" # -->
+ <!-- # can be used with hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider # -->
+ <!-- ################################### -->
+
+ <class-cache class="org.jbpm.context.def.VariableAccess" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.graph.action.Script.variableAccesses" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.graph.def.Action" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.graph.def.Event" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Event.actions" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.graph.def.ExceptionHandler" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.ExceptionHandler.actions" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.graph.def.Node" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Node.events" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Node.exceptionHandlers" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Node.leavingTransitions" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Node.arrivingTransitions" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.graph.def.ProcessDefinition" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.events" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.exceptionHandlers" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.nodes" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.actions" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.definitions" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.graph.def.SuperState.nodes" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.graph.def.Transition" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Transition.events" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.graph.def.Transition.exceptionHandlers" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.graph.node.Decision.decisionConditions" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.graph.node.ProcessState.variableAccesses" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.graph.node.TaskNode.tasks" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.instantiation.Delegation" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.module.def.ModuleDefinition" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.taskmgmt.def.Swimlane.tasks" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.taskmgmt.def.TaskController" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.taskmgmt.def.TaskController.variableAccesses" usage="nonstrict-read-write" />
+
+ <class-cache class="org.jbpm.taskmgmt.def.Task" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.taskmgmt.def.Task.events" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.taskmgmt.def.Task.exceptionHandlers" usage="nonstrict-read-write" />
+
+ <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.swimlanes" usage="nonstrict-read-write" />
+ <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.tasks" usage="nonstrict-read-write" />
+
+ <!--
+ ==================================================================================
+ END org.jboss.jbpm:jbpm-jpdl-core hibernate.cfg.xml
+ ==================================================================================
+ -->
Added: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.common.xml (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.common.xml 2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,24 @@
+
+ <!-- ################################### -->
+ <!-- # common settings # -->
+ <!-- ################################### -->
+
+ <!-- Simple memory-only cache -->
+ <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+
+ <!-- DataSource properties -->
+ <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDataSource</property>
+
+ <!-- JTA transaction properties -->
+ <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
+ <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
+
+ <!-- CMT transaction properties
+ <property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property>
+ <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
+ -->
+
+ <!-- logging properties -->
+ <property name="hibernate.format_sql">true</property>
+ <property name="hibernate.use_sql_comments">true</property>
+
\ No newline at end of file
Added: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.mapping.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.mapping.xml (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.mapping.xml 2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,149 @@
+
+ <!-- ############################################ -->
+ <!-- # mapping files with external dependencies # -->
+ <!-- ############################################ -->
+
+ <!-- following mapping files have a dependency on the JCR API -->
+ <!--
+ <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/>
+ -->
+
+ <!-- ###################### -->
+ <!-- # jbpm mapping files # -->
+ <!-- ###################### -->
+
+ <!-- hql queries and type defs -->
+ <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
+ <!-- hql queries used in simulation for querying historical data
+ uncomment if you want to use the GetSimulationInputCommand
+ or maybe you also want to use the queries yourself
+ be patient: the queries need the stddev function to be enabled in your dialect
+ more information on this can be found here: http://www.camunda.com/business_process_simulation_news/mysql_and_stddev.... -->
+ <!--
+ <mapping resource="org/jbpm/sim/bam/hibernate.queries.hbm.xml" />
+ -->
+
+ <!-- graph.action mapping files -->
+ <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
+
+ <!-- graph.def mapping files -->
+ <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
+ <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
+
+ <!-- ############################################ -->
+ <!-- # another mapping file with external dependencies # -->
+ <!-- ############################################ -->
+ <!-- following mapping file has a dependency on -->
+ <!-- 'bsh-{version}.jar'. -->
+ <!-- uncomment this if you don't have bsh on your -->
+ <!-- classpath. you won't be able to use the -->
+ <!-- script element in process definition files -->
+ <!-- has to be defined below org/jbpm/graph/def/Action.hbm.xml -->
+ <!-- due to the inline collection-cache elements below -->
+ <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
+
+ <!-- graph.node mapping files -->
+ <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
+
+ <!-- context.def mapping files -->
+ <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
+
+ <!-- bytes mapping files -->
+ <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
+
+ <!-- module.def mapping files -->
+ <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
+
+ <!-- file.def mapping files -->
+ <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
+
+ <!-- taskmgmt.def mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
+
+ <!-- scheduler.def mapping files -->
+ <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
+ <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
+
+ <!-- graph.exe mapping files -->
+ <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
+
+ <!-- module.exe mapping files -->
+ <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
+
+ <!-- context.exe mapping files -->
+ <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
+
+ <!-- job mapping files -->
+ <mapping resource="org/jbpm/job/Job.hbm.xml"/>
+ <mapping resource="org/jbpm/job/Timer.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/>
+
+ <!-- taskmgmt.exe mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
+
+ <!-- logging mapping files -->
+ <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
+ <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
+ <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>
Added: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.hsqldb.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.hsqldb.xml (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.hsqldb.xml 2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,3 @@
+
+ <!-- hibernate dialect -->
+ <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
Added: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.mysql.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.mysql.xml (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.mysql.xml 2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,3 @@
+
+ <!-- hibernate dialect -->
+ <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
Added: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.postgresql.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.postgresql.xml (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.postgresql.xml 2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,3 @@
+
+ <!-- hibernate dialect -->
+ <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java 2008-09-03 10:05:32 UTC (rev 2079)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java 2008-09-03 10:42:24 UTC (rev 2080)
@@ -53,9 +53,8 @@
static int nbrOfConcurrentProcessExecutions = 20;
static int maxWaitTime = 30000;
- public static Test suite() throws Exception
- {
- return new IntegrationTestSetup(AsyncProcessingTest.class, "enterprise-test.war");
+ public static Test suite() throws Exception {
+ return new IntegrationTestSetup(AsyncProcessingTest.class, "enterprise-test.war, enterprise-test.jar");
}
protected void setUp() throws Exception {
Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java 2008-09-03 10:05:32 UTC (rev 2079)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java 2008-09-03 10:42:24 UTC (rev 2080)
@@ -34,7 +34,6 @@
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.scheduler.ejbtimer.EjbSchedulerTest;
public class JtaDbPersistenceTest extends ServletTestCase {
@@ -44,9 +43,8 @@
private static long definitionId;
- public static Test suite() throws Exception
- {
- return new IntegrationTestSetup(EjbSchedulerTest.class, "enterprise-test.war");
+ public static Test suite() throws Exception {
+ return new IntegrationTestSetup(JtaDbPersistenceTest.class, "enterprise-test.war");
}
protected void setUp() throws Exception {
Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java 2008-09-03 10:05:32 UTC (rev 2079)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java 2008-09-03 10:42:24 UTC (rev 2080)
@@ -46,9 +46,8 @@
private static LocalCommandServiceHome commandServiceHome;
- public static Test suite() throws Exception
- {
- return new IntegrationTestSetup(EjbSchedulerTest.class, "enterprise-test.war");
+ public static Test suite() throws Exception {
+ return new IntegrationTestSetup(EjbSchedulerTest.class, "enterprise-test.war, enterprise-test.jar");
}
protected void setUp() throws Exception {
Copied: jbpm3/trunk/modules/enterprise/src/test/resources/WEB-INF (from rev 2059, jbpm3/trunk/modules/enterprise/src/test/resources/webapp/WEB-INF)
Property changes on: jbpm3/trunk/modules/enterprise/src/test/resources/WEB-INF
___________________________________________________________________
Name: svn:mergeinfo
+
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2079 - in jbpm3/trunk/hudson: hudson-home and 4 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-03 06:05:32 -0400 (Wed, 03 Sep 2008)
New Revision: 2079
Modified:
jbpm3/trunk/hudson/build.xml
jbpm3/trunk/hudson/hudson-home/command.sh
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml
Log:
Respect maven exit status
Modified: jbpm3/trunk/hudson/build.xml
===================================================================
--- jbpm3/trunk/hudson/build.xml 2008-09-03 08:29:16 UTC (rev 2078)
+++ jbpm3/trunk/hudson/build.xml 2008-09-03 10:05:32 UTC (rev 2079)
@@ -133,6 +133,7 @@
<copy todir="${hudson.home}" overwrite="true">
<fileset dir="${hudson.dir}/hudson-home">
<include name="jobs/*/config.xml"/>
+ <include name="command.sh"/>
<include name="*.xml"/>
</fileset>
<filterset>
Modified: jbpm3/trunk/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-03 08:29:16 UTC (rev 2078)
+++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-03 10:05:32 UTC (rev 2079)
@@ -32,7 +32,11 @@
#
cd $JBPMDIR
cp profiles.xml.example profiles.xml
-mvn -U -Pdistro clean package
+mvn -U -Pdistro clean package; MVN_STATUS=$?
+if [ $MVN_STATUS -ne 0 ]; then
+ echo maven exit status $MVN_STATUS
+ exit 1
+fi
#
# Deploy distro
@@ -62,9 +66,7 @@
#
# execute tests
#
-mvn -Ddatabase=$DATABASE test 2>&1 | tee $WORKSPACE/tests.log
-# cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-# cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt
+mvn -Ddatabase=$DATABASE test 2>&1; MVN_STATUS=$?
#
# stop jbossas
@@ -72,3 +74,7 @@
$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
cp $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE/jboss-boot.log
cp $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE/jboss-server.log
+
+echo maven exit status $MVN_STATUS
+exit $MVN_STATUS
+
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml 2008-09-03 08:29:16 UTC (rev 2078)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml 2008-09-03 10:05:32 UTC (rev 2079)
@@ -66,6 +66,7 @@
#
# call command.sh
#
+# /bin/sh $HUDSON_BASE/hudson-home/command.sh
/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml 2008-09-03 08:29:16 UTC (rev 2078)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml 2008-09-03 10:05:32 UTC (rev 2079)
@@ -66,6 +66,7 @@
#
# call command.sh
#
+# /bin/sh $HUDSON_BASE/hudson-home/command.sh
/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-09-03 08:29:16 UTC (rev 2078)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-09-03 10:05:32 UTC (rev 2079)
@@ -55,7 +55,8 @@
#
# call command.sh
#
-/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
+/bin/sh $HUDSON_BASE/hudson-home/command.sh
+#/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-09-03 08:29:16 UTC (rev 2078)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-09-03 10:05:32 UTC (rev 2079)
@@ -55,6 +55,7 @@
#
# call command.sh
#
+# /bin/sh $HUDSON_BASE/hudson-home/command.sh
/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2078 - jbpm3/trunk/hudson/hudson-home.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-03 04:29:16 -0400 (Wed, 03 Sep 2008)
New Revision: 2078
Modified:
jbpm3/trunk/hudson/hudson-home/command.sh
Log:
mv tmp.xml auto-install.xml
Modified: jbpm3/trunk/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-03 08:07:29 UTC (rev 2077)
+++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-03 08:29:16 UTC (rev 2078)
@@ -38,7 +38,7 @@
# Deploy distro
#
sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install-$DATABASE.xml > auto-install.xml
-sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml
+sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; mv tmp.xml auto-install.xml
cat auto-install.xml; java -jar $DISTRODIR/jbpm-distribution-$JBPM_VERSION-izpack.jar auto-install.xml
#
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2077 - in jbpm3/trunk/hudson: hudson-home and 4 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-03 04:07:29 -0400 (Wed, 03 Sep 2008)
New Revision: 2077
Modified:
jbpm3/trunk/hudson/build.xml
jbpm3/trunk/hudson/hudson-home/command.sh
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml
Log:
Use command.sh from jbpm workspace
Modified: jbpm3/trunk/hudson/build.xml
===================================================================
--- jbpm3/trunk/hudson/build.xml 2008-09-03 07:51:41 UTC (rev 2076)
+++ jbpm3/trunk/hudson/build.xml 2008-09-03 08:07:29 UTC (rev 2077)
@@ -137,8 +137,8 @@
</fileset>
<filterset>
<filter token="hudson.jbpm.url" value="${hudson.jbpm.url}"/>
+ <filter token="hudson.base" value="${hudson.base}"/>
<filter token="hudson.home" value="${hudson.home}"/>
- <filter token="hudson.root" value="${hudson.root}"/>
<filter token="version.id" value="${version.id}"/>
<filtersfile file="${hudson.dir}/ant.properties"/>
</filterset>
Modified: jbpm3/trunk/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-03 07:51:41 UTC (rev 2076)
+++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-03 08:07:29 UTC (rev 2077)
@@ -22,7 +22,7 @@
# Unzip the JBoss build
#
rm -rf $JBOSS_BUILD
-unzip -q $HUDSON_HOME/jboss/$JBOSS_BUILD.zip
+unzip -q $HUDSON_BASE/jboss/$JBOSS_BUILD.zip
JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_HOME"
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml 2008-09-03 07:51:41 UTC (rev 2076)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml 2008-09-03 08:07:29 UTC (rev 2077)
@@ -57,7 +57,8 @@
export CONTAINER=$container
export DATABASE=$database
-export HUDSON_HOME=(a)hudson.home@
+
+export HUDSON_BASE=(a)hudson.base@
export JBPM_VERSION=(a)version.id@
export JBOSS_SERVER=(a)jboss.server.instance@
export JBOSS_BINDADDR=(a)jboss.bind.address@
@@ -65,7 +66,7 @@
#
# call command.sh
#
-$JBPMDIR/hudson/hudson-home/command.sh
+/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml 2008-09-03 07:51:41 UTC (rev 2076)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml 2008-09-03 08:07:29 UTC (rev 2077)
@@ -57,7 +57,8 @@
export CONTAINER=$container
export DATABASE=$database
-export HUDSON_HOME=(a)hudson.home@
+
+export HUDSON_BASE=(a)hudson.base@
export JBPM_VERSION=(a)version.id@
export JBOSS_SERVER=(a)jboss.server.instance@
export JBOSS_BINDADDR=(a)jboss.bind.address@
@@ -65,7 +66,7 @@
#
# call command.sh
#
-$JBPMDIR/hudson/hudson-home/command.sh
+/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-09-03 07:51:41 UTC (rev 2076)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-09-03 08:07:29 UTC (rev 2077)
@@ -47,7 +47,7 @@
WORKSPACE=`pwd`
JBPMDIR=$WORKSPACE/jbpm
-export HUDSON_HOME=(a)hudson.home@
+export HUDSON_BASE=(a)hudson.base@
export JBPM_VERSION=(a)version.id@
export JBOSS_SERVER=(a)jboss.server.instance@
export JBOSS_BINDADDR=(a)jboss.bind.address@
@@ -55,7 +55,7 @@
#
# call command.sh
#
-$JBPMDIR/hudson/hudson-home/command.sh
+/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-09-03 07:51:41 UTC (rev 2076)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-09-03 08:07:29 UTC (rev 2077)
@@ -47,7 +47,7 @@
WORKSPACE=`pwd`
JBPMDIR=$WORKSPACE/jbpm
-export HUDSON_HOME=(a)hudson.home@
+export HUDSON_BASE=(a)hudson.base@
export JBPM_VERSION=(a)version.id@
export JBOSS_SERVER=(a)jboss.server.instance@
export JBOSS_BINDADDR=(a)jboss.bind.address@
@@ -55,7 +55,7 @@
#
# call command.sh
#
-$JBPMDIR/hudson/hudson-home/command.sh
+/bin/sh $JBPMDIR/hudson/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2076 - in jbpm3/trunk/hudson: hudson-home and 4 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-03 03:51:41 -0400 (Wed, 03 Sep 2008)
New Revision: 2076
Modified:
jbpm3/trunk/hudson/build.xml
jbpm3/trunk/hudson/hudson-home/command.sh
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml
Log:
Use command.sh from jbpm workspace
Modified: jbpm3/trunk/hudson/build.xml
===================================================================
--- jbpm3/trunk/hudson/build.xml 2008-09-03 07:46:35 UTC (rev 2075)
+++ jbpm3/trunk/hudson/build.xml 2008-09-03 07:51:41 UTC (rev 2076)
@@ -143,11 +143,6 @@
<filtersfile file="${hudson.dir}/ant.properties"/>
</filterset>
</copy>
- <chmod perm="+x">
- <fileset dir="${hudson.home}">
- <include name="jobs/*/command.sh"/>
- </fileset>
- </chmod>
<echo/>
<echo message="*************************************"/>
Modified: jbpm3/trunk/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-03 07:46:35 UTC (rev 2075)
+++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-03 07:51:41 UTC (rev 2076)
@@ -22,7 +22,7 @@
# Unzip the JBoss build
#
rm -rf $JBOSS_BUILD
-unzip -q $HUDSON_ROOT/jboss/$JBOSS_BUILD.zip
+unzip -q $HUDSON_HOME/jboss/$JBOSS_BUILD.zip
JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_HOME"
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml 2008-09-03 07:46:35 UTC (rev 2075)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml 2008-09-03 07:51:41 UTC (rev 2076)
@@ -57,7 +57,7 @@
export CONTAINER=$container
export DATABASE=$database
-export HUDSON_ROOT=(a)hudson.root@
+export HUDSON_HOME=(a)hudson.home@
export JBPM_VERSION=(a)version.id@
export JBOSS_SERVER=(a)jboss.server.instance@
export JBOSS_BINDADDR=(a)jboss.bind.address@
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml 2008-09-03 07:46:35 UTC (rev 2075)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml 2008-09-03 07:51:41 UTC (rev 2076)
@@ -57,7 +57,7 @@
export CONTAINER=$container
export DATABASE=$database
-export HUDSON_ROOT=(a)hudson.root@
+export HUDSON_HOME=(a)hudson.home@
export JBPM_VERSION=(a)version.id@
export JBOSS_SERVER=(a)jboss.server.instance@
export JBOSS_BINDADDR=(a)jboss.bind.address@
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-09-03 07:46:35 UTC (rev 2075)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-09-03 07:51:41 UTC (rev 2076)
@@ -47,7 +47,7 @@
WORKSPACE=`pwd`
JBPMDIR=$WORKSPACE/jbpm
-export HUDSON_ROOT=(a)hudson.root@
+export HUDSON_HOME=(a)hudson.home@
export JBPM_VERSION=(a)version.id@
export JBOSS_SERVER=(a)jboss.server.instance@
export JBOSS_BINDADDR=(a)jboss.bind.address@
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-09-03 07:46:35 UTC (rev 2075)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-09-03 07:51:41 UTC (rev 2076)
@@ -47,7 +47,7 @@
WORKSPACE=`pwd`
JBPMDIR=$WORKSPACE/jbpm
-export HUDSON_ROOT=(a)hudson.root@
+export HUDSON_HOME=(a)hudson.home@
export JBPM_VERSION=(a)version.id@
export JBOSS_SERVER=(a)jboss.server.instance@
export JBOSS_BINDADDR=(a)jboss.bind.address@
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2075 - jbpm3/trunk/hudson.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-03 03:46:35 -0400 (Wed, 03 Sep 2008)
New Revision: 2075
Modified:
jbpm3/trunk/hudson/build.xml
Log:
Use command.sh from jbpm workspace
Modified: jbpm3/trunk/hudson/build.xml
===================================================================
--- jbpm3/trunk/hudson/build.xml 2008-09-03 07:43:34 UTC (rev 2074)
+++ jbpm3/trunk/hudson/build.xml 2008-09-03 07:46:35 UTC (rev 2075)
@@ -133,13 +133,12 @@
<copy todir="${hudson.home}" overwrite="true">
<fileset dir="${hudson.dir}/hudson-home">
<include name="jobs/*/config.xml"/>
- <include name="jobs/*/command.sh"/>
<include name="*.xml"/>
</fileset>
<filterset>
<filter token="hudson.jbpm.url" value="${hudson.jbpm.url}"/>
<filter token="hudson.home" value="${hudson.home}"/>
- <filter token="hudson.jboss" value="${hudson.jboss}"/>
+ <filter token="hudson.root" value="${hudson.root}"/>
<filter token="version.id" value="${version.id}"/>
<filtersfile file="${hudson.dir}/ant.properties"/>
</filterset>
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2074 - in jbpm3/trunk/hudson/hudson-home: jobs and 4 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-03 03:43:34 -0400 (Wed, 03 Sep 2008)
New Revision: 2074
Added:
jbpm3/trunk/hudson/hudson-home/command.sh
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/
Removed:
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/command.sh
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/command.sh
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/
Modified:
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml
jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml
Log:
Use command.sh from jbpm workspace
Added: jbpm3/trunk/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/command.sh (rev 0)
+++ jbpm3/trunk/hudson/hudson-home/command.sh 2008-09-03 07:43:34 UTC (rev 2074)
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+WORKSPACE=`pwd`
+JBPMDIR=$WORKSPACE/jbpm
+DISTRODIR=$JBPMDIR/modules/distribution/target
+
+case "$CONTAINER" in
+ jboss422*)
+ JBOSS_BUILD=jboss-4.2.2.GA
+ ;;
+
+ jboss423*)
+ JBOSS_BUILD=jboss-4.2.3.GA
+ ;;
+
+ jboss500*)
+ JBOSS_BUILD=jboss-5.0.0.CR1
+ ;;
+esac
+
+#
+# Unzip the JBoss build
+#
+rm -rf $JBOSS_BUILD
+unzip -q $HUDSON_ROOT/jboss/$JBOSS_BUILD.zip
+
+JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
+ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_HOME"
+
+#
+# Build distro
+#
+cd $JBPMDIR
+cp profiles.xml.example profiles.xml
+mvn -U -Pdistro clean package
+
+#
+# Deploy distro
+#
+sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install-$DATABASE.xml > auto-install.xml
+sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml
+cat auto-install.xml; java -jar $DISTRODIR/jbpm-distribution-$JBPM_VERSION-izpack.jar auto-install.xml
+
+#
+# start jbossas
+#
+$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
+
+# Was it successfully started?
+$JBPMDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+if [ -e $WORKSPACE/spider.failed ]; then
+ tail -n 100 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log
+ $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR
+ exit 1
+fi
+
+#
+# log dependency tree
+#
+mvn -Ddatabase=$DATABASE dependency:tree | tee $WORKSPACE/dependency-tree.txt
+
+#
+# execute tests
+#
+mvn -Ddatabase=$DATABASE test 2>&1 | tee $WORKSPACE/tests.log
+# cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
+# cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt
+
+#
+# stop jbossas
+#
+$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
+cp $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE/jboss-boot.log
+cp $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE/jboss-server.log
Property changes on: jbpm3/trunk/hudson/hudson-home/command.sh
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix (from rev 2073, jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix)
Deleted: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-09-03 07:21:42 UTC (rev 2073)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/command.sh 2008-09-03 07:43:34 UTC (rev 2074)
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-WORKSPACE=`pwd`
-JBPMDIR=$WORKSPACE/jbpm
-DISTRODIR=$JBPMDIR/modules/distribution/target
-JBOSS_BINDADDR=(a)jboss.bind.address@
-
-case "$CONTAINER" in
- jboss422*)
- JBOSS_BUILD=jboss-4.2.2.GA
- ;;
-
- jboss423*)
- JBOSS_BUILD=jboss-4.2.3.GA
- ;;
-
- jboss500*)
- JBOSS_BUILD=jboss-5.0.0.CR1
- ;;
-esac
-
-#
-# Unzip the JBoss build
-#
-rm -rf $JBOSS_BUILD
-unzip -q @hudson.jboss(a)/$JBOSS_BUILD.zip
-
-JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
-ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_HOME"
-
-#
-# Build distro
-#
-cd $JBPMDIR
-cp profiles.xml.example profiles.xml
-mvn -U -Pdistro clean package
-
-#
-# Deploy distro
-#
-sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install-$DATABASE.xml > auto-install.xml
-sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml
-cat auto-install.xml; java -jar $DISTRODIR/jbpm-distribution-@version.id(a)-izpack.jar auto-install.xml
-
-#
-# start jbossas
-#
-$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$JBPMDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log
- $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ddatabase=$DATABASE dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn -Ddatabase=$DATABASE test 2>&1 | tee $WORKSPACE/tests.log
-# cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-# cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt
-
-#
-# stop jbossas
-#
-$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
-cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
-cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml 2008-09-03 07:21:42 UTC (rev 2073)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Container-Matrix/config.xml 2008-09-03 07:43:34 UTC (rev 2074)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<matrix-project>
<actions class="java.util.concurrent.CopyOnWriteArrayList"/>
- <description>Build and test the @version.id@ Matrix</description>
+ <description>Build and test the @version.id@ Container Matrix</description>
<logRotator>
<daysToKeep>28</daysToKeep>
<numToKeep>-1</numToKeep>
@@ -39,8 +39,6 @@
<name>database</name>
<values>
<string>hsqldb</string>
- <string>mysql</string>
- <string>postgresql</string>
</values>
</axis>
<axis>
@@ -54,13 +52,20 @@
<builders>
<hudson.tasks.Shell>
<command>
+WORKSPACE=`pwd`
+JBPMDIR=$WORKSPACE/jbpm
+
export CONTAINER=$container
export DATABASE=$database
+export HUDSON_ROOT=(a)hudson.root@
+export JBPM_VERSION=(a)version.id@
+export JBOSS_SERVER=(a)jboss.server.instance@
+export JBOSS_BINDADDR=(a)jboss.bind.address@
#
# call command.sh
#
-@hudson.home(a)/jobs/jBPM-Matrix/command.sh
+$JBPMDIR/hudson/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
Copied: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix (from rev 2073, jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix)
Deleted: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/command.sh
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/command.sh 2008-09-03 07:21:42 UTC (rev 2073)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/command.sh 2008-09-03 07:43:34 UTC (rev 2074)
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-WORKSPACE=`pwd`
-JBPMDIR=$WORKSPACE/jbpm
-DISTRODIR=$JBPMDIR/modules/distribution/target
-JBOSS_BINDADDR=(a)jboss.bind.address@
-
-case "$CONTAINER" in
- jboss422*)
- JBOSS_BUILD=jboss-4.2.2.GA
- ;;
-
- jboss423*)
- JBOSS_BUILD=jboss-4.2.3.GA
- ;;
-
- jboss500*)
- JBOSS_BUILD=jboss-5.0.0.CR1
- ;;
-esac
-
-#
-# Unzip the JBoss build
-#
-rm -rf $JBOSS_BUILD
-unzip -q @hudson.jboss(a)/$JBOSS_BUILD.zip
-
-JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
-ENVIRONMENT="-Djboss.bind.address=$JBOSS_BINDADDR -Djboss.home=$JBOSS_HOME"
-
-#
-# Build distro
-#
-cd $JBPMDIR
-cp profiles.xml.example profiles.xml
-mvn -U -Pdistro clean package
-
-#
-# Deploy distro
-#
-sed s:CONTAINER:$CONTAINER: $DISTRODIR/resources/auto-install-$DATABASE.xml > auto-install.xml
-sed s:JBOSS_HOME:$JBOSS_HOME: auto-install.xml > tmp.xml; cp tmp.xml auto-install.xml
-cat auto-install.xml; java -jar $DISTRODIR/jbpm-distribution-@version.id(a)-izpack.jar auto-install.xml
-
-#
-# start jbossas
-#
-$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
-
-# Was it successfully started?
-$JBPMDIR/hudson/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
-if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log
- $JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR
- exit 1
-fi
-
-#
-# log dependency tree
-#
-mvn -Ddatabase=$DATABASE dependency:tree | tee $WORKSPACE/dependency-tree.txt
-
-#
-# execute tests
-#
-mvn -Ddatabase=$DATABASE test 2>&1 | tee $WORKSPACE/tests.log
-# cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt
-# cat $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$CONTAINER.txt
-
-#
-# stop jbossas
-#
-$JBPMDIR/hudson/jboss/bin/jboss.sh $JBOSS_HOME stop
-cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log
-cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Matrix/config.xml 2008-09-03 07:21:42 UTC (rev 2073)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM-Database-Matrix/config.xml 2008-09-03 07:43:34 UTC (rev 2074)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<matrix-project>
<actions class="java.util.concurrent.CopyOnWriteArrayList"/>
- <description>Build and test the @version.id@ Matrix</description>
+ <description>Build and test the @version.id@ Database Matrix</description>
<logRotator>
<daysToKeep>28</daysToKeep>
<numToKeep>-1</numToKeep>
@@ -31,8 +31,6 @@
<name>container</name>
<values>
<string>jboss422</string>
- <string>jboss423</string>
- <string>jboss500</string>
</values>
</axis>
<axis>
@@ -54,13 +52,20 @@
<builders>
<hudson.tasks.Shell>
<command>
+WORKSPACE=`pwd`
+JBPMDIR=$WORKSPACE/jbpm
+
export CONTAINER=$container
export DATABASE=$database
+export HUDSON_ROOT=(a)hudson.root@
+export JBPM_VERSION=(a)version.id@
+export JBOSS_SERVER=(a)jboss.server.instance@
+export JBOSS_BINDADDR=(a)jboss.bind.address@
#
# call command.sh
#
-@hudson.home(a)/jobs/jBPM-Matrix/command.sh
+$JBPMDIR/hudson/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-09-03 07:21:42 UTC (rev 2073)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.5/config.xml 2008-09-03 07:43:34 UTC (rev 2074)
@@ -44,10 +44,18 @@
<builders>
<hudson.tasks.Shell>
<command>
+WORKSPACE=`pwd`
+JBPMDIR=$WORKSPACE/jbpm
+
+export HUDSON_ROOT=(a)hudson.root@
+export JBPM_VERSION=(a)version.id@
+export JBOSS_SERVER=(a)jboss.server.instance@
+export JBOSS_BINDADDR=(a)jboss.bind.address@
+
#
# call command.sh
#
-@hudson.home(a)/jobs/jBPM-Matrix/command.sh
+$JBPMDIR/hudson/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
Modified: jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml
===================================================================
--- jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-09-03 07:21:42 UTC (rev 2073)
+++ jbpm3/trunk/hudson/hudson-home/jobs/jBPM3-JDK1.6/config.xml 2008-09-03 07:43:34 UTC (rev 2074)
@@ -44,10 +44,18 @@
<builders>
<hudson.tasks.Shell>
<command>
+WORKSPACE=`pwd`
+JBPMDIR=$WORKSPACE/jbpm
+
+export HUDSON_ROOT=(a)hudson.root@
+export JBPM_VERSION=(a)version.id@
+export JBOSS_SERVER=(a)jboss.server.instance@
+export JBOSS_BINDADDR=(a)jboss.bind.address@
+
#
# call command.sh
#
-@hudson.home(a)/jobs/jBPM-Matrix/command.sh
+$JBPMDIR/hudson/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
17 years, 7 months
- 1
- 0
JBoss JBPM SVN: r2073 - in jbpm3/trunk/modules/jpdl/core: src/main/resources and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-09-03 03:21:42 -0400 (Wed, 03 Sep 2008)
New Revision: 2073
Added:
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.default.xml
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.mysql.xml
Removed:
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.xml
Modified:
jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml
jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml
Log:
[JBPM-1714] Add support for db specific mapping
Modified: jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-09-03 01:50:36 UTC (rev 2072)
+++ jbpm3/trunk/modules/jpdl/core/scripts/antrun-jbpm-config.xml 2008-09-03 07:21:42 UTC (rev 2073)
@@ -16,15 +16,23 @@
<property name="project.build.directory" value="${basedir}/target"/>
<property name="project.resources.directory" value="${basedir}/src/main/resources"/>
+ <!--
+ macrodef: macro-database-cfg
+ Concatenates the various db specific hibernate files to produce hibernate.cfg.[database].xml
+ -->
<macrodef name="macro-database-cfg">
<attribute name="database" />
<sequential>
- <available property="database.properties.available" file="${project.resources.directory}/hibernate.properties.(a){database}.xml"/>
- <fail message="hibernate.properties.(a){database}.xml not available" unless="database.properties.available"/>
+ <available property="@{database}.properties.available" file="${project.resources.directory}/hibernate.properties.(a){database}.xml"/>
+ <fail message="hibernate.properties.(a){database}.xml not available" unless="@{database}.properties.available"/>
- <echo message="Concat hibernate.cfg.(a){database}.xml using hibernate.properties.(a){database}.xml" />
+ <condition property="hibernate.mapping.(a){database}.xml" value="hibernate.mapping.(a){database}.xml" else="hibernate.mapping.default.xml">
+ <available property="@{database}.mapping.available" file="${project.resources.directory}/hibernate.mapping.(a){database}.xml"/>
+ </condition>
+ <echo message="Concat hibernate.cfg.(a){database}.xml using hibernate.properties.(a){database}.xml, ${hibernate.mapping.(a){database}.xml}" />
+
<!-- Concat hibernate.cfg.xml -->
<concat destfile="${project.build.directory}/classes/hibernate.cfg.(a){database}.xml">
<header trimleading="yes"><![CDATA[<?xml version='1.0' encoding='utf-8'?>
@@ -36,9 +44,9 @@
<hibernate-configuration>
<session-factory>
]]></header>
+ <fileset file="${project.resources.directory}/hibernate.properties.(a){database}.xml" />
<fileset file="${project.resources.directory}/hibernate.common.xml" />
- <fileset file="${project.resources.directory}/hibernate.properties.(a){database}.xml" />
- <fileset file="${project.resources.directory}/hibernate.mapping.xml" />
+ <fileset file="${project.resources.directory}/${hibernate.mapping.(a){database}.xml}" />
<fileset file="${project.resources.directory}/hibernate.cache.xml" />
<footer trimleading="yes"><![CDATA[
</session-factory>
@@ -48,6 +56,10 @@
</sequential>
</macrodef>
+ <!--
+ Target: concat
+ Invokes the database config macro for all supported databases
+ -->
<target name="concat">
<macro-database-cfg database="hsqldb"/>
Modified: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml 2008-09-03 01:50:36 UTC (rev 2072)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.common.xml 2008-09-03 07:21:42 UTC (rev 2073)
@@ -4,9 +4,16 @@
<!-- ################################### -->
<property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-
+
<property name="hibernate.hbm2ddl.auto">create</property>
+ <!-- ############################################ -->
+ <!-- # mapping files with external dependencies # -->
+ <!-- ############################################ -->
+
+ <!-- Additional mappings defined per module go here -->
+ <mapping resource="hibernate.extra.hbm.xml" />
+
<!-- DataSource properties (begin) ===
<property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDataSource</property>
==== DataSource properties (end) -->
@@ -16,6 +23,10 @@
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
==== JTA transaction properties (end) -->
+ <!-- following mapping files have a dependency on the JCR API
+ <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/>
+ -->
+
<!-- CMT transaction properties (begin) ===
<property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property>
<property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
Copied: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.default.xml (from rev 2072, jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.xml)
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.default.xml (rev 0)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.default.xml 2008-09-03 07:21:42 UTC (rev 2073)
@@ -0,0 +1,140 @@
+
+ <!-- ###################### -->
+ <!-- # jbpm mapping files # -->
+ <!-- ###################### -->
+
+ <!-- hql queries and type defs -->
+ <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
+ <!-- hql queries used in simulation for querying historical data
+ uncomment if you want to use the GetSimulationInputCommand
+ or maybe you also want to use the queries yourself
+ be patient: the queries need the stddev function to be enabled in your dialect
+ more information on this can be found here: http://www.camunda.com/business_process_simulation_news/mysql_and_stddev.... -->
+ <!--
+ <mapping resource="org/jbpm/sim/bam/hibernate.queries.hbm.xml" />
+ -->
+
+ <!-- graph.action mapping files -->
+ <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
+
+ <!-- graph.def mapping files -->
+ <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
+ <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
+
+ <!-- ############################################ -->
+ <!-- # another mapping file with external dependencies # -->
+ <!-- ############################################ -->
+ <!-- following mapping file has a dependency on -->
+ <!-- 'bsh-{version}.jar'. -->
+ <!-- uncomment this if you don't have bsh on your -->
+ <!-- classpath. you won't be able to use the -->
+ <!-- script element in process definition files -->
+ <!-- has to be defined below org/jbpm/graph/def/Action.hbm.xml -->
+ <!-- due to the inline collection-cache elements below -->
+ <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
+
+ <!-- graph.node mapping files -->
+ <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
+
+ <!-- context.def mapping files -->
+ <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
+
+ <!-- bytes mapping files -->
+ <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
+
+ <!-- module.def mapping files -->
+ <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
+
+ <!-- file.def mapping files -->
+ <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
+
+ <!-- taskmgmt.def mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
+
+ <!-- scheduler.def mapping files -->
+ <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
+ <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
+
+ <!-- graph.exe mapping files -->
+ <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
+
+ <!-- module.exe mapping files -->
+ <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
+
+ <!-- context.exe mapping files -->
+ <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
+
+ <!-- job mapping files -->
+ <mapping resource="org/jbpm/job/Job.hbm.xml"/>
+ <mapping resource="org/jbpm/job/Timer.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/>
+
+ <!-- taskmgmt.exe mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
+
+ <!-- logging mapping files -->
+ <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
+ <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
+ <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>
Added: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.mysql.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.mysql.xml (rev 0)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.mysql.xml 2008-09-03 07:21:42 UTC (rev 2073)
@@ -0,0 +1,140 @@
+
+ <!-- ###################### -->
+ <!-- # jbpm mapping files # -->
+ <!-- ###################### -->
+
+ <!-- hql queries and type defs -->
+ <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
+ <!-- hql queries used in simulation for querying historical data
+ uncomment if you want to use the GetSimulationInputCommand
+ or maybe you also want to use the queries yourself
+ be patient: the queries need the stddev function to be enabled in your dialect
+ more information on this can be found here: http://www.camunda.com/business_process_simulation_news/mysql_and_stddev.... -->
+ <!--
+ <mapping resource="org/jbpm/sim/bam/hibernate.queries.hbm.xml" />
+ -->
+
+ <!-- graph.action mapping files -->
+ <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
+
+ <!-- graph.def mapping files -->
+ <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
+ <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
+
+ <!-- ############################################ -->
+ <!-- # another mapping file with external dependencies # -->
+ <!-- ############################################ -->
+ <!-- following mapping file has a dependency on -->
+ <!-- 'bsh-{version}.jar'. -->
+ <!-- uncomment this if you don't have bsh on your -->
+ <!-- classpath. you won't be able to use the -->
+ <!-- script element in process definition files -->
+ <!-- has to be defined below org/jbpm/graph/def/Action.hbm.xml -->
+ <!-- due to the inline collection-cache elements below -->
+ <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
+
+ <!-- graph.node mapping files -->
+ <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
+
+ <!-- context.def mapping files -->
+ <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
+
+ <!-- bytes mapping files -->
+ <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
+
+ <!-- module.def mapping files -->
+ <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
+
+ <!-- file.def mapping files -->
+ <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
+
+ <!-- taskmgmt.def mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
+
+ <!-- scheduler.def mapping files -->
+ <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
+ <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
+
+ <!-- graph.exe mapping files -->
+ <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
+
+ <!-- module.exe mapping files -->
+ <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
+
+ <!-- context.exe mapping files -->
+ <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
+
+ <!-- job mapping files -->
+ <mapping resource="org/jbpm/job/Job.hbm.xml"/>
+ <mapping resource="org/jbpm/job/Timer.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/>
+ <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/>
+
+ <!-- taskmgmt.exe mapping files -->
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
+
+ <!-- logging mapping files -->
+ <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
+ <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
+ <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/>
+ <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>
Property changes on: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.mysql.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.xml 2008-09-03 01:50:36 UTC (rev 2072)
+++ jbpm3/trunk/modules/jpdl/core/src/main/resources/hibernate.mapping.xml 2008-09-03 07:21:42 UTC (rev 2073)
@@ -1,152 +0,0 @@
-
- <!-- ############################################ -->
- <!-- # mapping files with external dependencies # -->
- <!-- ############################################ -->
-
- <!-- Additional mappings defined per module go here -->
- <mapping resource="hibernate.extra.hbm.xml" />
-
- <!-- following mapping files have a dependency on the JCR API -->
- <!--
- <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/>
- -->
-
- <!-- ###################### -->
- <!-- # jbpm mapping files # -->
- <!-- ###################### -->
-
- <!-- hql queries and type defs -->
- <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
- <!-- hql queries used in simulation for querying historical data
- uncomment if you want to use the GetSimulationInputCommand
- or maybe you also want to use the queries yourself
- be patient: the queries need the stddev function to be enabled in your dialect
- more information on this can be found here: http://www.camunda.com/business_process_simulation_news/mysql_and_stddev.... -->
- <!--
- <mapping resource="org/jbpm/sim/bam/hibernate.queries.hbm.xml" />
- -->
-
- <!-- graph.action mapping files -->
- <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
-
- <!-- graph.def mapping files -->
- <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
- <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
-
- <!-- ############################################ -->
- <!-- # another mapping file with external dependencies # -->
- <!-- ############################################ -->
- <!-- following mapping file has a dependency on -->
- <!-- 'bsh-{version}.jar'. -->
- <!-- uncomment this if you don't have bsh on your -->
- <!-- classpath. you won't be able to use the -->
- <!-- script element in process definition files -->
- <!-- has to be defined below org/jbpm/graph/def/Action.hbm.xml -->
- <!-- due to the inline collection-cache elements below -->
- <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
-
- <!-- graph.node mapping files -->
- <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
- <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
-
- <!-- context.def mapping files -->
- <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
-
- <!-- bytes mapping files -->
- <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
-
- <!-- module.def mapping files -->
- <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
-
- <!-- file.def mapping files -->
- <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
-
- <!-- taskmgmt.def mapping files -->
- <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
-
- <!-- scheduler.def mapping files -->
- <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
- <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
-
- <!-- graph.exe mapping files -->
- <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
- <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
-
- <!-- module.exe mapping files -->
- <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
-
- <!-- context.exe mapping files -->
- <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
- <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
-
- <!-- job mapping files -->
- <mapping resource="org/jbpm/job/Job.hbm.xml"/>
- <mapping resource="org/jbpm/job/Timer.hbm.xml"/>
- <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/>
- <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/>
-
- <!-- taskmgmt.exe mapping files -->
- <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
-
- <!-- logging mapping files -->
- <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
- <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
- <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/>
- <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>
17 years, 7 months
- 1
- 0