diff --git a/.externalToolBuilders/JibX.launch b/.externalToolBuilders/JibX.launch
index 86f6480230..0856e8e600 100644
--- a/.externalToolBuilders/JibX.launch
+++ b/.externalToolBuilders/JibX.launch
@@ -2,14 +2,14 @@
 <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
 <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.ui.antsupport.InternalAntRunner"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto,"/>
 <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:Repository}"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; name=&quot;workingSet&quot;&gt;&#13;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/Repository&quot; type=&quot;4&quot;/&gt;&#13;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
@@ -18,13 +18,13 @@
 <stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="compile-jibx,"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk1.5.0_06"/>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_02&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.ant.ui.classpathentry.antHome&quot;&gt;&#10;&lt;memento default=&quot;true&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.ant.ui.classpathentry.extraClasspathEntries&quot;&gt;&#10;&lt;memento/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/jibx/jibx-run.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/jibx/jibx-bind.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/bcel.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/xpp3.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.5.0_02&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.ant.ui.classpathentry.antHome&quot;&gt;&#13;&#10;&lt;memento default=&quot;true&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.ant.ui.classpathentry.extraClasspathEntries&quot;&gt;&#13;&#10;&lt;memento/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/jibx/jibx-run.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/jibx/jibx-bind.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/bcel.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/3rd Party/lib/xpp3-1.1.3_8.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Repository/project-build.xml}"/>
 </launchConfiguration>
diff --git a/config/alfresco/application-context.xml b/config/alfresco/application-context.xml
index 5cb650346c..6e9163edc6 100644
--- a/config/alfresco/application-context.xml
+++ b/config/alfresco/application-context.xml
@@ -22,6 +22,7 @@
     <import resource="classpath:alfresco/authentication-services-context.xml" />
     <import resource="classpath:alfresco/policy-context.xml" />
     <import resource="classpath:alfresco/import-export-context.xml" />
+    <import resource="classpath:alfresco/workflow-context.xml" />
     <import resource="classpath:alfresco/bootstrap-context.xml" />
     <import resource="classpath:alfresco/jcr-api-context.xml" />
     <import resource="classpath*:alfresco/patch/*-context.xml" />
diff --git a/config/alfresco/hibernate-context.xml b/config/alfresco/hibernate-context.xml
index 12564b8c0a..b656dfaf0e 100644
--- a/config/alfresco/hibernate-context.xml
+++ b/config/alfresco/hibernate-context.xml
@@ -41,6 +41,98 @@
                 <value>org/alfresco/repo/domain/hibernate/VersionCount.hbm.xml</value>
                 <value>org/alfresco/repo/domain/hibernate/AppliedPatch.hbm.xml</value>
                 <value>org/alfresco/repo/domain/hibernate/Permission.hbm.xml</value>
+
+                <!--  -->
+                <!-- JBoss jBPM Workflow Engine -->
+                <!--  -->
+                <!-- TODO: Determine if it's possible to inject the following mappings -->
+                <!--       from elsewhere -->
+                <!--  -->
+                <value>org/jbpm/graph/action/Script.hbm.xml</value>
+			    <value>org/jbpm/db/hibernate.queries.hbm.xml</value>
+                <value>org/jbpm/graph/def/ProcessDefinition.hbm.xml</value>
+                <value>org/jbpm/graph/def/Node.hbm.xml</value>
+                <value>org/jbpm/graph/def/Transition.hbm.xml</value>
+                <value>org/jbpm/graph/def/Event.hbm.xml</value>
+                <value>org/jbpm/graph/def/Action.hbm.xml</value>
+                <value>org/jbpm/graph/def/SuperState.hbm.xml</value>
+                <value>org/jbpm/graph/def/ExceptionHandler.hbm.xml</value>
+                <value>org/jbpm/instantiation/Delegation.hbm.xml</value>
+                <value>org/jbpm/graph/node/StartState.hbm.xml</value>
+                <value>org/jbpm/graph/node/EndState.hbm.xml</value>
+                <value>org/jbpm/graph/node/ProcessState.hbm.xml</value>
+                <value>org/jbpm/graph/node/Decision.hbm.xml</value>
+                <value>org/jbpm/graph/node/Fork.hbm.xml</value>
+                <value>org/jbpm/graph/node/Join.hbm.xml</value>
+                <value>org/jbpm/graph/node/State.hbm.xml</value>
+                <value>org/jbpm/graph/node/TaskNode.hbm.xml</value>
+                <value>org/jbpm/context/def/ContextDefinition.hbm.xml</value>
+                <value>org/jbpm/context/def/VariableAccess.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/def/Swimlane.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/def/Task.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/def/TaskController.hbm.xml</value>
+                <value>org/jbpm/module/def/ModuleDefinition.hbm.xml</value>
+                <value>org/jbpm/bytes/ByteArray.hbm.xml</value>
+                <value>org/jbpm/file/def/FileDefinition.hbm.xml</value>
+                <value>org/jbpm/scheduler/def/CreateTimerAction.hbm.xml</value>
+                <value>org/jbpm/scheduler/def/CancelTimerAction.hbm.xml</value>
+                <value>org/jbpm/graph/exe/Comment.hbm.xml</value>
+                <value>org/jbpm/graph/exe/ProcessInstance.hbm.xml</value>
+                <value>org/jbpm/graph/exe/Token.hbm.xml</value>
+                <value>org/jbpm/graph/exe/RuntimeAction.hbm.xml</value>
+                <value>org/jbpm/module/exe/ModuleInstance.hbm.xml</value>
+                <value>org/jbpm/context/exe/ContextInstance.hbm.xml</value>
+                <value>org/jbpm/context/exe/TokenVariableMap.hbm.xml</value>
+                <value>org/jbpm/context/exe/VariableInstance.hbm.xml</value>
+                <value>org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml</value>
+                <value>org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml</value>
+                <value>org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml</value>
+                <value>org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml</value>
+                <value>org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml</value>
+                <value>org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml</value>
+                <value>org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml</value>
+                <value>org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml</value>
+                <value>org/jbpm/msg/Message.hbm.xml</value>
+                <value>org/jbpm/msg/db/TextMessage.hbm.xml</value>
+                <value>org/jbpm/command/ExecuteActionCommand.hbm.xml</value>
+                <value>org/jbpm/command/ExecuteNodeCommand.hbm.xml</value>
+                <value>org/jbpm/command/SignalCommand.hbm.xml</value>
+                <value>org/jbpm/command/TaskInstanceEndCommand.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/exe/PooledActor.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml</value>
+                <value>org/jbpm/scheduler/exe/Timer.hbm.xml</value>
+                <value>org/jbpm/logging/log/ProcessLog.hbm.xml</value>
+                <value>org/jbpm/logging/log/MessageLog.hbm.xml</value>
+                <value>org/jbpm/logging/log/CompositeLog.hbm.xml</value>
+                <value>org/jbpm/graph/log/ActionLog.hbm.xml</value>
+                <value>org/jbpm/graph/log/NodeLog.hbm.xml</value>
+                <value>org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml</value>
+                <value>org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml</value>
+                <value>org/jbpm/graph/log/SignalLog.hbm.xml</value>
+                <value>org/jbpm/graph/log/TokenCreateLog.hbm.xml</value>
+                <value>org/jbpm/graph/log/TokenEndLog.hbm.xml</value>
+                <value>org/jbpm/graph/log/TransitionLog.hbm.xml</value>
+                <value>org/jbpm/context/log/VariableLog.hbm.xml</value>
+                <value>org/jbpm/context/log/VariableCreateLog.hbm.xml</value>
+                <value>org/jbpm/context/log/VariableDeleteLog.hbm.xml</value>
+                <value>org/jbpm/context/log/VariableUpdateLog.hbm.xml</value>
+                <value>org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml</value>
+                <value>org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml</value>
+                <value>org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml</value>
+                <value>org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml</value>
+                <value>org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml</value>
+                <value>org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml</value>
+                <value>org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/log/TaskLog.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml</value>
+                <value>org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml</value>                
             </list>
         </property>
         <property name="hibernateProperties" ref="hibernateConfigProperties" />
diff --git a/config/alfresco/workflow-context.xml b/config/alfresco/workflow-context.xml
index 98abbb5311..1c49209e27 100644
--- a/config/alfresco/workflow-context.xml
+++ b/config/alfresco/workflow-context.xml
@@ -4,16 +4,25 @@
 <beans>
 
    <!-- jBPM configuration -->
-   <bean id="jbpm.configuration" class="org.springmodules.workflow.jbpm31.LocalJbpmConfigurationFactoryBean">
+   <bean id="jbpm_configuration" class="org.springmodules.workflow.jbpm31.LocalJbpmConfigurationFactoryBean">
       <property name="sessionFactory" ref="sessionFactory"/>
       <property name="configuration" value="classpath:org/jbpm/default.jbpm.cfg.xml"/>
+      <property name="processDefinitions">
+      <list>
+         <ref local="jbpm_testWorkflow"/>
+      </list>
+      </property>
+      
    </bean>
 
    <!-- jBPM template -->
-   <bean id="jbpm.template" class="org.springmodules.workflow.jbpm31.JbpmTemplate">
-      <constructor-arg index="0" ref="jbpm.configuration"/>
+   <bean id="jbpm_template" class="org.springmodules.workflow.jbpm31.JbpmTemplate">
+      <constructor-arg index="0" ref="jbpm_configuration"/>
    </bean>
 
-   
+   <!-- TODO: Remove this - for short-term testing only -->
+   <bean id="jbpm_testWorkflow" class="org.springmodules.workflow.jbpm31.definition.ProcessDefinitionFactoryBean">
+    <property name="definitionLocation" value="classpath:org/alfresco/repo/workflow/jbpm/test_processdefinition.xml"/>
+  </bean>   
 
 </beans>
diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMSpringTest.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMSpringTest.java
index cd14d21b3b..5b83d5e93c 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMSpringTest.java
+++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMSpringTest.java
@@ -41,9 +41,9 @@ public class JBPMSpringTest extends BaseSpringTest
 
         
     //@Override
-    protected void xonSetUpInTransaction() throws Exception
+    protected void onSetUpInTransaction() throws Exception
     {
-        jbpmTemplate = (JbpmTemplate)applicationContext.getBean("jbpm.template");
+        jbpmTemplate = (JbpmTemplate)applicationContext.getBean("jbpm_template");
         descriptorService = (DescriptorService)applicationContext.getBean("DescriptorService");
     }
     
@@ -51,7 +51,7 @@ public class JBPMSpringTest extends BaseSpringTest
     {
     }
         
-    public void xtestHelloWorld()
+    public void testHelloWorld()
         throws Exception
     {
         // Between the 3 method calls below, all data is passed via the 
@@ -74,21 +74,21 @@ public class JBPMSpringTest extends BaseSpringTest
         theProcessInstanceContinuesWhenAnAsyncMessageIsReceived();
     }
 
-    public void xtestStep0()
+    public void testStep0()
         throws Exception
     {
         deployProcessDefinition();
         setComplete();
     }
 
-    public void xtestStep1()
+    public void testStep1()
         throws Exception
     {
         processInstanceIsCreatedWhenUserSubmitsWebappForm();
         setComplete();
     }
     
-    public void xtestStep2()
+    public void testStep2()
         throws Exception
     {
         theProcessInstanceContinuesWhenAnAsyncMessageIsReceived();
diff --git a/source/java/org/alfresco/repo/workflow/jbpm/test_processdefinition.xml b/source/java/org/alfresco/repo/workflow/jbpm/test_processdefinition.xml
new file mode 100644
index 0000000000..55dec354b3
--- /dev/null
+++ b/source/java/org/alfresco/repo/workflow/jbpm/test_processdefinition.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition xmlns="urn:jbpm.org:jpdl-3.1" name="Review and Approve">
+   <swimlane name="Initiator"></swimlane>
+   <start-state name="start">
+     <task name="Submit" swimlane="Initiator">
+        <controller>
+          <variable name="reviewer" />
+        </controller>
+      </task>
+      <transition name="" to="Review"></transition>
+   </start-state>
+   <swimlane name="Reviewer">
+      <assignment actor-id="#{reviewer}"></assignment>
+   </swimlane>
+   <task-node name="Review">
+      <task name="Review" duedate="1 business day" blocking="true" swimlane="Reviewer">
+         <controller>
+            <variable name="comment" access="read,write,required"></variable>
+         </controller>
+      </task>
+      <transition name="reject" to="Rejected"></transition>
+      <transition name="approve" to="Approved"></transition>
+   </task-node>
+   <end-state name="end"></end-state>
+   <task-node name="Rejected">
+      <task name="Rejected" swimlane="Initiator">
+         <controller>
+            <variable name="comment" access="read"></variable>
+         </controller>
+      </task>
+      <transition name="" to="end"></transition>
+   </task-node>
+   <task-node name="Approved">
+      <task name="Approved" swimlane="Initiator">
+         <controller>
+            <variable name="comment" access="read"></variable>
+         </controller>
+      </task>
+      <transition name="" to="end"></transition>
+   </task-node>
+</process-definition>
\ No newline at end of file