[jbpm-commits] JBoss JBPM SVN: r2127 - in jbpm3/trunk: modules/enterprise and 9 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Sep 5 05:18:05 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-09-05 05:18:05 -0400 (Fri, 05 Sep 2008)
New Revision: 2127

Added:
   jbpm3/trunk/modules/jpdl/simulation/src/test/resources/
   jbpm3/trunk/modules/jpdl/simulation/src/test/resources/log4j.xml
Modified:
   jbpm3/trunk/modules/enterprise/pom.xml
   jbpm3/trunk/modules/jpdl/core/pom.xml
   jbpm3/trunk/modules/jpdl/identity/pom.xml
   jbpm3/trunk/modules/jpdl/integration/.classpath
   jbpm3/trunk/modules/jpdl/simulation/.classpath
   jbpm3/trunk/modules/jpdl/simulation/src/main/java/org/jbpm/sim/bam/BamSimulationProposal.java
   jbpm3/trunk/modules/jpdl/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationModel.java
   jbpm3/trunk/modules/jpdl/simulation/src/main/java/org/jbpm/sim/report/InMemoryOutput.java
   jbpm3/trunk/pom.xml
Log:
enable simulation tests

Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml	2008-09-05 08:52:11 UTC (rev 2126)
+++ jbpm3/trunk/modules/enterprise/pom.xml	2008-09-05 09:18:05 UTC (rev 2127)
@@ -86,16 +86,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   
   <!-- Plugins -->

Modified: jbpm3/trunk/modules/jpdl/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/core/pom.xml	2008-09-05 08:52:11 UTC (rev 2126)
+++ jbpm3/trunk/modules/jpdl/core/pom.xml	2008-09-05 09:18:05 UTC (rev 2127)
@@ -84,11 +84,6 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
       <scope>test</scope>

Modified: jbpm3/trunk/modules/jpdl/identity/pom.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/identity/pom.xml	2008-09-05 08:52:11 UTC (rev 2126)
+++ jbpm3/trunk/modules/jpdl/identity/pom.xml	2008-09-05 09:18:05 UTC (rev 2127)
@@ -49,16 +49,6 @@
       <version>${version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
    <!-- Plugins -->

Modified: jbpm3/trunk/modules/jpdl/integration/.classpath
===================================================================
--- jbpm3/trunk/modules/jpdl/integration/.classpath	2008-09-05 08:52:11 UTC (rev 2126)
+++ jbpm3/trunk/modules/jpdl/integration/.classpath	2008-09-05 09:18:05 UTC (rev 2127)
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>

Modified: jbpm3/trunk/modules/jpdl/simulation/.classpath
===================================================================
--- jbpm3/trunk/modules/jpdl/simulation/.classpath	2008-09-05 08:52:11 UTC (rev 2126)
+++ jbpm3/trunk/modules/jpdl/simulation/.classpath	2008-09-05 09:18:05 UTC (rev 2127)
@@ -3,6 +3,7 @@
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>

Modified: jbpm3/trunk/modules/jpdl/simulation/src/main/java/org/jbpm/sim/bam/BamSimulationProposal.java
===================================================================
--- jbpm3/trunk/modules/jpdl/simulation/src/main/java/org/jbpm/sim/bam/BamSimulationProposal.java	2008-09-05 08:52:11 UTC (rev 2126)
+++ jbpm3/trunk/modules/jpdl/simulation/src/main/java/org/jbpm/sim/bam/BamSimulationProposal.java	2008-09-05 09:18:05 UTC (rev 2127)
@@ -3,31 +3,31 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.dom4j.Element;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
 import org.jbpm.sim.def.JbpmSimulationScenario;
 
 /**
- * contains statistics about the history of a process
- * (like processing times of tasks, outgoing
- * probabilities of decisions, ....)
+ * contains statistics about the history of a process (like processing times of tasks, outgoing probabilities of decisions, ....)
  * 
- * can be used to generate a XML scenario configuration or directly
- * a <code>JbpmSimulationScenario</code> object.
+ * can be used to generate a XML scenario configuration or directly a <code>JbpmSimulationScenario</code> object.
  * 
  * @author bernd.ruecker at camunda.com
  */
-public class BamSimulationProposal {
-  
+public class BamSimulationProposal
+{
+  private static final Log log = LogFactory.getLog(BamSimulationProposal.class);
+
   private String processName;
-  
+
   private int processVersion;
-  
+
   private String[] swimlanes;
 
   /**
@@ -38,62 +38,71 @@
   private ArrayList decisionProposals = new ArrayList();
 
   private ArrayList taskProposals = new ArrayList();
-  
+
   private ElementStatistics processStatistics;
-  
-  public BamSimulationProposal() {    
-  }  
 
-  public BamSimulationProposal(String processName, int processVersion) {
+  public BamSimulationProposal()
+  {
+  }
+
+  public BamSimulationProposal(String processName, int processVersion)
+  {
     this.processName = processName;
     this.processVersion = processVersion;
   }
-  
+
   /**
    * TODO: implement
    */
-  public JbpmSimulationScenario getScenario() {
+  public JbpmSimulationScenario getScenario()
+  {
     return null;
   }
-  
+
   /**
    * create a new scenario with this process as only process
+   * 
    * @return
    */
-  public Element createScenarioConfigurationXml() {
+  public Element createScenarioConfigurationXml()
+  {
     Element result = org.dom4j.DocumentFactory.getInstance().createElement("scenario");
     result.addAttribute("name", "status_quo");
-    
+
     addProcessToScenarioXml(result);
 
-    
     return result;
   }
-  
+
   /**
    * adds this process to the already given scenario (as XML)
+   * 
    * @param scenario
    */
-  public void addProcessToScenarioXml(Element scenario) {
+  public void addProcessToScenarioXml(Element scenario)
+  {
     Element simProcess = scenario.addElement("sim-process");
     // set default path for process
     simProcess.addAttribute("path", "/" + getProcessName() + "/processdefinition.xml");
-    
+
     // set start distribution
     String startEventDistName = addErlangDistributionElement(scenario, getProcessStatistics());
     simProcess.addElement("process-overwrite").addAttribute("start-distribution", startEventDistName);
-    
+
     // retrieve already existing swimlanes of the scenario
-    HashSet alreadyAddedSwimlanes = new HashSet();    
+    HashSet alreadyAddedSwimlanes = new HashSet();
     Iterator iter = scenario.elementIterator("resource-pool");
-    while (iter.hasNext()) {
-      Element rp = (Element) iter.next();
-      alreadyAddedSwimlanes.add( rp.attributeValue("name") );
+    while (iter.hasNext())
+    {
+      Element rp = (Element)iter.next();
+      alreadyAddedSwimlanes.add(rp.attributeValue("name"));
     }
-    
+
     // add resource pools with default size for non existing swimlanes
-    for (int i = 0; i < swimlanes.length; i++) {
-      if (!alreadyAddedSwimlanes.contains(swimlanes[i])) {
+    for (int i = 0; i < swimlanes.length; i++)
+    {
+      if (!alreadyAddedSwimlanes.contains(swimlanes[i]))
+      {
         Element rp = scenario.addElement("resource-pool");
         rp.addAttribute("name", swimlanes[i]);
         rp.addAttribute("pool-size", "1");
@@ -104,54 +113,58 @@
 
     // loop over states
     iter = stateProposals.iterator();
-    while (iter.hasNext()) {
-      ElementStatistics statistics = (ElementStatistics) iter.next();
-      
+    while (iter.hasNext())
+    {
+      ElementStatistics statistics = (ElementStatistics)iter.next();
+
       // add distributions with default name
       String distName = addNormalDistributionElement(scenario, statistics);
-      
+
       // add state-overwrite
       Element stateElement = simProcess.addElement("state-overwrite");
       stateElement.addAttribute("state-name", statistics.getName());
       stateElement.addAttribute("time-distribution", distName);
-      
+
       addLeavingTransitionElements(statistics, stateElement);
     }
 
     // loop over decisions
     iter = decisionProposals.iterator();
-    while (iter.hasNext()) {
-      ElementStatistics statistics = (ElementStatistics) iter.next();
-      
+    while (iter.hasNext())
+    {
+      ElementStatistics statistics = (ElementStatistics)iter.next();
+
       // add decision-overwrite
       Element stateElement = simProcess.addElement("decision-overwrite");
       stateElement.addAttribute("decision-name", statistics.getName());
-      
+
       addLeavingTransitionElements(statistics, stateElement);
     }
-    
+
     // loop over tasks
     iter = taskProposals.iterator();
-    while (iter.hasNext()) {
-      ElementStatistics statistics = (ElementStatistics) iter.next();
-      
+    while (iter.hasNext())
+    {
+      ElementStatistics statistics = (ElementStatistics)iter.next();
+
       // add distributions with default name
       String distName = addNormalDistributionElement(scenario, statistics);
-      
+
       // add task-overwrite
       Element stateElement = simProcess.addElement("task-overwrite");
       stateElement.addAttribute("task-name", statistics.getName());
       stateElement.addAttribute("time-distribution", distName);
-      
+
       addLeavingTransitionElements(statistics, stateElement);
-    }    
+    }
   }
 
-  private void addLeavingTransitionElements(ElementStatistics statistics,
-      Element stateElement) {
+  private void addLeavingTransitionElements(ElementStatistics statistics, Element stateElement)
+  {
     // loop over leaving transitions
     TransitionProbability[] transitionProbabilities = statistics.getLeavingTransitionProbabilities();
-    for (int i = 0; i < transitionProbabilities.length; i++) {
+    for (int i = 0; i < transitionProbabilities.length; i++)
+    {
       // add probability
       Element transitionElement = stateElement.addElement("transition");
       transitionElement.addAttribute("name", transitionProbabilities[i].getTransitionName());
@@ -159,163 +172,187 @@
     }
   }
 
-  private String addErlangDistributionElement(Element scenario, ElementStatistics stat) {
+  private String addErlangDistributionElement(Element scenario, ElementStatistics stat)
+  {
     return addDistributionElement(scenario, stat, "erlang", "real");
   }
-  
-  private String addNormalDistributionElement(Element scenario, ElementStatistics stat) {
+
+  private String addNormalDistributionElement(Element scenario, ElementStatistics stat)
+  {
     return addDistributionElement(scenario, stat, "normal", "real");
-  }  
+  }
 
-  private String addDistributionElement(Element scenario, ElementStatistics stat, String type, String sampleType) {
+  private String addDistributionElement(Element scenario, ElementStatistics stat, String type, String sampleType)
+  {
     String name = getProcessName() + "." + stat.getName();
     Element dist = scenario.addElement("distribution");
     dist.addAttribute("name", name);
-    dist.addAttribute("sample-type", sampleType);        
+    dist.addAttribute("sample-type", sampleType);
     dist.addAttribute("type", type);
-    dist.addAttribute("mean", String.valueOf( stat.getDurationAverage() ));
-    dist.addAttribute("standardDeviation", String.valueOf( stat.getDurationStddev() ));    
+    dist.addAttribute("mean", String.valueOf(stat.getDurationAverage()));
+    dist.addAttribute("standardDeviation", String.valueOf(stat.getDurationStddev()));
     return name;
   }
 
-
-  public void addStateProposal(ElementStatistics stat) {
+  public void addStateProposal(ElementStatistics stat)
+  {
     stateProposals.add(stat);
   }
-  
-  public ElementStatistics[] getStateProposals() {
-    return (ElementStatistics[]) stateProposals.toArray(new ElementStatistics[0]);
+
+  public ElementStatistics[] getStateProposals()
+  {
+    return (ElementStatistics[])stateProposals.toArray(new ElementStatistics[0]);
   }
 
-  public void addDecisionProposal(ElementStatistics statistics) {
+  public void addDecisionProposal(ElementStatistics statistics)
+  {
     decisionProposals.add(statistics);
   }
 
-  public ElementStatistics[] getDecisionProposals() {
-    return (ElementStatistics[]) decisionProposals.toArray(new ElementStatistics[0] );
+  public ElementStatistics[] getDecisionProposals()
+  {
+    return (ElementStatistics[])decisionProposals.toArray(new ElementStatistics[0]);
   }
-  
-  public void addTaskProposal(ElementStatistics statistics) {
+
+  public void addTaskProposal(ElementStatistics statistics)
+  {
     taskProposals.add(statistics);
   }
 
-  public ElementStatistics[] getTaskProposals() {
-    return (ElementStatistics[]) taskProposals.toArray(new ElementStatistics[0] );
+  public ElementStatistics[] getTaskProposals()
+  {
+    return (ElementStatistics[])taskProposals.toArray(new ElementStatistics[0]);
   }
 
-  public static void print(Element scenarioXml) {
-    System.out.println(getXmlAsString(scenarioXml));
+  public static void print(Element scenarioXml)
+  {
+    log.debug(getXmlAsString(scenarioXml));
   }
-  
-  public static String getXmlAsString(Element scenarioXml) {
+
+  public static String getXmlAsString(Element scenarioXml)
+  {
     StringWriter stringWriter = new StringWriter();
-    try {
+    try
+    {
       OutputFormat format = OutputFormat.createPrettyPrint();
       XMLWriter xmlWriter = new XMLWriter(stringWriter, format);
       xmlWriter.write(scenarioXml);
     }
-    catch (IOException ex) {
+    catch (IOException ex)
+    {
       throw new RuntimeException("couldn't write XML to string", ex);
     }
     return stringWriter.toString();
   }
-  
+
   /**
-   * print out result on System.out.println
+   * print out result on log.debug
    * 
    * ONLY FOR TESTING PURPOSES WHEN PLAYING AROUND...
+   * 
    * @param result
    */
-  public static void print(BamSimulationProposal result) {
-    System.out.println( "\n\n------ PROCESS " + result.getProcessName() + " / Version: " + result.getProcessVersion() + " ---------" );        
-    System.out.println( "  start event sample count    = " + result.getProcessStatistics().getSampleCount() );        
-    System.out.println( "  start event interval min    = " + result.getProcessStatistics().getDurationMin() );        
-    System.out.println( "  start event interval max    = " + result.getProcessStatistics().getDurationMax() );        
-    System.out.println( "  start event interval avg    = " + result.getProcessStatistics().getDurationAverage() );        
-    System.out.println( "  start event interval stddev = " + result.getProcessStatistics().getDurationStddev() );   
+  public static void print(BamSimulationProposal result)
+  {
+    log.debug("\n\n------ PROCESS " + result.getProcessName() + " / Version: " + result.getProcessVersion() + " ---------");
+    log.debug("  start event sample count    = " + result.getProcessStatistics().getSampleCount());
+    log.debug("  start event interval min    = " + result.getProcessStatistics().getDurationMin());
+    log.debug("  start event interval max    = " + result.getProcessStatistics().getDurationMax());
+    log.debug("  start event interval avg    = " + result.getProcessStatistics().getDurationAverage());
+    log.debug("  start event interval stddev = " + result.getProcessStatistics().getDurationStddev());
 
-    
-    System.out.println( "\n------ STATEs ---------" );        
+    log.debug("\n------ STATEs ---------");
 
-    for (int i = 0; i < result.getStateProposals().length; i++) {
+    for (int i = 0; i < result.getStateProposals().length; i++)
+    {
       ElementStatistics stat = result.getStateProposals()[i];
-      System.out.println( stat.getName() + ": " );     
-      System.out.println( "  sample count    = " + stat.getSampleCount() );        
-      System.out.println( "  duration min    = " + stat.getDurationMin() );        
-      System.out.println( "  duration max    = " + stat.getDurationMax() );        
-      System.out.println( "  duration avg    = " + stat.getDurationAverage() );        
-      System.out.println( "  duration stddev = " + stat.getDurationStddev() );   
-      
-      for (int j = 0; j < stat.getLeavingTransitionProbabilities().length; j++) {
-        System.out.println( "  -> " + stat.getLeavingTransitionProbabilities()[j].getTransitionName() 
-            + ": " + stat.getLeavingTransitionProbabilities()[j].getCount() );           
+      log.debug(stat.getName() + ": ");
+      log.debug("  sample count    = " + stat.getSampleCount());
+      log.debug("  duration min    = " + stat.getDurationMin());
+      log.debug("  duration max    = " + stat.getDurationMax());
+      log.debug("  duration avg    = " + stat.getDurationAverage());
+      log.debug("  duration stddev = " + stat.getDurationStddev());
+
+      for (int j = 0; j < stat.getLeavingTransitionProbabilities().length; j++)
+      {
+        log.debug("  -> " + stat.getLeavingTransitionProbabilities()[j].getTransitionName() + ": " + stat.getLeavingTransitionProbabilities()[j].getCount());
       }
     }
 
-    System.out.println( "\n------ DECISIONs ---------" );        
-    for (int i = 0; i < result.getDecisionProposals().length; i++) {
+    log.debug("\n------ DECISIONs ---------");
+    for (int i = 0; i < result.getDecisionProposals().length; i++)
+    {
       ElementStatistics stat = result.getDecisionProposals()[i];
-      System.out.println( stat.getName() + ": " );     
+      log.debug(stat.getName() + ": ");
 
-      System.out.println( "  sample count    = " + stat.getSampleCount() );        
-      System.out.println( "  duration min    = " + stat.getDurationMin() );        
-      System.out.println( "  duration max    = " + stat.getDurationMax() );        
-      System.out.println( "  duration avg    = " + stat.getDurationAverage() );        
-      System.out.println( "  duration stddev = " + stat.getDurationStddev() );   
+      log.debug("  sample count    = " + stat.getSampleCount());
+      log.debug("  duration min    = " + stat.getDurationMin());
+      log.debug("  duration max    = " + stat.getDurationMax());
+      log.debug("  duration avg    = " + stat.getDurationAverage());
+      log.debug("  duration stddev = " + stat.getDurationStddev());
 
-      for (int j = 0; j < stat.getLeavingTransitionProbabilities().length; j++) {
-        System.out.println( "  -> " + stat.getLeavingTransitionProbabilities()[j].getTransitionName() 
-            + ": " + stat.getLeavingTransitionProbabilities()[j].getCount() );           
+      for (int j = 0; j < stat.getLeavingTransitionProbabilities().length; j++)
+      {
+        log.debug("  -> " + stat.getLeavingTransitionProbabilities()[j].getTransitionName() + ": " + stat.getLeavingTransitionProbabilities()[j].getCount());
       }
     }
-    
-    System.out.println( "\n------ TASKs ---------" );        
 
-    for (int i = 0; i < result.getTaskProposals().length; i++) {
+    log.debug("\n------ TASKs ---------");
+
+    for (int i = 0; i < result.getTaskProposals().length; i++)
+    {
       ElementStatistics stat = result.getTaskProposals()[i];
-      System.out.println( stat.getName() + ": " );     
-      System.out.println( "  sample count    = " + stat.getSampleCount() );        
-      System.out.println( "  duration min    = " + stat.getDurationMin() );        
-      System.out.println( "  duration max    = " + stat.getDurationMax() );        
-      System.out.println( "  duration avg    = " + stat.getDurationAverage() );        
-      System.out.println( "  duration stddev = " + stat.getDurationStddev() );   
-      
-      for (int j = 0; j < stat.getLeavingTransitionProbabilities().length; j++) {
-        System.out.println( "  -> " + stat.getLeavingTransitionProbabilities()[j].getTransitionName() 
-            + ": " + stat.getLeavingTransitionProbabilities()[j].getCount() );           
+      log.debug(stat.getName() + ": ");
+      log.debug("  sample count    = " + stat.getSampleCount());
+      log.debug("  duration min    = " + stat.getDurationMin());
+      log.debug("  duration max    = " + stat.getDurationMax());
+      log.debug("  duration avg    = " + stat.getDurationAverage());
+      log.debug("  duration stddev = " + stat.getDurationStddev());
+
+      for (int j = 0; j < stat.getLeavingTransitionProbabilities().length; j++)
+      {
+        log.debug("  -> " + stat.getLeavingTransitionProbabilities()[j].getTransitionName() + ": " + stat.getLeavingTransitionProbabilities()[j].getCount());
       }
     }
   }
 
-  public ElementStatistics getProcessStatistics() {
+  public ElementStatistics getProcessStatistics()
+  {
     return processStatistics;
   }
 
-  public void setProcessStatistics(ElementStatistics processStatistics) {
+  public void setProcessStatistics(ElementStatistics processStatistics)
+  {
     this.processStatistics = processStatistics;
   }
 
-  public int getProcessVersion() {
+  public int getProcessVersion()
+  {
     return processVersion;
   }
 
-  public void setProcessVersion(int processVersion) {
+  public void setProcessVersion(int processVersion)
+  {
     this.processVersion = processVersion;
   }
 
-  public String getProcessName() {
+  public String getProcessName()
+  {
     return processName;
   }
 
-  public void setProcessName(String processName) {
+  public void setProcessName(String processName)
+  {
     this.processName = processName;
   }
 
-  public String[] getSwimlanes() {
+  public String[] getSwimlanes()
+  {
     return swimlanes;
   }
 
-  public void setSwimlanes(String[] swimlanes) {
+  public void setSwimlanes(String[] swimlanes)
+  {
     this.swimlanes = swimlanes;
-  }  
+  }
 }

Modified: jbpm3/trunk/modules/jpdl/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationModel.java
===================================================================
--- jbpm3/trunk/modules/jpdl/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationModel.java	2008-09-05 08:52:11 UTC (rev 2126)
+++ jbpm3/trunk/modules/jpdl/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationModel.java	2008-09-05 09:18:05 UTC (rev 2127)
@@ -320,10 +320,10 @@
 //    // and build an observer to it
 //    Observer plotter = new Observer() {
 //      public void update(Observable obs, Object value) {
-//        System.out.println("YYYYY " + 
+//        log.debug("YYYYY " + 
 //         availableResourceTimeSeries.getDataValues().toArray().length + " | " +
 //         availableResourceTimeSeries.getTimeValues().toArray().length);
-//         System.out.println("XXXXXXX " + obs + ": " + value);
+//         log.debug("XXXXXXX " + obs + ": " + value);
 //      }
 //    };
 //    pool.getAvailableResourceTimeSeries().connectToPlotter(plotter);

Modified: jbpm3/trunk/modules/jpdl/simulation/src/main/java/org/jbpm/sim/report/InMemoryOutput.java
===================================================================
--- jbpm3/trunk/modules/jpdl/simulation/src/main/java/org/jbpm/sim/report/InMemoryOutput.java	2008-09-05 08:52:11 UTC (rev 2126)
+++ jbpm3/trunk/modules/jpdl/simulation/src/main/java/org/jbpm/sim/report/InMemoryOutput.java	2008-09-05 09:18:05 UTC (rev 2127)
@@ -65,7 +65,7 @@
      * it observers.
      */
     Reportable source = r.getReportable();
-//    System.out.println( "SOURCE: " + (source!=null ? source + "[" + source.getClass().getName() + "]" : "NULL"));
+//    log.debug( "SOURCE: " + (source!=null ? source + "[" + source.getClass().getName() + "]" : "NULL"));
     String scenarioName = getScenarioName(r.getModel().getExperiment());
 
     // if this is not possible, we do not run in a jbpm simulation

Added: jbpm3/trunk/modules/jpdl/simulation/src/test/resources/log4j.xml
===================================================================
--- jbpm3/trunk/modules/jpdl/simulation/src/test/resources/log4j.xml	                        (rev 0)
+++ jbpm3/trunk/modules/jpdl/simulation/src/test/resources/log4j.xml	2008-09-05 09:18:05 UTC (rev 2127)
@@ -0,0 +1,57 @@
+<?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:%L] %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} [%t] %-5p %C{1} : %m%n" />
+    </layout>
+  </appender>
+
+  <!-- ================ -->
+  <!-- Limit categories -->
+  <!-- ================ -->
+
+  <category name="org.jbpm">
+    <priority value="DEBUG" />
+  </category>
+
+  <category name="org.hibernate">
+    <priority value="INFO" />
+  </category>
+
+  <!-- hide optimistic locking failures -->
+  <category name="org.hibernate.event.def.AbstractFlushingEventListener">
+    <priority value="FATAL" />
+  </category>
+
+  <!-- ======================= -->
+  <!-- Setup the Root category -->
+  <!-- ======================= -->
+
+  <root>
+    <!--appender-ref ref="CONSOLE"/-->
+    <appender-ref ref="FILE"/>
+  </root>
+
+</log4j:configuration>


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

Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml	2008-09-05 08:52:11 UTC (rev 2126)
+++ jbpm3/trunk/pom.xml	2008-09-05 09:18:05 UTC (rev 2127)
@@ -377,6 +377,20 @@
     </dependencies>
   </dependencyManagement>
 
+  <!-- Dependencies -->
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  
   <!-- Plugins -->
   <build>
     <plugins>




More information about the jbpm-commits mailing list