[jbpm-commits] JBoss JBPM SVN: r3856 - in jbpm3/trunk/modules/core: src/main/java/org/jbpm/db and 1 other directories.

Author: alex.guizar(a)jboss.com Date: 2009-02-12 14:51:55 -0500 (Thu, 12 Feb 2009) New Revision: 3856 Modified: jbpm3/trunk/modules/core/pom.xml jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/GraphSession.java jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessArchiveClassLoadingDbTest.java Log: exclude JBPM2036Test as it causes regressions in other tests Modified: jbpm3/trunk/modules/core/pom.xml =================================================================== --- jbpm3/trunk/modules/core/pom.xml 2009-02-12 19:06:31 UTC (rev 3855) +++ jbpm3/trunk/modules/core/pom.xml 2009-02-12 19:51:55 UTC (rev 3856) @@ -254,6 +254,8 @@ <excludes> <!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema --> <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude> + <!-- [JBPM-2036] StaleObjectStateException when repeating timer signals the token --> + <exclude>org/jbpm/jbpm2036/JBPM2036Test.java</exclude> </excludes> </configuration> </plugin> @@ -281,6 +283,8 @@ <excludes> <!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema --> <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude> + <!-- [JBPM-2036] StaleObjectStateException when repeating timer signals the token --> + <exclude>org/jbpm/jbpm2036/JBPM2036Test.java</exclude> </excludes> </configuration> </plugin> @@ -310,6 +314,8 @@ <exclude>org/jbpm/seam/JobExecutorCustomizationTest.java</exclude> <!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema --> <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude> + <!-- [JBPM-2036] StaleObjectStateException when repeating timer signals the token --> + <exclude>org/jbpm/jbpm2036/JBPM2036Test.java</exclude> </excludes> </configuration> </plugin> @@ -337,6 +343,8 @@ <excludes> <!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema --> <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude> + <!-- [JBPM-2036] StaleObjectStateException when repeating timer signals the token --> + <exclude>org/jbpm/jbpm2036/JBPM2036Test.java</exclude> </excludes> </configuration> </plugin> @@ -364,6 +372,8 @@ <excludes> <!-- [JBPM-1810] Fix clean, drop, create schema with JbpmSchema --> <exclude>org/jbpm/db/JbpmSchemaDbTest.java</exclude> + <!-- [JBPM-2036] StaleObjectStateException when repeating timer signals the token --> + <exclude>org/jbpm/jbpm2036/JBPM2036Test.java</exclude> </excludes> </configuration> </plugin> Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/GraphSession.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/GraphSession.java 2009-02-12 19:06:31 UTC (rev 3855) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/db/GraphSession.java 2009-02-12 19:51:55 UTC (rev 3856) @@ -406,8 +406,8 @@ if (includeJobs) { log.debug("deleting jobs for " + processInstance); int entityCount = session.getNamedQuery("GraphSession.deleteJobsForProcessInstance") - .setEntity("processInstance", processInstance) - .executeUpdate(); + .setEntity("processInstance", processInstance) + .executeUpdate(); log.debug("deleted " + entityCount + " jobs for " + processInstance); } Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessArchiveClassLoadingDbTest.java =================================================================== --- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessArchiveClassLoadingDbTest.java 2009-02-12 19:06:31 UTC (rev 3855) +++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jpdl/par/ProcessArchiveClassLoadingDbTest.java 2009-02-12 19:51:55 UTC (rev 3856) @@ -43,7 +43,10 @@ public static Log log = LogFactory.getLog(ProcessArchiveClassLoadingDbTest.class); String getTestClassesDir() { - return ProcessArchiveDeploymentDbTest.class.getProtectionDomain().getCodeSource().getLocation().getFile(); + return ProcessArchiveDeploymentDbTest.class.getProtectionDomain() + .getCodeSource() + .getLocation() + .getFile(); } public void testExecuteResourceUsingProcess() throws Exception { @@ -51,8 +54,10 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(); ZipOutputStream zipOutputStream = new ZipOutputStream(baos); addEntry(zipOutputStream, "processdefinition.xml", "org/jbpm/jpdl/par/resourceprocess.xml"); - addEntry(zipOutputStream, "classes/org/jbpm/jpdl/par/ResourceAction.class", "org/jbpm/jpdl/par/ResourceAction.class"); - addEntry(zipOutputStream, "classes/org/jbpm/jpdl/par/classresource.txt", "org/jbpm/jpdl/par/classresource.txt"); + addEntry(zipOutputStream, "classes/org/jbpm/jpdl/par/ResourceAction.class", + "org/jbpm/jpdl/par/ResourceAction.class"); + addEntry(zipOutputStream, "classes/org/jbpm/jpdl/par/classresource.txt", + "org/jbpm/jpdl/par/classresource.txt"); addEntry(zipOutputStream, "archiveresource.txt", "org/jbpm/jpdl/par/archiveresource.txt"); zipOutputStream.close(); byte[] zipBytes = baos.toByteArray(); @@ -66,7 +71,8 @@ String resourceTmpName = resourceOriginalName + ".hiddenFromTestClasspath"; assertTrue(new File(resourceOriginalName).renameTo(new File(resourceTmpName))); - String archiveResourceOriginalName = getTestClassesDir() + "org/jbpm/jpdl/par/archiveresource.txt"; + String archiveResourceOriginalName = getTestClassesDir() + + "org/jbpm/jpdl/par/archiveresource.txt"; String archiveResourceTmpName = archiveResourceOriginalName + ".hiddenFromTestClasspath"; assertTrue(new File(archiveResourceOriginalName).renameTo(new File(archiveResourceTmpName))); @@ -77,7 +83,8 @@ try { Class.forName("org.jbpm.jpdl.par.ResourceAction", false, testClassLoader); fail("expected exception"); - } catch (ClassNotFoundException e) { + } + catch (ClassNotFoundException e) { // OK } @@ -85,15 +92,18 @@ ZipInputStream zipInputStream = new ZipInputStream(new ByteArrayInputStream(zipBytes)); ProcessDefinition processDefinition = ProcessDefinition.parseParZipInputStream(zipInputStream); jbpmContext.deployProcessDefinition(processDefinition); + + newTransaction(); try { - newTransaction(); - - ProcessInstance pi = jbpmContext.newProcessInstance("resourceprocess"); - pi.signal(); - } finally { + ProcessInstance processInstance = jbpmContext.newProcessInstance("resourceprocess"); + processInstance.signal(); + jbpmContext.save(processInstance); + } + finally { jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); } - } finally { + } + finally { // put the files back into original position new File(classTmpName).renameTo(new File(classOriginalName)); new File(resourceTmpName).renameTo(new File(resourceOriginalName)); @@ -106,17 +116,21 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(); ZipOutputStream zipOutputStream = new ZipOutputStream(baos); addEntry(zipOutputStream, "processdefinition.xml", "org/jbpm/jpdl/par/instantiateprocess.xml"); - addEntry(zipOutputStream, "classes/org/jbpm/jpdl/par/InstantiateAction.class", "org/jbpm/jpdl/par/InstantiateAction.class"); - addEntry(zipOutputStream, "classes/org/jbpm/jpdl/par/InstantiateClass.class", "org/jbpm/jpdl/par/InstantiateClass.class"); + addEntry(zipOutputStream, "classes/org/jbpm/jpdl/par/InstantiateAction.class", + "org/jbpm/jpdl/par/InstantiateAction.class"); + addEntry(zipOutputStream, "classes/org/jbpm/jpdl/par/InstantiateClass.class", + "org/jbpm/jpdl/par/InstantiateClass.class"); zipOutputStream.close(); byte[] zipBytes = baos.toByteArray(); // move the files - String instantiateActionOriginalName = getTestClassesDir() + "org/jbpm/jpdl/par/InstantiateAction.class"; + String instantiateActionOriginalName = getTestClassesDir() + + "org/jbpm/jpdl/par/InstantiateAction.class"; String instantiateActionTmpName = instantiateActionOriginalName + ".hiddenFromTestClasspath"; assertTrue(new File(instantiateActionOriginalName).renameTo(new File(instantiateActionTmpName))); - String instantiateClassOriginalName = getTestClassesDir() + "org/jbpm/jpdl/par/InstantiateClass.class"; + String instantiateClassOriginalName = getTestClassesDir() + + "org/jbpm/jpdl/par/InstantiateClass.class"; String instantiateClassTmpName = instantiateClassOriginalName + ".hiddenFromTestClasspath"; assertTrue(new File(instantiateClassOriginalName).renameTo(new File(instantiateClassTmpName))); @@ -125,13 +139,16 @@ try { Class.forName("org.jbpm.jpdl.par.InstantiateAction", false, testClassLoader); fail("expected exception"); - } catch (ClassNotFoundException e) { + } + catch (ClassNotFoundException e) { // OK } + try { Class.forName("org.jbpm.jpdl.par.InstantiateClass", false, testClassLoader); fail("expected exception"); - } catch (ClassNotFoundException e) { + } + catch (ClassNotFoundException e) { // OK } @@ -139,16 +156,18 @@ ZipInputStream zipInputStream = new ZipInputStream(new ByteArrayInputStream(zipBytes)); ProcessDefinition processDefinition = ProcessDefinition.parseParZipInputStream(zipInputStream); jbpmContext.deployProcessDefinition(processDefinition); + + newTransaction(); try { - newTransaction(); - ProcessInstance processInstance = jbpmContext.newProcessInstance("instantiateprocess"); processInstance.signal(); - - } finally { + jbpmContext.save(processInstance); + } + finally { jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); } - } finally { + } + finally { // put the files back into original position new File(instantiateActionTmpName).renameTo(new File(instantiateActionOriginalName)); new File(instantiateClassTmpName).renameTo(new File(instantiateClassOriginalName)); @@ -160,12 +179,14 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(); ZipOutputStream zipOutputStream = new ZipOutputStream(baos); addEntry(zipOutputStream, "processdefinition.xml", "org/jbpm/jpdl/par/instantiateprocess.xml"); - addEntry(zipOutputStream, "classes/org/jbpm/jpdl/par/InstantiateAction.class", "org/jbpm/jpdl/par/InstantiateAction.class"); + addEntry(zipOutputStream, "classes/org/jbpm/jpdl/par/InstantiateAction.class", + "org/jbpm/jpdl/par/InstantiateAction.class"); zipOutputStream.close(); byte[] zipBytes = baos.toByteArray(); // move the files - String instantiateActionOriginalName = getTestClassesDir() + "org/jbpm/jpdl/par/InstantiateAction.class"; + String instantiateActionOriginalName = getTestClassesDir() + + "org/jbpm/jpdl/par/InstantiateAction.class"; String instantiateActionTmpName = instantiateActionOriginalName + ".hiddenFromTestClasspath"; assertTrue(new File(instantiateActionOriginalName).renameTo(new File(instantiateActionTmpName))); @@ -174,7 +195,8 @@ try { Class.forName("org.jbpm.jpdl.par.InstantiateAction", false, testClassLoader); fail("expected exception"); - } catch (ClassNotFoundException e) { + } + catch (ClassNotFoundException e) { // OK } // InstantiateClass should be visible on the test classpath @@ -184,29 +206,33 @@ ZipInputStream zipInputStream = new ZipInputStream(new ByteArrayInputStream(zipBytes)); ProcessDefinition processDefinition = ProcessDefinition.parseParZipInputStream(zipInputStream); jbpmContext.deployProcessDefinition(processDefinition); + + newTransaction(); try { - newTransaction(); - ProcessInstance processInstance = jbpmContext.newProcessInstance("instantiateprocess"); processInstance.signal(); - - } finally { + jbpmContext.save(processInstance); + } + finally { jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId()); } - } finally { + } + finally { // put the files back into original position new File(instantiateActionTmpName).renameTo(new File(instantiateActionOriginalName)); } } - private static void addEntry(ZipOutputStream zipOutputStream, String entryName, String resource) throws IOException { + private static void addEntry(ZipOutputStream zipOutputStream, String entryName, String resource) + throws IOException { InputStream inputStream = ClassLoaderUtil.getStream(resource); byte[] bytes = IoUtil.readBytes(inputStream); addEntry(zipOutputStream, entryName, bytes); inputStream.close(); } - private static void addEntry(ZipOutputStream zipOutputStream, String entryName, byte[] content) throws IOException { + private static void addEntry(ZipOutputStream zipOutputStream, String entryName, byte[] content) + throws IOException { ZipEntry zipEntry = new ZipEntry(entryName); zipOutputStream.putNextEntry(zipEntry); zipOutputStream.write(content);