Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

adjustements for jboss and bug fixes

  • Loading branch information...
commit 36e4e5cb91ee303fc8ec12f94e62e2851523b477 1 parent fe4909b
@mswiderski mswiderski authored
View
1  ...runtime-manager/src/main/java/org/jbpm/runtime/manager/impl/SimpleRuntimeEnvironment.java
@@ -115,6 +115,7 @@ protected Environment copyEnvironment() {
addIfPresent(EnvironmentName.PERSISTENCE_CONTEXT_MANAGER, copy);
addIfPresent(EnvironmentName.TRANSACTION_MANAGER, copy);
addIfPresent(EnvironmentName.TRANSACTION_SYNCHRONIZATION_REGISTRY, copy);
+ addIfPresent(EnvironmentName.TRANSACTION, copy);
return copy;
}
View
11 ...owledge-services/src/main/java/org/droolsjbpm/services/impl/DomainManagerServiceImpl.java
@@ -172,6 +172,17 @@ public void initDomain(long domainId) {
String reference = r.getReference();
// Create Runtime Manager Based on the Reference
SimpleRuntimeEnvironment environment = new DefaultRuntimeEnvironment(emf);
+ UserTransaction ut = null;
+ try {
+ ut = InitialContext.doLookup("java:comp/UserTransaction");
+ } catch (Exception ex) {
+ try {
+ ut = InitialContext.doLookup(System.getProperty("jbpm.ut.jndi.lookup", "java:jboss/UserTransaction"));
+ environment.addToEnvironment(EnvironmentName.TRANSACTION, ut);
+ } catch (Exception e1) {
+ throw new RuntimeException("Cannot find UserTransaction", e1);
+ }
+ }
AbstractAuditLogger auditLogger = AuditLoggerFactory.newJPAInstance(emf);
ServicesAwareAuditEventBuilder auditEventBuilder = new ServicesAwareAuditEventBuilder();
auditEventBuilder.setIdentityProvider(identityProvider);
View
3  jbpm-services/droolsjbpm-knowledge-services/src/main/resources/META-INF/Servicesorm.xml
@@ -338,7 +338,8 @@
log.nodeInstanceId in ( select nil.nodeInstanceId from NodeInstanceLog nil where nil.processInstanceId=:processId AND nil.domainId=:domainId
GROUP BY nil.nodeInstanceId
HAVING count(nil.nodeInstanceId) = 1)
- and log.type = 0
+ and log.type = 0
+ and log.processInstanceId=:processId
order by
log.id ASC
</query>
Please sign in to comment.
Something went wrong with that request. Please try again.