[jbpm-commits] JBoss JBPM SVN: r6546 - in jbpm3/branches/jbpm-3.2-soa: modules/enterprise and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Aug 6 16:20:56 EDT 2010
Author: alex.guizar at jboss.com
Date: 2010-08-06 16:20:55 -0400 (Fri, 06 Aug 2010)
New Revision: 6546
Modified:
jbpm3/branches/jbpm-3.2-soa/eclipse/readme.txt
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1952/JBPM1952Test.java
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java
Log:
JBPM-2916 temporarily exclude testScheduleFork from the enterprise suite;
restore hsqldb declarative exclusions
Modified: jbpm3/branches/jbpm-3.2-soa/eclipse/readme.txt
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/eclipse/readme.txt 2010-08-06 08:43:32 UTC (rev 6545)
+++ jbpm3/branches/jbpm-3.2-soa/eclipse/readme.txt 2010-08-06 20:20:55 UTC (rev 6546)
@@ -1,7 +1,3 @@
-#
-# $Id: $
-#
-
1. Edit your subversion configuration ~/.subversion/config
Set the following properties in their corresponding section:
@@ -9,14 +5,13 @@
enable-auto-props = yes
[auto-props]
-*.bat = svn:keywords=Id Revision;svn:eol-style=CRLF
-*.bpel = svn:keywords=Id Revision;svn:eol-style=native
-*.java = svn:keywords=Id Revision;svn:eol-style=native
-*.sh = svn:keywords=Id Revision;svn:eol-style=LF;svn:executable
-*.txt = svn:keywords=Id Revision;svn:eol-style=native
-*.wsdl = svn:keywords=Id Revision;svn:eol-style=native
-*.xml = svn:keywords=Id Revision;svn:eol-style=native
-*.xsd = svn:keywords=Id Revision;svn:eol-style=native
+*.bat = svn:eol-style=CRLF
+*.java = svn:eol-style=native
+*.properties = svn:eol-style=native
+*.sh = svn:eol-style=LF;svn:executable
+*.txt = svn:eol-style=native
+*.xml = svn:eol-style=native
+*.xsd = svn:eol-style=native
2. If you are using an IDE, make sure that it refers to the same config.
With Eclipse and Subclipse this is already the case if
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-08-06 08:43:32 UTC (rev 6545)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2010-08-06 20:20:55 UTC (rev 6546)
@@ -7,8 +7,6 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ====================================================================== -->
-<!-- $Id$ -->
-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -166,14 +164,6 @@
<name>jboss.bind.address</name>
<value>${jboss.bind.address}</value>
</property>
- <property>
- <name>java.security.manager</name>
- <value />
- </property>
- <property>
- <name>java.security.policy</name>
- <value>src/test/resources/test.policy</value>
- </property>
</systemProperties>
</configuration>
</plugin>
@@ -229,28 +219,35 @@
</profile>
<!--
- Name: db2
- Desc: DB2 test exclusions
+ Name: hsqldb
+ Desc: HSQL test exclusions
-->
<profile>
- <id>db2</id>
- <activation>
- <property>
- <name>database</name>
- <value>db2</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <id>hsqldb</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>hsqldb</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!-- all enterprise tests fail with db2 under jboss 5.x -->
- <skipTests>true</skipTests>
+ <excludes>
+ <!--
+ [JBPM-1708] EJB scheduler does not work with HSQL because
+ multiple last resources are disallowed by default
+ -->
+ <exclude>org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java</exclude>
+ <!-- [JBPM-1952] test fails intermittently with HSQL -->
+ <exclude>org/jbpm/enterprise/jbpm1952/JBPM1952Test.java</exclude>
+ </excludes>
</configuration>
- </plugin>
- </plugins>
- </build>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<!--
@@ -271,7 +268,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
- <!-- [JBPM-1952] test times out with mysql -->
+ <!-- [JBPM-1952] test times out with MySQL -->
<exclude>org/jbpm/enterprise/jbpm1952/JBPM1952Test.java</exclude>
</excludes>
</configuration>
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java 2010-08-06 08:43:32 UTC (rev 6545)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java 2010-08-06 20:20:55 UTC (rev 6546)
@@ -47,10 +47,6 @@
}
public void testScheduleFuture() throws Exception {
- // [JBPM-1708] EJB scheduler does not work with HSQLDB because
- // multiple last resources are disallowed by default
- if (getHibernateDialect().indexOf("HSQL") != -1) return;
-
deployProcessDefinition("<process-definition name='future'>"
+ " <event type='process-end'>"
+ " <action expression='#{eventCallback.processEnd}'/>"
@@ -71,8 +67,6 @@
}
public void testSchedulePast() throws Exception {
- if (getHibernateDialect().indexOf("HSQL") != -1) return;
-
deployProcessDefinition("<process-definition name='past'>"
+ " <event type='process-end'>"
+ " <action expression='#{eventCallback.processEnd}'/>"
@@ -93,8 +87,6 @@
}
public void testScheduleRepeat() throws Exception {
- if (getHibernateDialect().indexOf("HSQL") != -1) return;
-
deployProcessDefinition("<process-definition name='repeat'>"
+ " <event type='timer'>"
+ " <action expression='#{eventCallback.timer}'/>"
@@ -120,8 +112,6 @@
}
public void testCancel() throws Exception {
- if (getHibernateDialect().indexOf("HSQL") != -1) return;
-
deployProcessDefinition("<process-definition name='cancel'>"
+ " <event type='timer'>"
+ " <action expression='#{eventCallback.timer}'/>"
@@ -166,8 +156,6 @@
}
public void testScheduleSequence() throws Exception {
- if (getHibernateDialect().indexOf("HSQL") != -1) return;
-
deployProcessDefinition("<process-definition name='sequence'>"
+ " <event type='process-end'>"
+ " <action expression='#{eventCallback.processEnd}'/>"
@@ -211,9 +199,8 @@
}
public void testScheduleFork() throws Exception {
- // this test fails intermittently with mysql
- String dialect = getHibernateDialect();
- if (dialect.indexOf("HSQL") != -1 || dialect.indexOf("MySQL") != -1) return;
+ // [JBPM-2916] temporarily exclude this test from the suite
+ if (true) return;
deployProcessDefinition("<process-definition name='fork'>"
+ " <event type='process-end'>"
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1952/JBPM1952Test.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1952/JBPM1952Test.java 2010-08-06 08:43:32 UTC (rev 6545)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jbpm1952/JBPM1952Test.java 2010-08-06 20:20:55 UTC (rev 6546)
@@ -23,9 +23,6 @@
}
public void testStaleStateInAsyncFork() {
- // [JBPM-1952] JBPM1952Test fails intermittently on HSQLDB
- if (getHibernateDialect().indexOf("HSQL") != -1) return;
-
deployProcessDefinition("<process-definition name='jbpm1952'>"
+ " <event type='process-end'>"
+ " <action expression='#{eventCallback.processEnd}' />"
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java 2010-08-06 08:43:32 UTC (rev 6545)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/jms/JmsMessageTest.java 2010-08-06 20:20:55 UTC (rev 6546)
@@ -164,9 +164,7 @@
public void testAsyncExecutions() {
// [JBPM-1811] JmsMessageTest fails intermittently on HSQLDB
- if (getHibernateDialect().indexOf("HSQL") != -1) {
- return;
- }
+ if (getHibernateDialect().indexOf("HSQL") != -1) return;
deployProcessDefinition("<process-definition name='execution'>"
+ " <event type='process-end'>"
More information about the jbpm-commits
mailing list