Attachment 935375 Details for Bug 1121764 – diff.txt

diff.txt

diff.txt (text/plain), 27.48 KB, created by Ivo Bek on 2014-09-08 14:50:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivo Bek

Created: 2014-09-08 14:50:50 UTC

Size: 27.48 KB

patch

obsolete

>diff --git a/pom.xml b/pom.xml
>index 5146d97..7411947 100644
>--- a/pom.xml
>+++ b/pom.xml
>@@ -56,6 +56,10 @@
>             <enabled>false</enabled>
>           </snapshots>
>         </repository>
>+        <repository>
>+          <id>productization-repository-jenkins-builds</id>
>+          <url>http://repository.engineering.redhat.com/nexus/content/groups/hudson-jb-ip-6.1-build</url>
>+        </repository>
> 	</repositories>
> 	<pluginRepositories>
> 		<pluginRepository>
>diff --git a/sample-spring-app/pom.xml b/sample-spring-app/pom.xml
>index 9a2e64f..71acaf0 100644
>--- a/sample-spring-app/pom.xml
>+++ b/sample-spring-app/pom.xml
>@@ -1,226 +1,235 @@
>-<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/xsd/maven-4.0.0.xsd">
>-	<modelVersion>4.0.0</modelVersion>
>-	<parent>
>-		<groupId>com.redhat.solutions.bpms</groupId>
>-		<artifactId>jboss-bpms-solutions</artifactId>
>-		<version>0.0.1-SNAPSHOT</version>
>-	</parent>
>-	<artifactId>sample-spring-app</artifactId>
>-	<name>sample-spring-app</name>
>-	<packaging>war</packaging>
>+<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/xsd/maven-4.0.0.xsd">
>+  <modelVersion>4.0.0</modelVersion>
>+  <parent>
>+    <groupId>com.redhat.solutions.bpms</groupId>
>+    <artifactId>jboss-bpms-solutions</artifactId>
>+    <version>0.0.1-SNAPSHOT</version>
>+  </parent>
>+  <artifactId>sample-spring-app</artifactId>
>+  <name>sample-spring-app</name>
>+  <packaging>war</packaging>
> 
>-	<properties>
>-		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
>-		<build.timestamp>${maven.build.timestamp}</build.timestamp>
>+  <properties>
>+    <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
>+    <build.timestamp>${maven.build.timestamp}</build.timestamp>
> 
>-		<version.jboss.bpms.mvn>6.0.3-redhat-4</version.jboss.bpms.mvn>
>-		<version.spring>4.0.5.RELEASE</version.spring>
>-		<version.standard.taglibs>1.1.2</version.standard.taglibs>
>-		<version.jackson>1.9.3</version.jackson>
>+    <version.jboss.bpms.mvn>6.2.0.Beta1-redhat-1</version.jboss.bpms.mvn>
>+    <version.spring>4.0.5.RELEASE</version.spring>
>+    <version.standard.taglibs>1.1.2</version.standard.taglibs>
>+    <version.jackson>1.9.3</version.jackson>
> 
>-		<version.compiler.plugin>2.3.1</version.compiler.plugin>
>-		<version.war.plugin>2.1.1</version.war.plugin>
>-	</properties>
>+    <version.compiler.plugin>2.3.1</version.compiler.plugin>
>+    <version.war.plugin>2.1.1</version.war.plugin>
>+  </properties>
> 
>-	<dependencies>
>+  <dependencies>
> 
>-		
>-		<dependency>
>-			<groupId>org.kie</groupId>
>-			<artifactId>kie-api</artifactId>
>-			<version>${version.jboss.bpms.mvn}</version>
>-		</dependency>
>-		<dependency>
>-			<groupId>org.kie</groupId>
>-			<artifactId>kie-spring</artifactId>
>-			<version>${version.jboss.bpms.mvn}</version>
>-		</dependency>
>-		<dependency>
>-			<groupId>org.jbpm</groupId>
>-			<artifactId>jbpm-persistence-jpa</artifactId>
>-			<version>${version.jboss.bpms.mvn}</version>
>-		</dependency>
>-		<dependency>
>-			<groupId>org.jbpm</groupId>
>-			<artifactId>jbpm-human-task-audit</artifactId>
>-			<version>${version.jboss.bpms.mvn}</version>
>-		</dependency>
>-		<dependency>
>-			<groupId>org.jbpm</groupId>
>-			<artifactId>jbpm-runtime-manager</artifactId>
>-			<version>${version.jboss.bpms.mvn}</version>
>-		</dependency>
>+    
>+    <dependency>
>+      <groupId>org.kie</groupId>
>+      <artifactId>kie-api</artifactId>
>+      <version>${version.jboss.bpms.mvn}</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.kie</groupId>
>+      <artifactId>kie-spring</artifactId>
>+      <version>${version.jboss.bpms.mvn}</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.jbpm</groupId>
>+      <artifactId>jbpm-persistence-jpa</artifactId>
>+      <version>${version.jboss.bpms.mvn}</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.jbpm</groupId>
>+      <artifactId>jbpm-human-task-audit</artifactId>
>+      <version>${version.jboss.bpms.mvn}</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.jbpm</groupId>
>+      <artifactId>jbpm-runtime-manager</artifactId>
>+      <version>${version.jboss.bpms.mvn}</version>
>+    </dependency>
> 
> 
>-		
>-		<dependency>
>-			<groupId>taglibs</groupId>
>-			<artifactId>standard</artifactId>
>-			<version>${version.standard.taglibs}</version>
>-		</dependency>
>-		<dependency>
>-			<groupId>org.springframework</groupId>
>-			<artifactId>spring-webmvc</artifactId>
>-			<version>${version.spring}</version>
>-		</dependency>
>-		<dependency>
>-			<groupId>javax.servlet</groupId>
>-			<artifactId>javax.servlet-api</artifactId>
>-			<version>3.0.1</version>
>-			<scope>provided</scope>
>-		</dependency>
>-		<dependency>
>-			<groupId>org.codehaus.jackson</groupId>
>-			<artifactId>jackson-mapper-asl</artifactId>
>-			<version>${version.jackson}</version>
>-		</dependency>
>-		<dependency>
>-			<groupId>org.codehaus.jackson</groupId>
>-			<artifactId>jackson-core-asl</artifactId>
>-			<version>${version.jackson}</version>
>-		</dependency>
>+    
>+    <dependency>
>+      <groupId>taglibs</groupId>
>+      <artifactId>standard</artifactId>
>+      <version>${version.standard.taglibs}</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.springframework</groupId>
>+      <artifactId>spring-webmvc</artifactId>
>+      <version>${version.spring}</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>javax.servlet</groupId>
>+      <artifactId>javax.servlet-api</artifactId>
>+      <version>3.0.1</version>
>+      <scope>provided</scope>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.codehaus.jackson</groupId>
>+      <artifactId>jackson-mapper-asl</artifactId>
>+      <version>${version.jackson}</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.codehaus.jackson</groupId>
>+      <artifactId>jackson-core-asl</artifactId>
>+      <version>${version.jackson}</version>
>+    </dependency>
> 
>-		
>-		<dependency>
>-			<groupId>org.springframework</groupId>
>-			<artifactId>spring-core</artifactId>
>-			<version>${version.spring}</version>
>-		</dependency>
>-		<dependency>
>-			<groupId>org.springframework</groupId>
>-			<artifactId>spring-beans</artifactId>
>-			<version>${version.spring}</version>
>-		</dependency>
>-		<dependency>
>-			<groupId>org.springframework</groupId>
>-			<artifactId>spring-orm</artifactId>
>-			<version>${version.spring}</version>
>-		</dependency>
>-		<dependency>
>-			<groupId>org.springframework</groupId>
>-			<artifactId>spring-jdbc</artifactId>
>-			<version>${version.spring}</version>
>-		</dependency>
>-		<dependency>
>-			<groupId>org.springframework</groupId>
>-			<artifactId>spring-context</artifactId>
>-			<version>${version.spring}</version>
>-		</dependency>
>+    
>+    <dependency>
>+      <groupId>org.springframework</groupId>
>+      <artifactId>spring-core</artifactId>
>+      <version>${version.spring}</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.springframework</groupId>
>+      <artifactId>spring-beans</artifactId>
>+      <version>${version.spring}</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.springframework</groupId>
>+      <artifactId>spring-orm</artifactId>
>+      <version>${version.spring}</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.springframework</groupId>
>+      <artifactId>spring-jdbc</artifactId>
>+      <version>${version.spring}</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.springframework</groupId>
>+      <artifactId>spring-context</artifactId>
>+      <version>${version.spring}</version>
>+    </dependency>
> 
>-		<dependency>
>-			<groupId>org.hibernate</groupId>
>-			<artifactId>hibernate-entitymanager</artifactId>
>-			<version>4.2.7.SP5-redhat-1</version>
>-		</dependency>
>+    <dependency>
>+      <groupId>org.hibernate</groupId>
>+      <artifactId>hibernate-entitymanager</artifactId>
>+      <version>4.2.7.SP5-redhat-1</version>
>+    </dependency>
> 
>-		
>-		<dependency>
>-			<groupId>com.oracle</groupId>
>-			<artifactId>ojdbc</artifactId>
>-			<version>6</version>
>-		</dependency>
>-		<dependency>
>-			<groupId>postgresql</groupId>
>-			<artifactId>postgresql</artifactId>
>-			<version>8.4-702.jdbc4</version>
>-			<optional>true</optional>
>-			<scope>test</scope>
>-		</dependency>
>+    <dependency>
>+      <groupId>org.apache.commons</groupId>
>+      <artifactId>commons-io</artifactId>
>+      <version>1.3.2</version>
>+    </dependency>
> 
>-		
>-		<dependency>
>-			<groupId>org.slf4j</groupId>
>-			<artifactId>slf4j-api</artifactId>
>-			<version>1.6.6</version>
>-		</dependency>
>-		<dependency>
>-			<groupId>org.slf4j</groupId>
>-			<artifactId>slf4j-log4j12</artifactId>
>-			<version>1.6.6</version>
>-		</dependency>
>+    
>+    <dependency>
>+      <groupId>com.oracle</groupId>
>+      <artifactId>ojdbc</artifactId>
>+      <version>6</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>postgresql</groupId>
>+      <artifactId>postgresql</artifactId>
>+      <version>8.4-702.jdbc4</version>
>+      <optional>true</optional>
>+      <scope>test</scope>
>+    </dependency>
> 
>-		
>-		<dependency>
>-			<groupId>org.springframework</groupId>
>-			<artifactId>spring-test</artifactId>
>-			<version>${version.spring}</version>
>-			<scope>test</scope>
>-		</dependency>
>-		<dependency>
>-			<groupId>junit</groupId>
>-			<artifactId>junit</artifactId>
>-			<version>4.11</version>
>-			<scope>test</scope>
>-		</dependency>
>-		<dependency>
>-			<groupId>org.codehaus.btm</groupId>
>-			<artifactId>btm</artifactId>
>-			<version>2.1.4</version>
>-			<scope>test</scope>
>-		</dependency>
>-	</dependencies>
>+    
>+    <dependency>
>+      <groupId>org.slf4j</groupId>
>+      <artifactId>slf4j-api</artifactId>
>+      <version>1.6.6</version>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.slf4j</groupId>
>+      <artifactId>slf4j-log4j12</artifactId>
>+      <version>1.6.6</version>
>+    </dependency>
> 
>-	<build>
>-		<finalName>${project.artifactId}</finalName>
>-		<resources>
>-			<resource>
>-				<directory>src/main/resources</directory>
>-				<filtering>true</filtering>
>-				<includes>
>-					<include>**/*.properties</include>
>-				</includes>
>-			</resource>
>-			<resource>
>-				<directory>src/main/resources</directory>
>-				<filtering>false</filtering>
>-				<excludes>
>-					<exclude>**/*.properties</exclude>
>-				</excludes>
>-			</resource>
>-		</resources>
>-		<plugins>
>-			<plugin>
>-				<artifactId>maven-war-plugin</artifactId>
>-				<version>2.1.1</version>
>-				<configuration>
>-					<failOnMissingWebXml>false</failOnMissingWebXml>
>-					<archive>
>-						<manifestEntries>
>-							<app-version>${project.version}</app-version>
>-							<build-date>${build.timestamp}</build-date>
>-						</manifestEntries>
>-					</archive>
>-				</configuration>
>-			</plugin>
>-			
>-			<plugin>
>-				<artifactId>maven-failsafe-plugin</artifactId>
>-				<version>2.6</version>
>-				<executions>
>-					<execution>
>-						<goals>
>-							<goal>integration-test</goal>
>-							<goal>verify</goal>
>-						</goals>
>-					</execution>
>-				</executions>
>-			</plugin>
>-			
>-			
>-			
>-			
>-			<plugin>
>-				<groupId>org.jboss.as.plugins</groupId>
>-				<artifactId>jboss-as-maven-plugin</artifactId>
>-				<version>7.3.Final</version>
>-			</plugin>
>-			
>-			<plugin>
>-				<groupId>org.apache.camel</groupId>
>-				<artifactId>camel-maven-plugin</artifactId>
>-				<version>2.8.0</version>
>-			</plugin>
>-		</plugins>
>-	</build>
>+    
>+    <dependency>
>+      <groupId>org.springframework</groupId>
>+      <artifactId>spring-test</artifactId>
>+      <version>${version.spring}</version>
>+      <scope>test</scope>
>+    </dependency>
>+    <dependency>
>+      <groupId>junit</groupId>
>+      <artifactId>junit</artifactId>
>+      <version>4.11</version>
>+      <scope>test</scope>
>+    </dependency>
>+    <dependency>
>+      <groupId>org.codehaus.btm</groupId>
>+      <artifactId>btm</artifactId>
>+      <version>2.1.4</version>
>+      <scope>test</scope>
>+    </dependency>
>+  </dependencies>
> 
>-</project>
>\ No newline at end of file
>+  <build>
>+    <finalName>${project.artifactId}</finalName>
>+    <resources>
>+      <resource>
>+        <directory>src/main/resources</directory>
>+        <filtering>true</filtering>
>+        <includes>
>+          <include>**/*.properties</include>
>+        </includes>
>+      </resource>
>+      <resource>
>+        <directory>src/main/resources</directory>
>+        <filtering>false</filtering>
>+        <excludes>
>+          <exclude>**/*.properties</exclude>
>+        </excludes>
>+      </resource>
>+    </resources>
>+    <plugins>
>+      <plugin>
>+        <artifactId>maven-war-plugin</artifactId>
>+        <version>2.1.1</version>
>+        <configuration>
>+          <failOnMissingWebXml>false</failOnMissingWebXml>
>+          <archive>
>+            <manifestEntries>
>+              <app-version>${project.version}</app-version>
>+              <build-date>${build.timestamp}</build-date>
>+            </manifestEntries>
>+          </archive>
>+        </configuration>
>+      </plugin>
>+      
>+      <plugin>
>+        <artifactId>maven-failsafe-plugin</artifactId>
>+        <version>2.6</version>
>+        <executions>
>+          <execution>
>+            <goals>
>+              <goal>integration-test</goal>
>+              <goal>verify</goal>
>+            </goals>
>+          </execution>
>+        </executions>
>+      </plugin>
>+      
>+      
>+      
>+      
>+      <plugin>
>+        <groupId>org.jboss.as.plugins</groupId>
>+        <artifactId>jboss-as-maven-plugin</artifactId>
>+        <version>7.3.Final</version>
>+      </plugin>
>+      
>+      <plugin>
>+        <groupId>org.apache.camel</groupId>
>+        <artifactId>camel-maven-plugin</artifactId>
>+        <version>2.8.0</version>
>+      </plugin>
>+    </plugins>
>+  </build>
>+
>+</project>
>diff --git a/sample-spring-app/src/main/java/com/redhat/solutions/bpms/ProcessServiceImpl.java b/sample-spring-app/src/main/java/com/redhat/solutions/bpms/ProcessServiceImpl.java
>index baf5616..4dd958d 100644
>--- a/sample-spring-app/src/main/java/com/redhat/solutions/bpms/ProcessServiceImpl.java
>+++ b/sample-spring-app/src/main/java/com/redhat/solutions/bpms/ProcessServiceImpl.java
>@@ -4,12 +4,12 @@ import java.util.ArrayList;
> import java.util.Collection;
> import java.util.List;
> 
>-import org.jbpm.process.audit.AuditLogService;
>-import org.jbpm.process.audit.ProcessInstanceLog;
> import org.kie.api.definition.process.Process;
> import org.kie.api.runtime.KieSession;
> import org.kie.api.runtime.manager.RuntimeEngine;
> import org.kie.api.runtime.manager.RuntimeManager;
>+import org.kie.api.runtime.manager.audit.AuditService;
>+import org.kie.api.runtime.manager.audit.ProcessInstanceLog;
> import org.kie.api.runtime.process.ProcessInstance;
> import org.kie.api.task.TaskService;
> import org.slf4j.Logger;
>@@ -28,7 +28,7 @@ public class ProcessServiceImpl implements ProcessService {
>     private RuntimeManager runtimeManager;
> 
> 	@Autowired
>-	private AuditLogService auditLogService;
>+	private AuditService auditLogService;
> 	
> 	@Autowired
> 	private TaskService taskService;
>@@ -44,7 +44,7 @@ public class ProcessServiceImpl implements ProcessService {
>     
>     public List<ProcessInstanceInfo> findAllProcessInstances()
>     {
>-    	List<ProcessInstanceLog> instances = auditLogService.findProcessInstances();
>+        List<ProcessInstanceLog> instances = (List<ProcessInstanceLog>) auditLogService.findProcessInstances();
>     	
>     	return convertInstances(instances);
>     }
>diff --git a/sample-spring-app/src/main/java/org/kie/spring/factorybeans/FixedRuntimeManagerFactoryBean.java b/sample-spring-app/src/main/java/org/kie/spring/factorybeans/FixedRuntimeManagerFactoryBean.java
>deleted file mode 100644
>index 3046311..0000000
>--- a/sample-spring-app/src/main/java/org/kie/spring/factorybeans/FixedRuntimeManagerFactoryBean.java
>+++ /dev/null
>@@ -1,30 +0,0 @@
>-package org.kie.spring.factorybeans;
>-
>-import org.kie.internal.runtime.manager.RuntimeManagerRegistry;
>-import org.kie.spring.factorybeans.RuntimeManagerFactoryBean;
>-
>-/**
>- * Workaround for BZ1121764
>- * 	Spring/JBPM: IllegalStateException: RuntimeManager with id spring-rmr is already active	
>- * 	https://bugzilla.redhat.com/show_bug.cgi?id=1121764 
>- * 		
>- */
>-public class FixedRuntimeManagerFactoryBean extends RuntimeManagerFactoryBean {
>-
>-    @Override
>-    public Object getObject() throws Exception {
>-    	if(RuntimeManagerRegistry.get().isRegistered(getIdentifier())) {
>-    		// get the runtime manager from the registry
>-    		return RuntimeManagerRegistry.get().getManager(getIdentifier());
>-    	}
>-    	else {
>-    		// Create the runtime manager
>-    		return super.getObject();
>-    	} 
>-    }	
>-	
>-    @Override
>-    public boolean isSingleton() {
>-        return true;
>-    } 
>-}
>\ No newline at end of file
>diff --git a/sample-spring-app/src/main/resources/META-INF/extpersistence.xml b/sample-spring-app/src/main/resources/META-INF/extpersistence.xml
>index 3c4ae2d..74789e6 100644
>--- a/sample-spring-app/src/main/resources/META-INF/extpersistence.xml
>+++ b/sample-spring-app/src/main/resources/META-INF/extpersistence.xml
>@@ -60,8 +60,9 @@
>     <class>org.jbpm.services.task.impl.model.UserImpl</class>
> 
>     
>-    <class>org.jbpm.services.task.impl.model.BAMTaskSummaryImpl</class>
>-    <class>org.jbpm.services.task.audit.TaskEventImpl</class>
>+    <class>org.jbpm.services.task.audit.impl.model.BAMTaskSummaryImpl</class>
>+    <class>org.jbpm.services.task.audit.impl.model.TaskEventImpl</class>
>+    <class>org.jbpm.services.task.audit.impl.model.AuditTaskImpl</class>
> 
>     <properties>
>       <property name="hibernate.max_fetch_depth" value="3"/>
>diff --git a/sample-spring-app/src/main/resources/jbpm-context.xml b/sample-spring-app/src/main/resources/jbpm-context.xml
>index 4ee7f3a..9de2cd8 100644
>--- a/sample-spring-app/src/main/resources/jbpm-context.xml
>+++ b/sample-spring-app/src/main/resources/jbpm-context.xml
>@@ -32,7 +32,7 @@
> 		<property name="taskService" ref="taskService" />
> 	</bean>
> 
>-	<bean id="runtimeManagerFactory" class="org.kie.spring.factorybeans.FixedRuntimeManagerFactoryBean" destroy-method="close">
>+	<bean id="runtimeManagerFactory" class="org.kie.spring.factorybeans.RuntimeManagerFactoryBean" destroy-method="close">
> 		
> 		<property name="type" value="PER_PROCESS" />
> 		
>@@ -58,7 +58,9 @@
> 		<property name="userInfo" ref="bpmUserGroupService" />
> 		<property name="listeners">
> 			<list>
>-				<bean class="org.jbpm.services.task.audit.JPATaskLifeCycleEventListener" />
>+				<bean class="org.jbpm.services.task.audit.JPATaskLifeCycleEventListener">
>+                  <constructor-arg value="true"/>
>+                </bean>
> 			</list>
> 		</property>
> 	</bean>
>@@ -68,4 +70,4 @@
> 	
> 	
> 	
>-</beans>
>\ No newline at end of file
>+</beans>
>diff --git a/sample-spring-app/src/test/java/com/redhat/solutions/bpms/approval/ApprovalServiceIT.java b/sample-spring-app/src/test/java/com/redhat/solutions/bpms/approval/ApprovalServiceIT.java
>deleted file mode 100644
>index 5f419a4..0000000
>--- a/sample-spring-app/src/test/java/com/redhat/solutions/bpms/approval/ApprovalServiceIT.java
>+++ /dev/null
>@@ -1,164 +0,0 @@
>-package com.redhat.solutions.bpms.approval;
>-
>-import java.io.IOException;
>-import java.util.List;
>-
>-import org.apache.commons.io.IOUtils;
>-import org.jbpm.bpmn2.xml.XmlBPMNProcessDumper;
>-import org.jbpm.ruleflow.core.RuleFlowProcess;
>-import org.jbpm.ruleflow.core.RuleFlowProcessFactory;
>-import org.junit.Before;
>-import org.junit.Test;
>-import org.junit.runner.RunWith;
>-import org.kie.api.io.Resource;
>-import org.kie.internal.io.ResourceFactory;
>-import org.slf4j.Logger;
>-import org.slf4j.LoggerFactory;
>-import org.springframework.beans.factory.annotation.Autowired;
>-import org.springframework.test.context.ContextConfiguration;
>-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
>-import org.springframework.test.context.transaction.TransactionConfiguration;
>-import org.springframework.transaction.annotation.Transactional;
>-
>-import com.redhat.solutions.bpms.usermgmt.TaskGroup;
>-import com.redhat.solutions.bpms.usermgmt.TaskUser;
>-import com.redhat.solutions.bpms.usermgmt.UserManagementService;
>-
>-@RunWith(SpringJUnit4ClassRunner.class)
>-@ContextConfiguration(locations = "classpath:testContext1.xml")
>-@TransactionConfiguration(transactionManager="transactionManager", defaultRollback=true)
>-@Transactional
>-public class ApprovalServiceIT {
>-
>-	private final Logger logger = LoggerFactory.getLogger(ApprovalServiceIT.class);
>-
>-	@Autowired
>-	private ApprovalService approvalService;
>-	
>-	@Autowired
>-	private ApprovalDao approvalDao;
>-	
>-	@Autowired
>-	private UserManagementService userMgmt;
>-	
>-	private TaskUser user1;
>-	private TaskUser user2;
>-	private TaskGroup group1;
>-	private TaskGroup group2;	
>-	
>-	@Test
>-	public void generateProcess() {
>-		Approval approval = createTestApproval1();
>-		
>-		String processXml = approvalService.generateProcessDefinition(approval.getId());
>-	
>-		logger.info("Output:\n" + processXml);
>-	}
>-
>-	@Test
>-	public void createProcess() throws IOException {
>-    	RuleFlowProcessFactory factory = RuleFlowProcessFactory.createProcess("org.jbpm.process");
>-        
>-    	factory
>-                // header
>-                .name("My process").packageName("org.jbpm")
>-                // nodes
>-                .startNode(1).name("Start").done()
>-                .actionNode(2).name("Action").action("java", "System.out.println(\"Action\");").done()
>-                .endNode(3).name("End").done()
>-                // connections
>-                .connection(1, 2)
>-                .connection(2, 3);
>-        RuleFlowProcess process = factory.validate().getProcess();
>-        
>-        process.getNode(1).getMetaData().put("x", 30);
>-        process.getNode(1).getMetaData().put("y", 126);
>-        
>-        process.getNode(2).getMetaData().put("x", 160);
>-        process.getNode(2).getMetaData().put("y", 110);
>-        process.getNode(2).getMetaData().put("width", 130);
>-        process.getNode(2).getMetaData().put("height", 80);
>-        
>-        process.getNode(3).getMetaData().put("x", 360);
>-        process.getNode(3).getMetaData().put("y", 126);
>-        
>-        Resource res = ResourceFactory.newByteArrayResource(XmlBPMNProcessDumper.INSTANCE.dump(process, XmlBPMNProcessDumper.NO_META_DATA).getBytes());
>-        res.setSourcePath("/tmp/processFactory.bpmn2"); // source path or target path must be set to be added into kbase
>-        
>-        String bpmn2xml = IOUtils.toString(res.getReader());
>-
>-        logger.info("Output:\n" + bpmn2xml);
>-        
>-//        KieBase kbase = createKnowledgeBaseFromResources(res);
>-//        StatefulKnowledgeSession ksession = createKnowledgeSession(kbase);
>-//        ksession.startProcess("org.jbpm.process");
>-//        ksession.dispose();
>-
>-    }
>-
>-	
>-	/** Test Data Construction **/
>-	
>-	@Before
>-	public void before() {
>-		List<TaskUser> users = userMgmt.findAllUsers();
>-		user1 = users.get(0);
>-		user2 = users.get(1);
>-		
>-		List<TaskGroup> groups = userMgmt.findAllGroups();
>-		group1 = groups.get(0);
>-		group2 = groups.get(1);
>-	}
>-	
>-	private Approval createTestApproval1() {
>-		Approval approval = createApproval("Test Approval");
>-		ApprovalStep step1 = addStep(approval, ApprovalStep.ALL_APPROVE);
>-		addUserApprover(step1, user1);
>-		
>-		ApprovalStep step2 = addStep(approval, ApprovalStep.ALL_APPROVE);
>-		addUserApprover(step2, user1);
>-		addGroupApprover(step2, group1);
>-		addGroupApprover(step2, group2);
>-		
>-		ApprovalStep step3 = addStep(approval, ApprovalStep.ANY_APPROVE);
>-		addUserApprover(step3, user1);
>-		addUserApprover(step3, user2);
>-		addGroupApprover(step3, group2);
>-		
>-		approval = approvalDao.saveApproval(approval);
>-		
>-		return approval;
>-	}
>-	
>-	private Approval createApproval(String name) {
>-		Approval approval = new Approval();
>-		approval.setName(name);
>-		approval.setDescription(name + " description");
>-		return approval;
>-	}
>-	
>-	private ApprovalStep addStep(Approval approval, String type) {
>-		ApprovalStep step = new ApprovalStep();
>-		step.setType(type);
>-		approval.addStep(step);
>-		return step;
>-	}
>-	
>-	private StepApprover addUserApprover(ApprovalStep step, TaskUser user) {
>-		StepApprover approver = new StepApprover();
>-		approver.setPrincipalId(user.getId());
>-		approver.setType(StepApprover.USER_TYPE);
>-		approver.setLabel(user.getDisplayName());
>-		step.addApprover(approver);
>-		return approver;
>-	}
>-	
>-	private StepApprover addGroupApprover(ApprovalStep step, TaskGroup group) {
>-		StepApprover approver = new StepApprover();
>-		approver.setPrincipalId(group.getId());
>-		approver.setType(StepApprover.GROUP_TYPE);
>-		approver.setLabel(group.getDisplayName());
>-		step.addApprover(approver);
>-		return approver;
>-	}
>-}
>diff --git a/sample-spring-app/src/test/resources/datasource.pgsql.properties b/sample-spring-app/src/test/resources/datasource.pgsql.properties
>index 5fcff99..33da925 100644
>--- a/sample-spring-app/src/test/resources/datasource.pgsql.properties
>+++ b/sample-spring-app/src/test/resources/datasource.pgsql.properties
>@@ -1,12 +1,12 @@
> 
> resource.ds2.className = bitronix.tm.resource.jdbc.lrc.LrcXADataSource
>-resource.ds2.uniqueName = jbpmAppDS
>+resource.ds2.uniqueName = jdbc/jbpmAppDS
> resource.ds2.minPoolSize = 1
> resource.ds2.maxPoolSize = 10
> resource.ds2.driverProperties.driverClassName = org.postgresql.Driver
>-resource.ds2.driverProperties.url = jdbc:postgresql://localhost:5432/jbpmapp
>-resource.ds2.driverProperties.user = jbpmapp
>-resource.ds2.driverProperties.password = jbpmapp
>+resource.ds2.driverProperties.url = jdbc:postgresql://localhost:5432/jbpm
>+resource.ds2.driverProperties.user = ibek
>+resource.ds2.driverProperties.password = jbpm
> resource.ds2.allowLocalTransactions=true
> resource.ds2.useTmJoin=true
> resource.ds2.deferConnectionRelease=true
>diff --git a/sample-spring-app/src/test/resources/test.properties b/sample-spring-app/src/test/resources/test.properties
>index e8b05e3..ce85c67 100644
>--- a/sample-spring-app/src/test/resources/test.properties
>+++ b/sample-spring-app/src/test/resources/test.properties
>@@ -12,11 +12,12 @@ hibernate.transaction.jta.platform=org.hibernate.service.jta.platform.internal.B
> #hibernate.transaction.manager_lookup_class=org.hibernate.transaction.BTMTransactionManagerLookup
> hibernate.hbm2ddl.auto=update
> hibernate.show_sql=true
>-hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
>-#hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
>+#hibernate.dialect=org.hibernate.dialect.Oracle10gDialect
>+hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
> #hibernate.dialect=org.hibernate.dialect.MySQLDialect
> 
>-bitronix.datasource.configuration=src/test/resources/datasource.oracle.properties
>+#bitronix.datasource.configuration=src/test/resources/datasource.oracle.properties
>+bitronix.datasource.configuration=src/test/resources/datasource.pgsql.properties
> 
> test.property1=helloworld
>

Actions: View

Attachments on bug 1121764: 935375