[jbpm-commits] JBoss JBPM SVN: r5590 - in jbpm4/trunk: modules/distro/src/main/files/install/src and 2 other directories.

Author: tom.baeyens(a)jboss.com Date: 2009-08-30 03:09:09 -0400 (Sun, 30 Aug 2009) New Revision: 5590 Added: jbpm4/trunk/modules/distro/src/main/files/install/jdbc/ jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java Removed: jbpm4/trunk/modules/distro/src/main/files/install/src/jdbc/ Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml jbpm4/trunk/qa/build.xml Log: moved jdbc properties directory in the install one level up Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-29 20:09:05 UTC (rev 5589) +++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-30 07:09:09 UTC (rev 5590) @@ -21,9 +21,10 @@ <property name="logging" value="jdk" /> <!-- jdk | provided --> <property name="cfg.dest.dir" value="${jbpm.home}/install/generated/cfg" /> <property name="install.src.dir" value="${jbpm.home}/install/src" /> - <property name="jdbc.properties.dir" value="${install.src.dir}/jdbc" /> <property name="mail.cfg" value="default" /> - <property file="${jbpm.home}/install/src/jdbc/${database}.properties" /> + + <property name="jdbc.properties.dir" value="${jbpm.home}/install/jdbc" /> + <property file="${jdbc.properties.dir}/${database}.properties" /> <property name="examples.file" value="${jbpm.home}/examples/target/examples.jar"/> @@ -605,9 +606,7 @@ <!-- ### CREATE JBPM SCHEMA ############################################# --> <target name="create.jbpm.schema" description="creates the jbpm tables in the database"> - <property file="${jbpm.home}/install/src/jdbc/${database}.properties" /> - <echo message="DB driver ... ${jdbc.driver}" /> - <echo message="DB URL ...... ${jdbc.url}" /> + <echo message="creating jbpm schema in db ${jdbc.url}" /> <sql driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}" @@ -625,11 +624,7 @@ <!-- ### DROP JBPM SCHEMA ############################################### --> <target name="drop.jbpm.schema" description="drops the jbpm tables from the database"> - <property file="${jbpm.home}/install/src/jdbc/${database}.properties" /> - <echo message="database....... ${database}" /> - <echo message="jdbc.driver.... ${jdbc.driver}" /> - <echo message="jdbc.url....... ${jdbc.url}" /> - <echo message="jdbc.username.. ${jdbc.username}" /> + <echo message="dropping jbpm schema in db ${jdbc.url}" /> <sql driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}" @@ -647,6 +642,7 @@ <!-- ### LOAD EXAMPLE IDENTITIES ######################################## --> <target name="load.example.identities" description="loads the example users and groups into the database"> + <echo message="loading example identities in ${jdbc.url}" /> <sql driver="${jdbc.driver}" url="${jdbc.url}" userid="${jdbc.username}" Copied: jbpm4/trunk/modules/distro/src/main/files/install/jdbc (from rev 5585, jbpm4/trunk/modules/distro/src/main/files/install/src/jdbc) Added: jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java =================================================================== --- jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java (rev 0) +++ jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java 2009-08-30 07:09:09 UTC (rev 5590) @@ -0,0 +1,114 @@ +package org.jbpm.test; + +import junit.framework.Test; +import junit.framework.TestCase; +import org.apache.cactus.ServletTestSuite; + +public class AllIntegrationTests extends TestCase { + + public static Test suite() { + ServletTestSuite suite = new ServletTestSuite(); + suite.addTestSuite(org.jbpm.examples.async.activity.AsyncActivityTest.class); + suite.addTestSuite(org.jbpm.examples.async.fork.AsyncForkTest.class); + suite.addTestSuite(org.jbpm.examples.concurrency.graphbased.ConcurrencyGraphBasedTest.class); + suite.addTestSuite(org.jbpm.examples.custom.CustomTest.class); + suite.addTestSuite(org.jbpm.examples.decision.conditions.DecisionConditionsTest.class); + suite.addTestSuite(org.jbpm.examples.decision.expression.DecisionExpressionTest.class); + suite.addTestSuite(org.jbpm.examples.decision.handler.DecisionHandlerTest.class); + suite.addTestSuite(org.jbpm.examples.end.multiple.EndMultipleTest.class); + suite.addTestSuite(org.jbpm.examples.end.processinstance.EndProcessInstanceTest.class); + suite.addTestSuite(org.jbpm.examples.end.state.EndStateTest.class); + suite.addTestSuite(org.jbpm.examples.eventlistener.EventListenerTest.class); + suite.addTestSuite(org.jbpm.examples.hql.HqlTest.class); + suite.addTestSuite(org.jbpm.examples.java.JavaInstantiateTest.class); + suite.addTestSuite(org.jbpm.examples.mail.inline.InlineMailTest.class); + suite.addTestSuite(org.jbpm.examples.mail.template.TemplateMailTest.class); + suite.addTestSuite(org.jbpm.examples.script.expression.ScriptExpressionTest.class); + suite.addTestSuite(org.jbpm.examples.script.text.ScriptTextTest.class); + suite.addTestSuite(org.jbpm.examples.services.ServicesTest.class); + suite.addTestSuite(org.jbpm.examples.sql.SqlTest.class); + suite.addTestSuite(org.jbpm.examples.state.choice.StateChoiceTest.class); + suite.addTestSuite(org.jbpm.examples.state.sequence.StateSequenceTest.class); + suite.addTestSuite(org.jbpm.examples.subprocess.outcomeactivity.SubProcessOutcomeActivityTest.class); + suite.addTestSuite(org.jbpm.examples.subprocess.outcomevalue.SubProcessOutcomeValueTest.class); + suite.addTestSuite(org.jbpm.examples.subprocess.variables.SubProcessVariablesTest.class); + suite.addTestSuite(org.jbpm.examples.task.assignee.TaskAssigneeTest.class); + suite.addTestSuite(org.jbpm.examples.task.assignmenthandler.TaskAssignmentHandlerTest.class); + suite.addTestSuite(org.jbpm.examples.task.candidates.TaskCandidatesTest.class); + suite.addTestSuite(org.jbpm.examples.task.comments.TaskCommentsTest.class); + suite.addTestSuite(org.jbpm.examples.task.notification.TaskNotificationTest.class); + suite.addTestSuite(org.jbpm.examples.task.reminder.TaskReminderTest.class); + suite.addTestSuite(org.jbpm.examples.task.swimlane.TaskSwimlaneTest.class); + suite.addTestSuite(org.jbpm.examples.task.variables.TaskVariablesTest.class); + suite.addTestSuite(org.jbpm.examples.timer.businesstime.TimerBusinessTimeTest.class); + suite.addTestSuite(org.jbpm.examples.timer.event.TimerEventTest.class); + suite.addTestSuite(org.jbpm.examples.timer.repeat.TimerRepeatTest.class); + suite.addTestSuite(org.jbpm.examples.timer.transition.TimerTransitionTest.class); + suite.addTestSuite(org.jbpm.examples.async.eventlistener.AsyncEventListenerTest.class); + suite.addTestSuite(org.jbpm.examples.goup.concurrency.GroupConcurrencyTest.class); + suite.addTestSuite(org.jbpm.examples.goup.multipleentries.MultipleEntriesTest.class); + suite.addTestSuite(org.jbpm.examples.goup.simple.GroupSimpleTest.class); + suite.addTestSuite(org.jbpm.examples.goup.timer.GroupTimerTest.class); + suite.addTestSuite(org.jbpm.test.activities.DecisionTest.class); + suite.addTestSuite(org.jbpm.test.activities.ForkJoinInSameTransactionTest.class); + suite.addTestSuite(org.jbpm.test.activities.ForkTest.class); + suite.addTestSuite(org.jbpm.test.activities.ForkToTaskTest.class); + suite.addTestSuite(org.jbpm.test.activities.GroupBasicsTest.class); + suite.addTestSuite(org.jbpm.test.activities.GroupTimersTest.class); + suite.addTestSuite(org.jbpm.test.activities.JoinTest.class); + suite.addTestSuite(org.jbpm.test.activities.StatesJoinEndTest.class); + suite.addTestSuite(org.jbpm.test.activities.StateTest.class); + suite.addTestSuite(org.jbpm.test.activities.SubProcessTest.class); + suite.addTestSuite(org.jbpm.test.activities.TasksJoinEndTest.class); + suite.addTestSuite(org.jbpm.test.async.AsyncBasicsTest.class); + suite.addTestSuite(org.jbpm.test.async.AsyncEndCombinationTest.class); + suite.addTestSuite(org.jbpm.test.async.AsyncEventListenerOnEndTest.class); + suite.addTestSuite(org.jbpm.test.auth.UserProvidedAuthenticationTest.class); + suite.addTestSuite(org.jbpm.test.cfg.ConfigurationTest.class); + suite.addTestSuite(org.jbpm.test.deploy.DeploymentQueryTest.class); + suite.addTestSuite(org.jbpm.test.deploy.ImageTest.class); + suite.addTestSuite(org.jbpm.test.deploy.SuspendDeploymentTest.class); + suite.addTestSuite(org.jbpm.test.eventlistener.EventListenerTest.class); + suite.addTestSuite(org.jbpm.test.eventlistener.HqlEventListenerTest.class); + suite.addTestSuite(org.jbpm.test.execution.ConcurrentEndTest.class); + suite.addTestSuite(org.jbpm.test.execution.ExecutionEagerLoadingTest.class); + suite.addTestSuite(org.jbpm.test.execution.ExecutionQueryTest.class); + suite.addTestSuite(org.jbpm.test.execution.FindExecutionTest.class); + suite.addTestSuite(org.jbpm.test.execution.SignalExecutionTest.class); + suite.addTestSuite(org.jbpm.test.execution.StartExecutionTest.class); + suite.addTestSuite(org.jbpm.test.execution.SystemVariablesTest.class); + suite.addTestSuite(org.jbpm.test.history.AvgDurationTest.class); + suite.addTestSuite(org.jbpm.test.history.ChoiceDistributionTest.class); + suite.addTestSuite(org.jbpm.test.history.EndProcessInstanceTest.class); + suite.addTestSuite(org.jbpm.test.history.HistoryActivityInstanceQeuryTest.class); + suite.addTestSuite(org.jbpm.test.history.HistoryDetailQueryTest.class); + suite.addTestSuite(org.jbpm.test.history.HistoryTaskAssigneeTest.class); + suite.addTestSuite(org.jbpm.test.history.ProcessInstanceHistoryTest.class); + suite.addTestSuite(org.jbpm.test.identity.IdentityTest.class); + suite.addTestSuite(org.jbpm.test.mgmt.JobQueryTest.class); + suite.addTestSuite(org.jbpm.test.process.ActivityCoordinatesTest.class); + suite.addTestSuite(org.jbpm.test.process.DeploymentResourcesTest.class); + suite.addTestSuite(org.jbpm.test.process.DescriptionTest.class); + suite.addTestSuite(org.jbpm.test.process.ProcessDefinitionQueryTest.class); + suite.addTestSuite(org.jbpm.test.process.ProcessDefinitionStartFormTest.class); + suite.addTestSuite(org.jbpm.test.process.RepositoryServiceTest.class); + suite.addTestSuite(org.jbpm.test.task.SubTaskTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskCommentsTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskCreateUpdateDeleteTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskListTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskParticipationsTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskPropertiesTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskQueryCandidatesTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskQueryProcessTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskQueryTest.class); + suite.addTestSuite(org.jbpm.test.task.TaskVariablesTest.class); + suite.addTestSuite(org.jbpm.test.taskactivity.TaskCandidatesTest.class); + suite.addTestSuite(org.jbpm.test.taskactivity.TaskCompletionTest.class); + suite.addTestSuite(org.jbpm.test.taskactivity.TaskOutcomesTest.class); + suite.addTestSuite(org.jbpm.test.taskactivity.TaskReassignTest.class); + suite.addTestSuite(org.jbpm.test.timer.TimerTest.class); + suite.addTestSuite(org.jbpm.test.variables.BasicVariablesTest.class); + suite.addTestSuite(org.jbpm.test.variables.VariableBasicTypesTest.class); + return suite; + } +} Property changes on: jbpm4/trunk/modules/test-cactus/src/test/java/org/jbpm/test/AllIntegrationTests.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/qa/build.xml =================================================================== --- jbpm4/trunk/qa/build.xml 2009-08-29 20:09:05 UTC (rev 5589) +++ jbpm4/trunk/qa/build.xml 2009-08-30 07:09:09 UTC (rev 5590) @@ -166,12 +166,12 @@ <!-- overwrite the default jdbc properties in the distro with those specified in the qa jdbc directory --> <copy file="jdbc/${database}.properties" - todir="${jbpm.home}/install/src/jdbc" + todir="${jbpm.home}/install/jdbc" overwrite="true" failonerror="false" /> <!-- overwrite the jdbc properties in the distro with those specified in the user specific properties --> <copy file="${user.home}/.jbpm4/jdbc/${database}.properties" - todir="${jbpm.home}/install/src/jdbc" + todir="${jbpm.home}/install/jdbc" overwrite="true" failonerror="false" /> <!-- copy the oracle jar as it is not allowed to be part of our distro -->