[jbpm-commits] JBoss JBPM SVN: r5470 - in jbpm4/trunk/modules/test-cfg/src/test: resources/org/jbpm/test and 1 other directories.

Author: jbarrez Date: 2009-08-12 07:21:16 -0400 (Wed, 12 Aug 2009) New Revision: 5470 Added: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/repocache/ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/repocache/jbpm.cfg.xml jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/repocache/jbpm_alternative.cfg.xml jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/repocache/jbpm_alternative.hibernate.cfg.xml Removed: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/ Modified: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/repocache/RepositoryCacheTest.java Log: Fix for messed up test case Modified: jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/repocache/RepositoryCacheTest.java =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/repocache/RepositoryCacheTest.java 2009-08-12 11:05:27 UTC (rev 5469) +++ jbpm4/trunk/modules/test-cfg/src/test/java/org/jbpm/test/repocache/RepositoryCacheTest.java 2009-08-12 11:21:16 UTC (rev 5470) @@ -70,7 +70,6 @@ * * When signalling an execution which has a deleted deployment */ public void testDeleteDeploymentsUsingTwoProcessEngines() { - /* ProcessEngine processEngine2 = createProcessEngineFromAlternativeConfig(); ExecutionService executionService2 = processEngine2.getExecutionService(); assertFalse(processEngine.equals(processEngine2)); @@ -121,11 +120,10 @@ executionService2.signalExecutionById(executionAtWaitState2.getId()); fail(); } catch (JbpmException e) { } - */ } private ProcessEngine createProcessEngineFromAlternativeConfig() { - Configuration configuration = new Configuration().setResource("org/jbpm/test/cache/jbpm_alternative.cfg.xml"); + Configuration configuration = new Configuration().setResource("org/jbpm/test/repocache/jbpm_alternative.cfg.xml"); return configuration.buildProcessEngine(); } Copied: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/repocache/jbpm.cfg.xml (from rev 5433, jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm.cfg.xml) =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/repocache/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/repocache/jbpm.cfg.xml 2009-08-12 11:21:16 UTC (rev 5470) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jbpm-configuration> + + <import resource="jbpm.default.cfg.xml" /> + <import resource="jbpm.businesscalendar.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> + +</jbpm-configuration> Copied: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/repocache/jbpm_alternative.cfg.xml (from rev 5433, jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm_alternative.cfg.xml) =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/repocache/jbpm_alternative.cfg.xml (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/repocache/jbpm_alternative.cfg.xml 2009-08-12 11:21:16 UTC (rev 5470) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> + + <!-- + + Alternative configuration: * no create-drop for the database + --> + +<jbpm-configuration> + + <process-engine-context> + + <repository-service /> + <repository-cache /> + <execution-service /> + <history-service /> + <management-service /> + <identity-service /> + <task-service /> + + <hibernate-configuration> + <cfg resource="org/jbpm/test/repocache/jbpm_alternative.hibernate.cfg.xml" /> + </hibernate-configuration> + + <hibernate-session-factory /> + + <script-manager default-expression-language="juel" + default-script-language="juel"> + <script-language name="juel" + factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" /> + </script-manager> + + <id-generator /> + <types resource="jbpm.variable.types.xml" /> + + <address-resolver /> + + </process-engine-context> + + <transaction-context> + <repository-session /> + <db-session /> + + <message-session /> + <timer-session /> + <history-session /> + <mail-session> + <mail-server> + <session-properties resource="jbpm.mail.properties" /> + </mail-server> + </mail-session> + </transaction-context> + + <import resource="jbpm.businesscalendar.cfg.xml" /> + <import resource="jbpm.tx.hibernate.cfg.xml" /> + <import resource="jbpm.jpdl.cfg.xml" /> + <import resource="jbpm.identity.cfg.xml" /> + +</jbpm-configuration> Copied: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/repocache/jbpm_alternative.hibernate.cfg.xml (from rev 5433, jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/cache/jbpm_alternative.hibernate.cfg.xml) =================================================================== --- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/repocache/jbpm_alternative.hibernate.cfg.xml (rev 0) +++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/repocache/jbpm_alternative.hibernate.cfg.xml 2009-08-12 11:21:16 UTC (rev 5470) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory> + + <!-- HSQLDB --> + <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property> + <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property> + <property name="hibernate.connection.url">jdbc:hsqldb:mem:.</property> + <property name="hibernate.connection.username">sa</property> + <property name="hibernate.connection.password"></property> + + <!-- Alternative config: no create-drop --> + <property name="hibernate.hbm2ddl.auto">update</property> + <property name="hibernate.format_sql">true</property> + + <mapping resource="jbpm.repository.hbm.xml" /> + <mapping resource="jbpm.execution.hbm.xml" /> + <mapping resource="jbpm.history.hbm.xml" /> + <mapping resource="jbpm.task.hbm.xml" /> + <mapping resource="jbpm.identity.hbm.xml" /> + + </session-factory> +</hibernate-configuration>