JBoss JBPM SVN: r6544 - in jbpm3/branches/jbpm-3.2-soa: hudson/hudson-home and 1 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-08-05 17:24:11 -0400 (Thu, 05 Aug 2010)
New Revision: 6544
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml
jbpm3/branches/jbpm-3.2-soa/pom.xml
Log:
JBPM-2916 bump hibernate-jbc-cache version to 1.0.2, featuring jdk 1.4 compatibility;
revert jms message service configuration change, does not solve lookup failures
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-08-05 00:09:11 UTC (rev 6543)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2010-08-05 21:24:11 UTC (rev 6544)
@@ -139,6 +139,7 @@
#
# Start JBoss AS
#
+export JAVA_HOME=$ORIG_JAVA_HOME
$JBOSS_HOME/bin/run.sh -b $JBOSS_BINDADDR -c $JBOSS_SERVER &> /dev/null &
# Was it successfully started?
@@ -152,7 +153,6 @@
#
# Execute tests
#
-export JAVA_HOME=$ORIG_JAVA_HOME
mvn --fail-at-end -Djboss.bind.address=$JBOSS_BINDADDR -Dsurefire.jvm.args="-Xms64m -Xmx256m" \
test | tee $WORKSPACE/tests.log
grep -E 'FIXME\|FAILED' $WORKSPACE/tests.log | sort -u | tee $WORKSPACE/fixme.txt
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml 2010-08-05 00:09:11 UTC (rev 6543)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml 2010-08-05 21:24:11 UTC (rev 6544)
@@ -2,15 +2,7 @@
<jbpm-context>
<service name="persistence" factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" />
- <service name="message">
- <factory>
- <bean class="org.jbpm.msg.jms.JmsMessageServiceFactory">
- <field name="destinationJndiName">
- <string value="queue/JbpmJobQueue" />
- </field>
- </bean>
- </factory>
- </service>
+ <service name="message" factory="org.jbpm.msg.jms.JmsMessageServiceFactory" />
<service name="scheduler" factory="org.jbpm.scheduler.ejbtimer.EntitySchedulerServiceFactory" />
<service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
<service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-08-05 00:09:11 UTC (rev 6543)
+++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2010-08-05 21:24:11 UTC (rev 6544)
@@ -214,7 +214,7 @@
<dependency>
<groupId>org.jboss.cluster</groupId>
<artifactId>hibernate-jbc-cacheprovider</artifactId>
- <version>1.0.1.GA</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
13 years, 11 months
JBoss JBPM SVN: r6543 - in jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main: resources/META-INF and 1 other directory.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2010-08-04 20:09:11 -0400 (Wed, 04 Aug 2010)
New Revision: 6543
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/resources/META-INF/jboss.xml
Log:
JBPM-2916 specify global destination jndi name in message service factory configuration, to address intermittent lookup failures in hudson
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml 2010-08-03 22:30:33 UTC (rev 6542)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/etc/jbpm.cfg.xml 2010-08-05 00:09:11 UTC (rev 6543)
@@ -2,7 +2,15 @@
<jbpm-context>
<service name="persistence" factory="org.jbpm.persistence.jta.JtaDbPersistenceServiceFactory" />
- <service name="message" factory="org.jbpm.msg.jms.JmsMessageServiceFactory" />
+ <service name="message">
+ <factory>
+ <bean class="org.jbpm.msg.jms.JmsMessageServiceFactory">
+ <field name="destinationJndiName">
+ <string value="queue/JbpmJobQueue" />
+ </field>
+ </bean>
+ </factory>
+ </service>
<service name="scheduler" factory="org.jbpm.scheduler.ejbtimer.EntitySchedulerServiceFactory" />
<service name="tx" factory="org.jbpm.tx.TxServiceFactory" />
<service name="logging" factory="org.jbpm.logging.db.DbLoggingServiceFactory" />
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/resources/META-INF/jboss.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/resources/META-INF/jboss.xml 2010-08-03 22:30:33 UTC (rev 6542)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/main/resources/META-INF/jboss.xml 2010-08-05 00:09:11 UTC (rev 6543)
@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE jboss PUBLIC
- "-//JBoss//DTD JBOSS 4.0//EN"
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN"
"http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
-
<enterprise-beans>
-
<session>
<ejb-name>CommandServiceBean</ejb-name>
<jndi-name>ejb/CommandServiceBean</jndi-name>
@@ -50,20 +47,17 @@
<jndi-name>jbpm/TimerEntityBean</jndi-name>
<local-jndi-name>java:jbpm/TimerEntityBean</local-jndi-name>
</entity>
-
</enterprise-beans>
<assembly-descriptor>
-
<message-destination>
<message-destination-name>JobQueue</message-destination-name>
<jndi-name>queue/JbpmJobQueue</jndi-name>
</message-destination>
+
<message-destination>
<message-destination-name>CommandQueue</message-destination-name>
<jndi-name>queue/JbpmCommandQueue</jndi-name>
</message-destination>
-
</assembly-descriptor>
-
</jboss>
13 years, 11 months
JBoss JBPM SVN: r6541 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/command.
by do-not-reply＠jboss.org
Author: camunda
Date: 2010-08-03 08:17:38 -0400 (Tue, 03 Aug 2010)
New Revision: 6541
Modified:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTokenCommand.java
Log:
added pre-fetching of process instance data for GetTokenCommand (otherwise it is pretty unintuitive)
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTokenCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTokenCommand.java 2010-07-31 03:23:32 UTC (rev 6540)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTokenCommand.java 2010-08-03 12:17:38 UTC (rev 6541)
@@ -24,6 +24,8 @@
setJbpmContext(jbpmContext);
Token token = jbpmContext.getToken(tokenId);
retrieveToken(token);
+ // include PI data and maybe process variables as well
+ retrieveProcessInstance(token.getProcessInstance());
return token;
}
13 years, 11 months