[jbpm-commits] JBoss JBPM SVN: r2371 - in jbpm4/trunk/modules: cts/src/test/java/org/jbpm/test/cts/processengine and 4 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Sep 25 01:40:46 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-09-25 01:40:46 -0400 (Thu, 25 Sep 2008)
New Revision: 2371

Added:
   jbpm4/trunk/modules/cts/src/test/resources/log4j.xml
   jbpm4/trunk/modules/pvm/src/main/resources/org.jbpm.api.client.Configuration
Removed:
   jbpm4/trunk/modules/pvm/src/main/resources/org.jbpm.api.client.ProcessEngineProvider
Modified:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/Configuration.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/MicrocontainerConfiguration.java
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ProcessEngine.java
   jbpm4/trunk/modules/cts/src/test/java/org/jbpm/test/cts/processengine/MockProcessEngine.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/MockProcessEngineConfiguration.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestSetup.java
Log:
Refactor EngineProvider to Configuration

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/Configuration.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/Configuration.java	2008-09-25 04:23:02 UTC (rev 2370)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/Configuration.java	2008-09-25 05:40:46 UTC (rev 2371)
@@ -30,7 +30,7 @@
  * @author thomas.diesler at jboss.com
  * @since 18-Jun-2008
  */
-public abstract class Configuration
+public interface Configuration
 {
   /**
    * Get the ProcessEngine for this configuration
@@ -38,5 +38,5 @@
    * 
    * @return The configured instance of a process engine
    */
-  public abstract ProcessEngine getProcessEngine();
+  ProcessEngine getProcessEngine();
 }
\ No newline at end of file

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/MicrocontainerConfiguration.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/MicrocontainerConfiguration.java	2008-09-25 04:23:02 UTC (rev 2370)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/MicrocontainerConfiguration.java	2008-09-25 05:40:46 UTC (rev 2371)
@@ -37,7 +37,7 @@
  * @author thomas.diesler at jboss.com
  * @since 18-Jun-2008
  */
-public class MicrocontainerConfiguration extends Configuration
+public class MicrocontainerConfiguration implements Configuration
 {
   /** The process engine bean name - jBPMEngine */
   public static final String BEAN_NAME = "jBPMProcessEngine";
@@ -88,6 +88,7 @@
     }
 
     ProcessEngine engine = (ProcessEngine)entry.getTarget();
+    ProcessEngine.registerProcessEngine(engine);
     return engine;
   }
 }
\ No newline at end of file

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ProcessEngine.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ProcessEngine.java	2008-09-25 04:23:02 UTC (rev 2370)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/client/ProcessEngine.java	2008-09-25 05:40:46 UTC (rev 2371)
@@ -46,7 +46,7 @@
   // The process engine registry
   private static Map<String, ProcessEngine> engineRegistry = new HashMap<String, ProcessEngine>();
   // The name of this engine
-  private String name = "default";
+  private String name;
   // Flag to indicate that the Engine is shutting down
   private boolean prepareForShutdown;
 

Modified: jbpm4/trunk/modules/cts/src/test/java/org/jbpm/test/cts/processengine/MockProcessEngine.java
===================================================================
--- jbpm4/trunk/modules/cts/src/test/java/org/jbpm/test/cts/processengine/MockProcessEngine.java	2008-09-25 04:23:02 UTC (rev 2370)
+++ jbpm4/trunk/modules/cts/src/test/java/org/jbpm/test/cts/processengine/MockProcessEngine.java	2008-09-25 05:40:46 UTC (rev 2371)
@@ -34,7 +34,7 @@
 public class MockProcessEngine extends ProcessEngine
 {
   @Override
-  protected void setName(String name)
+  public void setName(String name)
   {
     super.setName(name);
   }

Added: jbpm4/trunk/modules/cts/src/test/resources/log4j.xml
===================================================================
--- jbpm4/trunk/modules/cts/src/test/resources/log4j.xml	                        (rev 0)
+++ jbpm4/trunk/modules/cts/src/test/resources/log4j.xml	2008-09-25 05:40:46 UTC (rev 2371)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+  <!-- ================================= -->
+  <!-- Preserve messages in a local file -->
+  <!-- ================================= -->
+
+  <appender name="FILE" class="org.apache.log4j.FileAppender">
+    <param name="File" value="${log4j.output.dir}/test.log"/>
+    <param name="Append" value="false"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <!-- The default pattern: Date Priority [Category] Message\n -->
+      <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+    </layout>
+  </appender>
+  
+  <!-- ============================== -->
+  <!-- Append messages to the console -->
+  <!-- ============================== -->
+
+  <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+    <param name="Target" value="System.out" />
+    <param name="Threshold" value="INFO" />
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
+    </layout>
+  </appender>
+
+  <!-- ================ -->
+  <!-- Limit categories -->
+  <!-- ================ -->
+
+  <!-- Apache HTTP Client -->
+  <category name="org.apache.commons.httpclient">
+    <priority value="INFO" />
+  </category>
+  <category name="httpclient.wire">
+    <priority value="INFO" />
+  </category>
+
+  <!-- ======================= -->
+  <!-- Setup the Root category -->
+  <!-- ======================= -->
+
+  <root>
+    <!--appender-ref ref="CONSOLE"/-->
+    <appender-ref ref="FILE"/>
+  </root>
+
+</log4j:configuration>
\ No newline at end of file


Property changes on: jbpm4/trunk/modules/cts/src/test/resources/log4j.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/MockProcessEngineConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/MockProcessEngineConfiguration.java	2008-09-25 04:23:02 UTC (rev 2370)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/MockProcessEngineConfiguration.java	2008-09-25 05:40:46 UTC (rev 2371)
@@ -32,7 +32,7 @@
  * @author thomas.diesler at jboss.com
  * @since 24-Sep-2008
  */
-public class MockProcessEngineConfiguration extends Configuration
+public class MockProcessEngineConfiguration implements Configuration
 {
   public ProcessEngine getProcessEngine()
   {

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestSetup.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestSetup.java	2008-09-25 04:23:02 UTC (rev 2370)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/test/base/EnvironmentFactoryTestSetup.java	2008-09-25 05:40:46 UTC (rev 2371)
@@ -13,35 +13,39 @@
  **/
 package org.jbpm.pvm.test.base;
 
-
 import junit.extensions.TestSetup;
 import junit.framework.Test;
 
-
 /**
  * @author Guillaume Porcher
- *
+ * 
  */
-public class EnvironmentFactoryTestSetup extends TestSetup {
+public class EnvironmentFactoryTestSetup extends TestSetup
+{
+  private String configResource;
 
-  private String configResource;
-  /**
-   * @param test
-   */
-  public EnvironmentFactoryTestSetup(Test test, String configResource) {
+  public EnvironmentFactoryTestSetup(Test test)
+  {
+    this(test, "environment.cfg.xml");
+  }
+
+  public EnvironmentFactoryTestSetup(Test test, String configResource)
+  {
     super(test);
     this.configResource = configResource;
   }
 
   @Override
-  protected void setUp() throws Exception {
+  protected void setUp() throws Exception
+  {
+    super.setUp();
     EnvironmentFactoryTestCase.createEnvironmentFactory(configResource);
-    super.setUp();
   }
-  
+
   @Override
-  protected void tearDown() throws Exception {
+  protected void tearDown() throws Exception
+  {
+    EnvironmentFactoryTestCase.closeEnvironmentFactory(configResource);
     super.tearDown();
-    EnvironmentFactoryTestCase.closeEnvironmentFactory(configResource);
   }
 }

Added: jbpm4/trunk/modules/pvm/src/main/resources/org.jbpm.api.client.Configuration
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/org.jbpm.api.client.Configuration	                        (rev 0)
+++ jbpm4/trunk/modules/pvm/src/main/resources/org.jbpm.api.client.Configuration	2008-09-25 05:40:46 UTC (rev 2371)
@@ -0,0 +1 @@
+org.jbpm.pvm.MockProcessEngineConfiguration
\ No newline at end of file

Deleted: jbpm4/trunk/modules/pvm/src/main/resources/org.jbpm.api.client.ProcessEngineProvider
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/org.jbpm.api.client.ProcessEngineProvider	2008-09-25 04:23:02 UTC (rev 2370)
+++ jbpm4/trunk/modules/pvm/src/main/resources/org.jbpm.api.client.ProcessEngineProvider	2008-09-25 05:40:46 UTC (rev 2371)
@@ -1 +0,0 @@
-org.jbpm.pvm.MockProcessEngineProvider
\ No newline at end of file




More information about the jbpm-commits mailing list