[jbpm-commits] JBoss JBPM SVN: r5258 - in jbpm3/branches/jbpm-3.2-soa: modules/simulation and 3 other directories.

Author: alex.guizar(a)jboss.com Date: 2009-07-08 05:38:46 -0400 (Wed, 08 Jul 2009) New Revision: 5258 Removed: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/SimulationTestCase.java Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationExperiment.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/ExperimentReader.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/BusinessFiguresTest.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/LanguageDefinitionTest.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/OneStateTest.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/OneTaskTest.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/ScenarioTest.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/SteadyStateResetTest.java jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/VariableSourceAndFilterTest.java jbpm3/branches/jbpm-3.2-soa/pom.xml Log: JBPM-1292: Integrate simulation tests in automated testrun (CODING IN PROGRESS) Remove fixed dependency versions | write report files to build directory | do not show graphical progress bar in automated tests Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2009-07-08 09:29:32 UTC (rev 5257) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/pom.xml 2009-07-08 09:38:46 UTC (rev 5258) @@ -10,13 +10,14 @@ <!-- ====================================================================== --> <!-- $Id$ --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss jBPM3 - Simulation</name> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-simulation</artifactId> <packaging>jar</packaging> - + <!-- Parent --> <parent> <groupId>org.jbpm.jbpm3</groupId> @@ -24,7 +25,33 @@ <version>3.2.7</version> <relativePath>../../pom.xml</relativePath> </parent> - + + <!-- Profiles --> + <profiles> + <!-- + Name: jdk14 + Desc: dependencies specific to jdk 1.4 + --> + <profile> + <id>jdk14</id> + <activation> + <jdk>1.4</jdk> + </activation> + <dependencies> + <dependency> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> + <!-- Dependencies --> <dependencies> <!-- jBPM Dependencies --> @@ -33,7 +60,7 @@ <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> </dependency> - + <!-- Compile Dependencies --> <dependency> <groupId>desmoj</groupId> @@ -44,16 +71,6 @@ <artifactId>dom4j</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.6</version> - </dependency> - <dependency> <groupId>jasperreports</groupId> <artifactId>jasperreports</artifactId> <exclusions> @@ -65,13 +82,17 @@ <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> </exclusion> + <exclusion> + <artifactId>jdtcore</artifactId> + <groupId>eclipse</groupId> + </exclusion> </exclusions> </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> </dependency> - + <!-- Test Dependencies --> <dependency> <groupId>junit</groupId> @@ -79,17 +100,4 @@ <scope>test</scope> </dependency> </dependencies> - - <!-- Plugins --> - <build> - <plugins> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- [JBPM-1292] Integrate simulation tests in automated testrun --> - <skipTests>true</skipTests> - </configuration> - </plugin> - </plugins> - </build> </project> Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationExperiment.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationExperiment.java 2009-07-08 09:29:32 UTC (rev 5257) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/def/JbpmSimulationExperiment.java 2009-07-08 09:38:46 UTC (rev 5258) @@ -6,10 +6,8 @@ import java.util.Date; import java.util.HashMap; import java.util.Iterator; -import java.util.List; import java.util.Map; -import org.jbpm.JbpmContext; import org.jbpm.sim.exception.ExperimentConfigurationException; import org.jbpm.sim.exe.SimulationProgressListener; import org.jbpm.sim.report.ExperimentReport; @@ -209,7 +207,8 @@ new SimpleDateFormat(JbpmSimulationScenario.DATE_PATTERN).parse(realStartTimeString)); } catch (ParseException e) { - throw new ExperimentConfigurationException("format of real start date ('" + realStartTimeString +"') is invalid. The cirrect pattern is '" + JbpmSimulationScenario.DATE_PATTERN + "'", e); + throw new ExperimentConfigurationException("real start date '" + realStartTimeString + + "' does not match pattern '" + JbpmSimulationScenario.DATE_PATTERN + "'", e); } } Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/ExperimentReader.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/ExperimentReader.java 2009-07-08 09:29:32 UTC (rev 5257) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/main/java/org/jbpm/sim/exe/ExperimentReader.java 2009-07-08 09:38:46 UTC (rev 5258) @@ -1,7 +1,6 @@ package org.jbpm.sim.exe; import java.io.StringReader; -import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -40,6 +39,7 @@ */ public class ExperimentReader implements ProblemListener { + private static final long serialVersionUID = 1L; private static Log log = LogFactory.getLog(ExperimentReader.class); private InputSource inputSource = null; @@ -139,7 +139,7 @@ // read output parameters Element outputElement = root.element("output"); if (outputElement!=null) { - String outputPathName = root.attributeValue("path"); + String outputPathName = outputElement.attributeValue("path"); experiment.setOutputPathName(outputPathName); } @@ -374,8 +374,6 @@ private void readNodeOverwrite(ProcessDefinition pd, Element e) { String nodeName = e.attributeValue("node-name"); - - SimulationDefinition sd = ((SimulationDefinition)pd.getDefinition(SimulationDefinition.class)); Node node = pd.getNode(nodeName); readUseDataSourceEvent(node, e, Event.EVENTTYPE_NODE_ENTER); Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/BusinessFiguresTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/BusinessFiguresTest.java 2009-07-08 09:29:32 UTC (rev 5257) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/BusinessFiguresTest.java 2009-07-08 09:38:46 UTC (rev 5258) @@ -10,40 +10,41 @@ public class BusinessFiguresTest extends TestCase { - private String testProcessXml = "<process-definition name='test' start-distribution='startDist'>" - + + private static final String testProcessXml = "<process-definition name='test' start-distribution='startDist'>" - " <start-state name='start'>" + + " <start-state name='start'>" + " <transition to='node1' />" + " </start-state>" - + - " <node name='node1'>" + + " <node name='node1'>" + " <transition to='end'>" + " <simulation-action class='org.jbpm.sim.kpi.BusinessFigureAction'>" + " <name>testFigure</name> " + " </simulation-action>" + " </transition>" + " </node>" - + - " <end-state name='end'/>" - + + + " <end-state name='end'/>" - "</process-definition>"; + + "</process-definition>"; - private String experimentConfiguration = "<experiment name='MySimulationExperiment'" + private static final String experimentConfiguration = "<experiment name='MySimulationExperiment'" + " run-time='100'" + " real-start-time='01.01.1970 01:00:00:002'" + " time-unit='minute'>" + " <scenario name ='test'>" + " <distribution name='startDist' sample-type='real' type='constant' value='20' /> " + + " <sim-process name='test' />" + + " <business-figure name='testFigure' type='costs' " + " automatic-calculation='none'" + // | process - start | process -end" " handler='org.jbpm.sim.BusinessFiguresTest$BusinessFigureHandler' />" + " </scenario>" + + + " <output path='target' />" // currently just used as parameter for DESMO-J + + "</experiment>"; public static class BusinessFigureHandler implements BusinessFigureCalculator { @@ -75,52 +76,47 @@ * process definition required */ - private String testProcessXml2 = "<process-definition name='test' start-distribution='startDist'>" - + + private static final String testProcessXml2 = "<process-definition name='test' start-distribution='startDist'>" - " <start-state name='start'>" + + " <start-state name='start'>" + " <transition to='node1' />" + " </start-state>" - + - " <node name='node1'>" + + " <node name='node1'>" + " <transition to='end' />" + " </node>" - + - " <end-state name='end'/>" - + + + " <end-state name='end'/>" - "</process-definition>"; + + "</process-definition>"; - private String experimentConfiguration2 = "<experiment name='MySimulationExperiment'" + private static final String experimentConfiguration2 = "<experiment name='MySimulationExperiment'" + " run-time='100'" + " real-start-time='01.01.1970 01:00:00:002'" + " time-unit='minute'>" + " <scenario name ='test'>" + " <distribution name='startDist' sample-type='real' type='constant' value='20' /> " - + - " <business-figure name='testFigure' type='costs' " + + " <business-figure name='testFigure' type='costs' " + " automatic-calculation='none'" + // | process - start | process -end" " handler='org.jbpm.sim.BusinessFiguresTest$BusinessFigureHandler' />" - + - " <sim-process name='test'>" + + " <sim-process name='test'>" + " <node-overwrite node-name='node1'>" + " <calculate-business-figure name='testFigure' /> " + " </node-overwrite> " + " </sim-process>" - + + + " </scenario>" - " </scenario>" + + " <output path='target' />" // currently just used as parameter for DESMO-J + + "</experiment>"; public void testBusinessFigureConfiguredInExperiment() { - ExperimentReader reader = new ExperimentReader(experimentConfiguration); + ExperimentReader reader = new ExperimentReader(experimentConfiguration2); // inject process definition - reader.addProcessDefinition("test", testProcessXml); + reader.addProcessDefinition("test", testProcessXml2); JbpmSimulationExperiment experiment = reader.readExperiment(); experiment.run(); Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/LanguageDefinitionTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/LanguageDefinitionTest.java 2009-07-08 09:29:32 UTC (rev 5257) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/LanguageDefinitionTest.java 2009-07-08 09:38:46 UTC (rev 5258) @@ -4,7 +4,6 @@ import java.util.Iterator; import java.util.List; -import org.jbpm.graph.def.Action; import org.jbpm.graph.def.ActionHandler; import org.jbpm.graph.def.ProcessDefinition; import org.jbpm.graph.exe.ExecutionContext; @@ -22,7 +21,8 @@ public class LanguageDefinitionTest extends TestCase { public void testDistributionsOnProcessElements() { - Experiment exp = new Experiment("Test"); + Experiment exp = new Experiment(getName(), "target"); + exp.setShowProgressBar(false); // distributions: type=real constant|empirical|erlang|exponential|normal|uniform // distributions: type=int constant|empirical|poison|uniform @@ -105,6 +105,8 @@ public static class TestAction implements ActionHandler { private boolean shouldBeExecuted; + private static final long serialVersionUID = 1L; + public void execute(ExecutionContext executionContext) throws Exception { if (!shouldBeExecuted) throw new RuntimeException("action '"+executionContext.getAction().getName()+"' should not be executed in a simulation run."); @@ -113,6 +115,8 @@ } public static class SimTestAction implements ActionHandler { + private static final long serialVersionUID = 1L; + public void execute(ExecutionContext executionContext) throws Exception { executedActions.add(executionContext.getAction()); } @@ -266,7 +270,9 @@ "</process-definition>" ; - Experiment exp = new Experiment("Test"); + Experiment exp = new Experiment(getName(), "target"); + exp.setShowProgressBar(false); + // make a new model with the given process DefaultJbpmSimulationModel model = new DefaultJbpmSimulationModel(processXml); // connect Experiment and Model @@ -316,7 +322,9 @@ "</process-definition>" ; - Experiment exp = new Experiment("Test"); + Experiment exp = new Experiment(getName(), "target"); + exp.setShowProgressBar(false); + DefaultJbpmSimulationModel model = new DefaultJbpmSimulationModel(processXml); model.connectToExperiment(exp); Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/OneStateTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/OneStateTest.java 2009-07-08 09:29:32 UTC (rev 5257) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/OneStateTest.java 2009-07-08 09:38:46 UTC (rev 5258) @@ -9,8 +9,9 @@ public class OneStateTest extends TestCase { public void testOneState() { - Experiment exp = new Experiment("Test"); - + Experiment exp = new Experiment(getName(), "target"); + exp.setShowProgressBar(false); + String processXml = "<process-definition>" + " <start-state name='a'>" + Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/OneTaskTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/OneTaskTest.java 2009-07-08 09:29:32 UTC (rev 5257) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/OneTaskTest.java 2009-07-08 09:38:46 UTC (rev 5258) @@ -14,8 +14,9 @@ public class OneTaskTest extends TestCase { public void testOneState() { - Experiment exp = new Experiment("Test"); - + Experiment exp = new Experiment(getName(), "target"); + exp.setShowProgressBar(false); + String processXml = "<process-definition>" + Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/ScenarioTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/ScenarioTest.java 2009-07-08 09:29:32 UTC (rev 5257) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/ScenarioTest.java 2009-07-08 09:38:46 UTC (rev 5258) @@ -1,6 +1,6 @@ package org.jbpm.sim; -import java.util.Date; +import java.util.Calendar; import org.jbpm.sim.def.JbpmSimulationExperiment; import org.jbpm.sim.def.JbpmSimulationScenario; @@ -56,7 +56,7 @@ String experimentConfiguration = "<experiment name='MySimulationExperiment'" + " run-time='100'" + - " real-start-time='01.01.1970 01:00:00:002'" + + " real-start-time='04.10.1982 14:30:10:500'" + " time-unit='minute'>" + " <scenario name='NormalStaffing'>" + @@ -81,13 +81,10 @@ // maybe more <scenario ... />'s // TODO: Think more about output options - " <output path='.'>" + // currently just used as parameter for DESMO-J - " </output>" + - + " <output path='target' />" + // currently just used as parameter for DESMO-J + "</experiment>"; - - ExperimentReader reader = new ExperimentReader(experimentConfiguration); reader.addProcessDefinition("test", testProcessXml ); @@ -96,9 +93,12 @@ assertNotNull(experiment); assertEquals("MySimulationExperiment", experiment.getName()); assertEquals(100.0, experiment.getSimulationRunTime(), 0.001); - assertEquals(new Date(2), experiment.getRealStartDate()); + Calendar calendar = Calendar.getInstance(); + calendar.set(1982, Calendar.OCTOBER, 4, 14, 30, 10); + calendar.set(Calendar.MILLISECOND, 500); + assertEquals(calendar.getTime(), experiment.getRealStartDate()); assertEquals(JbpmSimulationExperiment.MINUTES, experiment.getTimeUnit()); - assertEquals(".", experiment.getOutputPathName()); + assertEquals("target", experiment.getOutputPathName()); assertEquals(1, experiment.getScenarios().size()); JbpmSimulationScenario scenario = experiment.getScenario("NormalStaffing"); @@ -136,9 +136,8 @@ // maybe more <scenario ... />'s // TODO: Think more about output options - " <output path='./'>" + // currently just used as parameter for DESMO-J - " </output>" + - + " <output path='target' />" + // currently just used as parameter for DESMO-J + "</experiment>"; ExperimentReader reader = new ExperimentReader(experimentConfiguration); @@ -161,6 +160,7 @@ " <resource-pool name='tester' pool-size='5' />" + " <sim-process name='test' />" + " </scenario>" + + " <output path='target' />" + // currently just used as parameter for DESMO-J "</experiment>"; ExperimentReader reader = new ExperimentReader(experimentConfiguration); @@ -189,7 +189,6 @@ assertEquals(3, report2.getStateWaitingTimes().size()); assertEquals(1, report1.getCycleTimesValueStatistics().size()); assertEquals(2, report2.getResourcePoolWaitingTimes().size()); - } /** @@ -239,6 +238,7 @@ " <resource-pool name='clerk' pool-size='10' />" + " <sim-process name='test' />" + " </scenario>" + + " <output path='target' />" + // currently just used as parameter for DESMO-J "</experiment>"; ExperimentReader reader = new ExperimentReader(experimentConfiguration); @@ -327,6 +327,5 @@ assertEquals(20.89189, report5.getCycleTimesValueStatistics("test").getMean(), 0.0001); assertEquals( 0.0 , report5.getResourcePoolWaitingTimes("clerk").getAverageLength(), 0.0001); assertEquals( 0.0 , report5.getResourcePoolWaitingTimes("clerk").getAverageWaitTime(), 0.0001); - } } Deleted: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/SimulationTestCase.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/SimulationTestCase.java 2009-07-08 09:29:32 UTC (rev 5257) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/SimulationTestCase.java 2009-07-08 09:38:46 UTC (rev 5258) @@ -1,68 +0,0 @@ -package org.jbpm.sim; - -import java.io.StringReader; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Iterator; -import java.util.List; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -import junit.framework.TestCase; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jbpm.JbpmConfiguration; -import org.jbpm.JbpmContext; -import org.jbpm.graph.def.Event; -import org.jbpm.graph.def.ProcessDefinition; -import org.jbpm.graph.exe.ProcessInstance; -import org.jbpm.instantiation.UserCodeInterceptorConfig; -import org.jbpm.jpdl.xml.JpdlXmlReader; -import org.jbpm.logging.log.ProcessLog; -import org.jbpm.sim.action.StartTaskAndPlanCompletion; -import org.jbpm.sim.def.JbpmSimulationClock; -import org.jbpm.sim.jpdl.SimulationDefinition; -import org.jbpm.util.Clock; -import org.jbpm.util.XmlUtil; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.xml.sax.InputSource; - -/** - * @deprecated - * @author bernd.ruecker(a)camunda.com - */ -public abstract class SimulationTestCase extends TestCase { - - private static Log log = LogFactory.getLog(SimulationTestCase.class); - - static DateFormat dateFormat = new SimpleDateFormat("HH:mm"); -// static JbpmSimulationClock simulationClock = new JbpmSimulationClock(); - static JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance("org/jbpm/sim/simulation.cfg.xml"); - static DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); - - static { -// Clock.dateGenerator = simulationClock; -// UserCodeInterceptorConfig.userCodeInterceptor = new SimulationUserCodeInterceptor(); - } - - public static void setCurrentTime(String timeText) { - try { - JbpmSimulationClock.currentTime = dateFormat.parse(timeText); - } catch (ParseException e) { - throw new RuntimeException("invalid timeText: "+timeText, e); - } - } - - public void produceReports(ProcessInstance processInstance) { - List logs = processInstance.getLoggingInstance().getLogs(); - Iterator iter = logs.iterator(); - while (iter.hasNext()) { - ProcessLog processLog = (ProcessLog) iter.next(); - log.info(dateFormat.format(processLog.getDate())+" | "+processLog.toString()); - } - } -} Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/SteadyStateResetTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/SteadyStateResetTest.java 2009-07-08 09:29:32 UTC (rev 5257) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/SteadyStateResetTest.java 2009-07-08 09:38:46 UTC (rev 5258) @@ -40,6 +40,9 @@ " </sim-process>" + " </scenario>" + + + " <output path='target' />" + // currently just used as parameter for DESMO-J + "</experiment>"; public void testExperimentReader() { Modified: jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/VariableSourceAndFilterTest.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/VariableSourceAndFilterTest.java 2009-07-08 09:29:32 UTC (rev 5257) +++ jbpm3/branches/jbpm-3.2-soa/modules/simulation/src/test/java/org/jbpm/sim/VariableSourceAndFilterTest.java 2009-07-08 09:38:46 UTC (rev 5258) @@ -46,6 +46,7 @@ + " </task-overwrite> " + " </sim-process>" + " </scenario>" + + " <output path='target' />" // currently just used as parameter for DESMO-J + "</experiment>"; private static boolean dataSourceIsCalled = false; @@ -116,6 +117,7 @@ + " <task-overwrite task-name='change order' time-distribution='taskDist' />" + " </sim-process>" + " </scenario>" + + " <output path='target' />" // currently just used as parameter for DESMO-J + "</experiment>"; private static int calledCount = 0; Modified: jbpm3/branches/jbpm-3.2-soa/pom.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-07-08 09:29:32 UTC (rev 5257) +++ jbpm3/branches/jbpm-3.2-soa/pom.xml 2009-07-08 09:38:46 UTC (rev 5258) @@ -74,6 +74,7 @@ <richfaces.ui.version>3.2.1.GA</richfaces.ui.version> <report-server.version>1.0.0.Beta1</report-server.version> <sun.facelets.version>1.1.14</sun.facelets.version> + <xerces.version>2.6.2</xerces.version> <!-- Database Driver Versions --> <hsqldb.version>1.8.0.7</hsqldb.version> @@ -83,7 +84,7 @@ <jconnect.version>6.0.5</jconnect.version> <ojdbc.version>10.2.0.4</ojdbc.version> <db2jcc.version>3.1.57</db2jcc.version> - </properties> + </properties> <!-- DependencyManagement --> <dependencyManagement> @@ -256,6 +257,8 @@ <artifactId>richfaces-ui</artifactId> <version>${richfaces.ui.version}</version> </dependency> + + <!-- Database Driver Versions --> <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> @@ -271,8 +274,6 @@ <artifactId>postgresql</artifactId> <version>${postgresql.version}</version> </dependency> - - <!-- Database Driver Versions --> </dependencies> </dependencyManagement> @@ -351,6 +352,31 @@ </build> </profile> + <!-- + Name: jdk14 + Desc: dependencies specific to jdk 1.4 + --> + <profile> + <id>jdk14</id> + <activation> + <jdk>1.4</jdk> + </activation> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>xerces</groupId> + <artifactId>xmlParserAPIs</artifactId> + <version>${xerces.version}</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>${xerces.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + </profile> + <!-- DATABASE PROFILES ***************************************************************************** --> <!--