[jbpm-commits] JBoss JBPM SVN: r2278 - in projects/jbpm-spec/trunk/modules: cts/src/test/java/org/jboss/bpm/cts/model and 9 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Sep 18 03:25:17 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-09-18 03:25:16 -0400 (Thu, 18 Sep 2008)
New Revision: 2278

Added:
   projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/
   projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process/
   projects/jbpm-spec/trunk/modules/cts/src/test/resources/cts/model/
   projects/jbpm-spec/trunk/modules/cts/src/test/resources/cts/model/process/
   projects/jbpm-spec/trunk/modules/cts/src/test/resources/cts/model/process/process-property-api10.xml
   projects/jbpm-spec/trunk/modules/ri/src/main/resources/hibernate.cfg.hsqldb.xml
Removed:
   projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java
Modified:
   projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process/ProcessIntegrityTest.java
   projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process/ProcessPropertyDescriptorTest.java
   projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process/ProcessPropertyMarshallerTest.java
   projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process/ProcessPropertyTest.java
   projects/jbpm-spec/trunk/modules/cts/src/test/resources/jbpm-beans.xml
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/HibernatePersistenceService.java
   projects/jbpm-spec/trunk/modules/ri/src/test/resources/jbpm-beans.xml
Log:
Enable HSQL default for PersistenceService

Copied: projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process (from rev 2210, projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/process)

Modified: projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process/ProcessIntegrityTest.java
===================================================================
--- projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java	2008-09-12 13:52:42 UTC (rev 2210)
+++ projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process/ProcessIntegrityTest.java	2008-09-18 07:25:16 UTC (rev 2278)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.bpm.cts.process;
+package org.jboss.bpm.cts.model.process;
 
 // $Id$
 
@@ -36,7 +36,7 @@
  */
 public class ProcessIntegrityTest extends DefaultEngineTestCase
 {
-  public void testNoStartState() throws Exception
+  public void testNoStartEvent() throws Exception
   {
     try
     {
@@ -51,7 +51,7 @@
     }
   }
 
-  public void testNoEndState() throws Exception
+  public void testNoEndEvent() throws Exception
   {
     try
     {

Modified: projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process/ProcessPropertyDescriptorTest.java
===================================================================
--- projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyDescriptorTest.java	2008-09-12 13:52:42 UTC (rev 2210)
+++ projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process/ProcessPropertyDescriptorTest.java	2008-09-18 07:25:16 UTC (rev 2278)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.bpm.cts.process;
+package org.jboss.bpm.cts.model.process;
 
 // $Id$
 
@@ -40,7 +40,7 @@
 {
   protected Process getProcess() throws IOException
   {
-    URL procURL = getResourceURL("cts/process/process-property-" + getDialect() + ".xml");
+    URL procURL = getResourceURL("cts/model/process/process-property-" + getDialect() + ".xml");
     ProcessManager pm = ProcessManager.locateProcessManager();
     Process proc = pm.createProcess(procURL);
     return proc;

Modified: projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process/ProcessPropertyMarshallerTest.java
===================================================================
--- projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java	2008-09-12 13:52:42 UTC (rev 2210)
+++ projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process/ProcessPropertyMarshallerTest.java	2008-09-18 07:25:16 UTC (rev 2278)
@@ -19,7 +19,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.bpm.cts.process;
+package org.jboss.bpm.cts.model.process;
 
 // $Id$
 

Modified: projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process/ProcessPropertyTest.java
===================================================================
--- projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java	2008-09-12 13:52:42 UTC (rev 2210)
+++ projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/model/process/ProcessPropertyTest.java	2008-09-18 07:25:16 UTC (rev 2278)
@@ -19,28 +19,19 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.jboss.bpm.cts.process;
+package org.jboss.bpm.cts.model.process;
 
 // $Id$
 
 import java.io.IOException;
 
-import org.jboss.bpm.model.EventDetail;
-import org.jboss.bpm.model.Message;
-import org.jboss.bpm.model.MessageBuilder;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.model.ProcessBuilder;
 import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.model.Assignment.AssignTime;
-import org.jboss.bpm.model.Expression.ExpressionLanguage;
 import org.jboss.bpm.test.DefaultEngineTestCase;
 
 /**
- * Modeler-defined Properties MAY be added to a Process. These Properties are "local" to the Process. All Tasks,
- * Sub-Process objects, and Sub-Processes that are embedded SHALL have access to these Properties. The fully delineated
- * name of these properties are "<process name>.<property name>" (e.g., "Add Customer.Customer Name"). If a process is
- * embedded within another Process, then the fully delineated name SHALL also be preceded by the Parent Process name for
- * as many Parents there are until the top level Process. 
+ * Modeler-defined Properties MAY be added to a Process.
  * 
  * https://jira.jboss.org/jira/browse/JBPM-1392
  * 
@@ -50,29 +41,18 @@
 public class ProcessPropertyTest extends DefaultEngineTestCase
 {
   /**
-   * Test the the process properties can be used by Assignments
-   * and finally arrive in through the End Message
+   * Test the the process properties
    */
   public void testProcessProperties() throws Exception
   {
     Process proc = getProcess();
-    proc.startProcess();
-    proc.waitForEnd();
-
-    Message endMessage = getMessages().get(0);
-    assertNotNull("EndMessage expected", endMessage);
-    assertEquals("bar", endMessage.getPropertyValue("propValue"));
   }
 
   protected Process getProcess() throws IOException
   {
     ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
-    procBuilder.addProcess("ProcessProperties").addStartEvent("Start").addSequenceFlow("TaskA");
-    procBuilder.addAssignment(AssignTime.Start, ExpressionLanguage.MVEL, "ProcessProperties_foo", "propValue");
-    procBuilder.addProperty("foo", "bar").addTask("TaskA").addSequenceFlow("End");
-    procBuilder.addEndEvent("End").addEventDetail(EventDetail.EventDetailType.Message).addMessageRef("EndMessage");
-    MessageBuilder msgBuilder = procBuilder.addMessage("EndMessage");
-    msgBuilder.addToRef(getTestID()).addProperty("propValue", null, true);
+    procBuilder.addProcess("ProcessProperties").addStartEvent("Start").addSequenceFlow("End");
+    procBuilder.addEndEvent("End").addProperty("foo", "bar");
     Process proc = procBuilder.getProcess();
     return proc;
   }

Deleted: projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java
===================================================================
--- projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java	2008-09-17 16:04:00 UTC (rev 2277)
+++ projects/jbpm-spec/trunk/modules/cts/src/test/java/org/jboss/bpm/cts/process/ProcessIntegrityTest.java	2008-09-18 07:25:16 UTC (rev 2278)
@@ -1,69 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.cts.process;
-
-// $Id$
-
-import org.jboss.bpm.InvalidProcessException;
-import org.jboss.bpm.model.ProcessBuilder;
-import org.jboss.bpm.model.ProcessBuilderFactory;
-import org.jboss.bpm.test.DefaultEngineTestCase;
-
-/**
- * Test the intergety of various process definitions
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public class ProcessIntegrityTest extends DefaultEngineTestCase
-{
-  public void testNoStartState() throws Exception
-  {
-    try
-    {
-      // Create a Process through the ProcessBuilder
-      ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder();
-      builder.addProcess("NoStartState").addTask("taskA").addSequenceFlow("end").addEndEvent("end").getProcess();
-      fail("InvalidProcessException expected");
-    }
-    catch (InvalidProcessException ex)
-    {
-      assertTrue("Unexpected message: " + ex.getMessage(), ex.getMessage().indexOf("start event") > 0);
-    }
-  }
-
-  public void testNoEndState() throws Exception
-  {
-    try
-    {
-      // Create a Process through the ProcessBuilder
-      ProcessBuilder builder = ProcessBuilderFactory.newInstance().newProcessBuilder();
-      builder.addProcess("NoEndState").addStartEvent("Start").addSequenceFlow("taskA").addTask("taskA").addSequenceFlow("end").
-      addTask("end").getProcess();
-      fail("InvalidProcessException expected");
-    }
-    catch (InvalidProcessException ex)
-    {
-      assertTrue("Unexpected message: " + ex.getMessage(), ex.getMessage().indexOf("end event") > 0);
-    }
-  }
-}

Added: projects/jbpm-spec/trunk/modules/cts/src/test/resources/cts/model/process/process-property-api10.xml
===================================================================
--- projects/jbpm-spec/trunk/modules/cts/src/test/resources/cts/model/process/process-property-api10.xml	                        (rev 0)
+++ projects/jbpm-spec/trunk/modules/cts/src/test/resources/cts/model/process/process-property-api10.xml	2008-09-18 07:25:16 UTC (rev 2278)
@@ -0,0 +1,10 @@
+<ns2:process name="ProcessProperties" xmlns:ns2="urn:bpm.jboss:pdl-0.1">
+  <start name="Start">
+    <seqflow to="End" />
+  </start>
+  <end name="End"/>
+  <property>
+    <name>foo</name>
+    <value>bar</value>
+  </property>
+</ns2:process>
\ No newline at end of file


Property changes on: projects/jbpm-spec/trunk/modules/cts/src/test/resources/cts/model/process/process-property-api10.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: projects/jbpm-spec/trunk/modules/cts/src/test/resources/jbpm-beans.xml
===================================================================
--- projects/jbpm-spec/trunk/modules/cts/src/test/resources/jbpm-beans.xml	2008-09-17 16:04:00 UTC (rev 2277)
+++ projects/jbpm-spec/trunk/modules/cts/src/test/resources/jbpm-beans.xml	2008-09-18 07:25:16 UTC (rev 2278)
@@ -23,6 +23,7 @@
   <!-- The ProcessManager -->
   <bean name="jBPMProcessManager" class="org.jboss.bpm.ri.client.ProcessManagerImpl">
     <property name="dialectRegistry"><inject bean="jBPMDialectRegistry"/></property>
+    <property name="persistenceService"><inject bean="jBPMPersistenceService"/></property>
     <property name="dialectHandlers">
       <map keyClass="java.lang.String" valueClass="org.jboss.bpm.client.DialectHandler">
         <entry><key>api10</key><value><inject bean="jBPMDialectHandlerAPI10"/></value></entry>
@@ -49,4 +50,7 @@
     </property>
   </bean>
   
+  <!-- The PersistenceService -->
+  <bean name="jBPMPersistenceService" class="org.jboss.bpm.ri.client.HibernatePersistenceService"/>
+  
 </deployment>

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/HibernatePersistenceService.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/HibernatePersistenceService.java	2008-09-17 16:04:00 UTC (rev 2277)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/HibernatePersistenceService.java	2008-09-18 07:25:16 UTC (rev 2278)
@@ -33,7 +33,6 @@
 import org.hibernate.classic.Session;
 import org.jboss.bpm.ProcessNotFoundException;
 import org.jboss.bpm.client.PersistenceService;
-import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.ri.model.impl.AbstractElementImpl;
 import org.jboss.bpm.ri.model.impl.EndEventImpl;
@@ -111,8 +110,14 @@
 
   private SessionFactory getSessionFactory()
   {
+    // If this property is not explicitly set in the beans config
+    // fall back to the -Ddatabase property that also activates 
+    // the corresponding mvn profiles
     if (hibernateConfig == null)
-      throw new IllegalStateException("Hibernate config property cannot be null");
+    {
+      String database = System.getProperty("database", "hsqldb");
+      hibernateConfig = "hibernate.cfg." + database + ".xml";
+    }
 
     if (sessionFactory == null)
     {

Added: projects/jbpm-spec/trunk/modules/ri/src/main/resources/hibernate.cfg.hsqldb.xml
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/resources/hibernate.cfg.hsqldb.xml	                        (rev 0)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/resources/hibernate.cfg.hsqldb.xml	2008-09-18 07:25:16 UTC (rev 2278)
@@ -0,0 +1,32 @@
+<?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>
+
+    <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:jbpm</property>
+    <property name="hibernate.connection.username">sa</property>
+    <property name="hibernate.connection.password"></property>
+
+    <!-- ################################### -->
+    <!-- # common settings                 # -->
+    <!-- ################################### -->
+
+    <!-- Automatic schema creation -->
+    <property name="hibernate.hbm2ddl.auto">create-drop</property>
+
+    <!-- Simple memory-only cache -->
+    <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+
+    <!-- logging properties -->
+    <property name="hibernate.format_sql">true</property>
+    <property name="hibernate.use_sql_comments">true</property>
+
+  </session-factory>
+</hibernate-configuration>


Property changes on: projects/jbpm-spec/trunk/modules/ri/src/main/resources/hibernate.cfg.hsqldb.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: projects/jbpm-spec/trunk/modules/ri/src/test/resources/jbpm-beans.xml
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/test/resources/jbpm-beans.xml	2008-09-17 16:04:00 UTC (rev 2277)
+++ projects/jbpm-spec/trunk/modules/ri/src/test/resources/jbpm-beans.xml	2008-09-18 07:25:16 UTC (rev 2278)
@@ -43,8 +43,6 @@
   </bean>
   
   <!-- The PersistenceService -->
-  <bean name="jBPMPersistenceService" class="org.jboss.bpm.ri.client.HibernatePersistenceService">
-    <property name="hibernateConfig">hibernate.cfg.mysql.xml</property>
-  </bean>
+  <bean name="jBPMPersistenceService" class="org.jboss.bpm.ri.client.HibernatePersistenceService"/>
   
 </deployment>




More information about the jbpm-commits mailing list