JBoss JBPM SVN: r5590 - in jbpm4/trunk: modules/distro/src/main/files/install/src and 2 other directories.
by do-not-reply@jboss.org
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 -->
14 years, 8 months
JBoss JBPM SVN: r5589 - in jbpm4/trunk/modules: distro/src/main/files/install/src/cfg/jbpm and 3 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-29 16:09:05 -0400 (Sat, 29 Aug 2009)
New Revision: 5589
Added:
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.examples.jbpm.cfg.xml
Modified:
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml
jbpm4/trunk/modules/examples/pom.xml
jbpm4/trunk/modules/test-db/pom.xml
jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml
Log:
fixing the jbpm4-db integration test run: separated examples configuration from the test-db because of mail
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-29 17:31:40 UTC (rev 5588)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-29 20:09:05 UTC (rev 5589)
@@ -131,7 +131,7 @@
</and>
</condition>
<property name="eclipse.distro.url" value="http://mirror.cc.vt.edu/pub/eclipse/technology/epp/downloads/release/gali..." />
- <property name="eclipse.distro.dir" value="${jbpm.home}/downloads" />
+ <property name="eclipse.distro.dir" value="downloads" />
<property name="eclipse.parent.dir" value="${jbpm.home}" />
<property name="eclipse.distro.path" value="${eclipse.distro.dir}/${eclipse.filename}" />
Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.examples.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.examples.jbpm.cfg.xml (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.examples.jbpm.cfg.xml 2009-08-29 20:09:05 UTC (rev 5589)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+ <import resource="jbpm.default.cfg.xml" />
+ <import resource="jbpm.tx.hibernate.cfg.xml" />
+ <import resource="jbpm.jpdl.cfg.xml" />
+ <import resource="jbpm.identity.cfg.xml" />
+ <import resource="jbpm.businesscalendar.cfg.xml" />
+ <import resource="jbpm.mail.templates.examples.xml" />
+
+</jbpm-configuration>
Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.examples.jbpm.cfg.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml 2009-08-29 17:31:40 UTC (rev 5588)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/standalone.testsuite.jbpm.cfg.xml 2009-08-29 20:09:05 UTC (rev 5589)
@@ -7,6 +7,5 @@
<import resource="jbpm.jpdl.cfg.xml" />
<import resource="jbpm.identity.cfg.xml" />
<import resource="jbpm.businesscalendar.cfg.xml" />
- <import resource="jbpm.mail.templates.examples.xml" />
</jbpm-configuration>
Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml 2009-08-29 17:31:40 UTC (rev 5588)
+++ jbpm4/trunk/modules/examples/pom.xml 2009-08-29 20:09:05 UTC (rev 5589)
@@ -124,7 +124,7 @@
<fileset dir="${user.home}/.jbpm4/jdbc" />
</copy>
<ant antfile="../distro/src/main/files/install/build.xml" target="create.cfg">
- <property name="tx" value="standalone.testsuite" />
+ <property name="tx" value="standalone.testsuite.examples" />
<property name="mail.cfg" value="testsuite" />
<property name="database" value="${database}" />
<property name="cfg.dest.dir" value="target/test-classes" />
@@ -140,63 +140,6 @@
</build>
</profile>
- <!-- -Djboss.bind.address -->
- <profile>
- <id>integration.tests</id>
- <activation>
- <property>
- <name>jboss.bind.address</name>
- </property>
- </activation>
-
- <dependencies>
- <dependency>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-enterprise</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- AS 5 Integration tests -->
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-test-cfg-customization</id>
- <phase>test-compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy todir="target/test-classes" overwrite="true" failonerror="false">
- <fileset dir="../distro/src/main/files/jboss/jbpm.cfg.remote.client" />
- </copy>
- <copy todir="target/test-classes" overwrite="true" failonerror="false">
- <fileset dir="${user.home}/.jbpm4/jbpm.cfg.remote.client" />
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
</profiles>
</project>
\ No newline at end of file
Modified: jbpm4/trunk/modules/test-db/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-db/pom.xml 2009-08-29 17:31:40 UTC (rev 5588)
+++ jbpm4/trunk/modules/test-db/pom.xml 2009-08-29 20:09:05 UTC (rev 5589)
@@ -144,63 +144,6 @@
</build>
</profile>
- <!-- -Djboss.bind.address -->
- <profile>
- <id>integration.tests</id>
- <activation>
- <property>
- <name>jboss.bind.address</name>
- </property>
- </activation>
-
- <dependencies>
- <dependency>
- <groupId>org.jbpm.jbpm4</groupId>
- <artifactId>jbpm-enterprise</artifactId>
- <scope>test</scope>
- </dependency>
- <!-- AS 5 Integration tests -->
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-javaee</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-test-cfg-customization</id>
- <phase>test-compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy todir="target/test-classes" overwrite="true" failonerror="false">
- <fileset dir="../distro/src/main/files/jboss/jbpm.cfg.remote.client" />
- </copy>
- <copy todir="target/test-classes" overwrite="true" failonerror="false">
- <fileset dir="${user.home}/.jbpm4/jbpm.cfg.remote.client" />
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
</profiles>
</project>
Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml
===================================================================
--- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2009-08-29 17:31:40 UTC (rev 5588)
+++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2009-08-29 20:09:05 UTC (rev 5589)
@@ -7,11 +7,9 @@
You'll see following subdirectories:
</para>
<itemizedlist>
- <listitem><literal>db</literal>: DB schema creation scripts</listitem>
<listitem><literal>doc</literal>: User guide, javadocs and developers guide</listitem>
<listitem><literal>examples</literal>: Example processes that are used in the user guide</listitem>
- <listitem><literal>gpd</literal>: Graphical process designer plugin as an eclipse archived site</listitem>
- <listitem><literal>jboss</literal>: JBoss installer to install jBPM into JBoss</listitem>
+ <listitem><literal>install</literal>: Installation scripts</listitem>
<listitem><literal>lib</literal>: Third party libs and some special jBPM libraries</listitem>
<listitem><literal>src</literal>: Sources</listitem>
<listitem><literal>jbpm.jar</literal>: The jBPM main library archive</listitem>
@@ -34,8 +32,8 @@
This section describes the steps to complete the demo setup.
</para>
<para>If you have previously downloaded jboss-5.0.0.GA.zip, create a downloads directory
- in your jBPM home directory and place the zip file in there. Otherwise the script will download
- it for you. The same is true for eclipse-jee-galileo-win32.zip
+ in your <literal>${jbpm.home}/install/downloads</literal> directory and place the zip file in
+ there. Otherwise the script will download it for you. The same is true for eclipse-jee-galileo-win32.zip
(or eclipse-jee-galileo-linux-gtk(-x86_64).tar.gz on Linux and eclipse-jee-galileo-macosx-carbon.tar.gz on Mac OSX)
</para>
<para>Open a command prompt and go do directory <literal>${jbpm.home}/jboss</literal>. Then
14 years, 8 months
JBoss JBPM SVN: r5588 - in jbpm4/trunk/modules: test-db and 1 other directory.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-29 13:31:40 -0400 (Sat, 29 Aug 2009)
New Revision: 5588
Modified:
jbpm4/trunk/modules/examples/pom.xml
jbpm4/trunk/modules/test-db/pom.xml
Log:
fixing the cleanup: synced test-db pom with examples for direct database testsuite execution
Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml 2009-08-29 14:39:48 UTC (rev 5587)
+++ jbpm4/trunk/modules/examples/pom.xml 2009-08-29 17:31:40 UTC (rev 5588)
@@ -68,7 +68,6 @@
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -94,32 +93,6 @@
</build>
<profiles>
- <profile>
- <id>config</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>custom-config</id>
- <phase>test-compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="../distro/src/main/files/install/build.xml" target="create.cfg">
- <property name="database" value="oracle" />
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
<!-- -Ddatabase= -->
<profile>
@@ -175,6 +148,7 @@
<name>jboss.bind.address</name>
</property>
</activation>
+
<dependencies>
<dependency>
<groupId>org.jbpm.jbpm4</groupId>
@@ -194,6 +168,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
Modified: jbpm4/trunk/modules/test-db/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-db/pom.xml 2009-08-29 14:39:48 UTC (rev 5587)
+++ jbpm4/trunk/modules/test-db/pom.xml 2009-08-29 17:31:40 UTC (rev 5588)
@@ -63,25 +63,25 @@
<build>
<plugins>
- <!-- this create jar file of code from src/test/java so modules with tests can share code -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>jbpm.*</exclude>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-test-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>jbpm.*</exclude>
<exclude>logging.properties</exclude>
<exclude>META-INF/*</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -89,7 +89,7 @@
<!-- -Ddatabase= -->
<profile>
- <id>standalone.tests</id>
+ <id>run.database.testsuite</id>
<activation>
<property>
<name>database</name>
@@ -108,25 +108,22 @@
</goals>
<configuration>
<tasks>
- <copy file="../../qa/jdbc/${database}.properties"
- tofile="target/test-classes/jdbc.properties"
- overwrite="true" />
- <copy file="${user.home}/.jbpm4/jdbc/${database}.properties"
- tofile="target/test-classes/jdbc.properties"
- overwrite="true"
- failonerror="false"/>
- <copy file="../../modules/distro/src/main/files/db/hibernate.cfg/${database}.hibernate.cfg.xml"
- tofile="target/test-classes/jbpm.hibernate.cfg.xml"
- overwrite="true">
- <filterset>
- <filtersfile file="target/test-classes/jdbc.properties" />
- </filterset>
+ <echo message="database: ${database}" />
+ <mkdir dir="target/jdbc.properties" />
+ <copy todir="target/jdbc.properties" overwrite="true">
+ <fileset dir="../../qa/jdbc" />
</copy>
- <!-- replace file="target/test-classes/jbpm.hibernate.cfg.xml">
- <replacetoken><![CDATA[<property name="hibernate.format_sql">true</property>]]></replacetoken>
- <replacevalue><![CDATA[<property name="hibernate.format_sql">true</property>
- <property name="hibernate.hbm2ddl.auto">create-drop</property>]]></replacevalue>
- </replace -->
+ <copy todir="target/jdbc.properties" overwrite="true" failonerror="false">
+ <fileset dir="${user.home}/.jbpm4/jdbc" />
+ </copy>
+ <ant antfile="../distro/src/main/files/install/build.xml" target="create.cfg">
+ <property name="tx" value="standalone.testsuite" />
+ <property name="mail.cfg" value="testsuite" />
+ <property name="database" value="${database}" />
+ <property name="cfg.dest.dir" value="target/test-classes" />
+ <property name="install.src.dir" value="../distro/src/main/files/install/src" />
+ <property name="jdbc.properties.dir" value="target/jdbc.properties" />
+ </ant>
</tasks>
</configuration>
</execution>
@@ -176,10 +173,8 @@
</dependency>
</dependencies>
-
<build>
<plugins>
-
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -202,7 +197,6 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
</profile>
14 years, 8 months
JBoss JBPM SVN: r5587 - in jbpm4/trunk: modules/distro/src/main/files/install/src/jboss and 6 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-29 10:39:48 -0400 (Sat, 29 Aug 2009)
New Revision: 5587
Added:
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/
jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml
Removed:
jbpm4/trunk/qa/jboss/
Modified:
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
jbpm4/trunk/qa/build.xml
Log:
fixing the job executor startup plus cleanup
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-29 08:58:55 UTC (rev 5586)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-29 14:39:48 UTC (rev 5587)
@@ -40,7 +40,7 @@
<property name="hsqldb.server.install.dir" value="${jbpm.home}/hsqldb-server"/>
<property name="hsqldb.server.source.dir" value="${jbpm.home}/install/src/hsqldb-server" />
- <property name="jboss.version" value="5.1.0.GA" />
+ <property name="jboss.version" value="5.0.0.GA" />
<property name="jboss.parent.dir" value="${jbpm.home}" />
<property name="jboss.home" value="${jboss.parent.dir}/jboss-${jboss.version}" />
<property name="jboss.filename" value="jboss-${jboss.version}.zip" />
@@ -84,6 +84,14 @@
</not>
</condition>
+ <condition property="is.jboss.500">
+ <equals arg1="${jboss.version}" arg2="5.0.0.GA"/>
+ </condition>
+
+ <condition property="is.jboss.510">
+ <equals arg1="${jboss.version}" arg2="5.1.0.GA"/>
+ </condition>
+
<!-- ECLIPSE RELATED CONDITIONS -->
<condition property="eclipse.filename" value="eclipse-jee-galileo-win32.zip">
<contains string="${os.name}" casesensitive="false" substring="win" />
@@ -129,8 +137,11 @@
<!-- ### DEMO SETUP JBOSS ##################################################### -->
<target name="demo.setup.jboss"
- depends="install.jboss, install.jbpm.into.jboss, start.jboss"
+ depends="install.jboss, install.jbpm.into.jboss"
description="installs jboss, installs jbpm into jboss, starts jboss, creates the jBPM DB schema, deploys examples, loads example identities, installs and starts eclipse">
+ <antcall target="internal.enable.jboss.debug.jboss500" />
+ <antcall target="internal.enable.jboss.debug.jboss510" />
+ <antcall target="start.jboss" />
<antcall target="create.jbpm.schema" />
<antcall target="install.examples.into.jboss" />
<antcall target="load.example.identities" />
@@ -151,11 +162,6 @@
<!-- ### CREATE CONFIGURATION ########################################### -->
<target name="create.cfg" description="Creates a configuration in ${cfg.dest.dir}">
- <echo message="${cfg.dest.dir}" />
- <echo message="${install.src.dir}" />
- <echo message="${jdbc.properties.dir}" />
- <echo message="${user.dir}" />
- <echo message="${install.src.dir}/cfg/hibernate/${hibernate.connection.type}/${database}.hibernate.cfg.xml" />
<mkdir dir="${cfg.dest.dir}" />
<copy tofile="${cfg.dest.dir}/jbpm.cfg.xml"
file="${install.src.dir}/cfg/jbpm/${tx}.jbpm.cfg.xml"
@@ -595,31 +601,7 @@
<arg line="stop"/>
</exec>
</target>
-
- <!-- ### COPY DATABASE DRIVER ######################################### -->
- <target name="internal.copy.database.driver">
- <condition property="database.driver" value="mysql-connector-java.jar">
- <equals arg1="${database}" arg2="mysql" />
- </condition>
- <condition property="database.driver" value="ojdbc14.jar">
- <equals arg1="${database}" arg2="oracle" />
- </condition>
- <condition property="database.driver" value="mysql-connector-java.jar">
- <equals arg1="${database}" arg2="mysql" />
- </condition>
- <condition property="database.driver" value="postgresql.jar">
- <equals arg1="${database}" arg2="postgresql" />
- </condition>
- <condition property="database.driver" value="hsqldb.jar">
- <and>
- <equals arg1="${database}" arg2="hsqldb" />
- <equals arg1="${is.tomcat}" arg2="true" />
- </and>
- </condition>
- <antcall target="internal.copy.database.driver.if.needed" />
- </target>
-
<!-- ### CREATE JBPM SCHEMA ############################################# -->
<target name="create.jbpm.schema"
description="creates the jbpm tables in the database">
@@ -701,24 +683,6 @@
</java>
</target>
- <target name="internal.copy.database.driver.if.needed" if="database.driver">
- <available file="${jbpm.home}/lib/${database.driver}" property="database.driver.jar.available" />
- <fail message="please download the ${database} driver jar and put it in the ${jbpm.home}/lib directory" unless="database.driver.jar.available" />
- <echo message="Copying database driver ${database.driver} to ${database.driver.destination.dir}" />
- <copy file="${jbpm.home}/lib/${database.driver}" todir="${database.driver.destination.dir}" />
- </target>
-
- <!-- ### INSTALL SIGNAVIO INTO JBOSS ##################################### -->
- <target name="install.signavio.into.jboss" depends="internal.set.signavio.repo.dir">
- <!-- Current version of Signavio needs to be unpacked in /deploy to work correctly -->
- <unzip src="${signavio.src.dir}/${signavio.war.file.name}" dest="${jboss.server.deploy.dir}/${signavio.war.file.name}" />
- </target>
-
- <!-- ### INSTALL SIGNAVIO INTO TOMCAT ##################################### -->
- <target name="install.signavio.into.tomcat" depends="internal.set.signavio.repo.dir">
- <copy file="${signavio.src.dir}/${signavio.war.file.name}" todir="${tomcat.webapps.dir}"/>
- </target>
-
<!-- ### SET SIGNAVIO REPO DIR ##################################### -->
<target name="internal.set.signavio.repo.dir">
<mkdir dir="${jbpm.home}/signavio-repository" />
@@ -748,16 +712,6 @@
<antcall target="internal.install.eclipse.non.windows" />
</target>
- <target name="internal.install.eclipse.windows" if="isWindows">
- <unzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${jbpm.home}" overwrite="true" />
- </target>
-
- <target name="internal.install.eclipse.non.windows" if="isNotWindows">
- <gunzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${eclipse.distro.dir}" />
- <untar src="${eclipse.distro.dir}/${eclipse.tarfilename}" dest="${jbpm.home}" overwrite="true" />
- <delete file="${eclipse.distro.dir}/${eclipse.tarfilename}"/>
- </target>
-
<!-- ### GET ECLIPSE ##################################################### -->
<condition property="is.eclipse.distro.available">
<available file="${eclipse.distro.path}" />
@@ -787,4 +741,72 @@
</exec>
</target>
+ <!-- ### INTERNAL TARGETS ################################################## -->
+
+ <target name="internal.enable.jboss.debug.jboss500" if="is.jboss.500">
+ <echo message="enabling debug on ${jboss.home}" />
+ <replace file="${jboss.home}/bin/run.bat"
+ token="rem set JAVA_OPTS=%JAVA_OPTS% -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
+ value="set JAVA_OPTS=%JAVA_OPTS% -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n" />
+ <echo message="copying customized log file to ${jboss.server.config.dir}/conf" />
+ <copy file="${jbpm.home}/install/src/jboss/log/jboss-log4j.xml" todir="${jboss.server.config.dir}/conf" overwrite="true" />
+ </target>
+
+ <target name="internal.enable.jboss.debug.jboss510" if="is.jboss.510">
+ <echo message="enabling debug on ${jboss.home}" />
+ <replace file="${jboss.home}/bin/run.conf.bat"
+ token="rem set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n""
+ value="set "JAVA_OPTS=%JAVA_OPTS% -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n""/>
+ <echo message="copying customized log file to ${jboss.server.config.dir}/conf" />
+ <copy file="${jbpm.home}/install/src/jboss/log/jboss-log4j.xml" todir="${jboss.server.config.dir}/conf" overwrite="true" />
+ </target>
+
+ <target name="internal.copy.database.driver">
+ <condition property="database.driver" value="mysql-connector-java.jar">
+ <equals arg1="${database}" arg2="mysql" />
+ </condition>
+ <condition property="database.driver" value="ojdbc14.jar">
+ <equals arg1="${database}" arg2="oracle" />
+ </condition>
+ <condition property="database.driver" value="mysql-connector-java.jar">
+ <equals arg1="${database}" arg2="mysql" />
+ </condition>
+ <condition property="database.driver" value="postgresql.jar">
+ <equals arg1="${database}" arg2="postgresql" />
+ </condition>
+ <condition property="database.driver" value="hsqldb.jar">
+ <and>
+ <equals arg1="${database}" arg2="hsqldb" />
+ <equals arg1="${is.tomcat}" arg2="true" />
+ </and>
+ </condition>
+ <antcall target="internal.copy.database.driver.if.needed" />
+ </target>
+
+ <target name="internal.copy.database.driver.if.needed" if="database.driver">
+ <available file="${jbpm.home}/lib/${database.driver}" property="database.driver.jar.available" />
+ <fail message="please download the ${database} driver jar and put it in the ${jbpm.home}/lib directory" unless="database.driver.jar.available" />
+ <echo message="Copying database driver ${database.driver} to ${database.driver.destination.dir}" />
+ <copy file="${jbpm.home}/lib/${database.driver}" todir="${database.driver.destination.dir}" />
+ </target>
+
+ <target name="install.signavio.into.jboss" depends="internal.set.signavio.repo.dir">
+ <!-- Current version of Signavio needs to be unpacked in /deploy to work correctly -->
+ <unzip src="${signavio.src.dir}/${signavio.war.file.name}" dest="${jboss.server.deploy.dir}/${signavio.war.file.name}" />
+ </target>
+
+ <target name="install.signavio.into.tomcat" depends="internal.set.signavio.repo.dir">
+ <copy file="${signavio.src.dir}/${signavio.war.file.name}" todir="${tomcat.webapps.dir}"/>
+ </target>
+
+ <target name="internal.install.eclipse.windows" if="isWindows">
+ <unzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${jbpm.home}" overwrite="true" />
+ </target>
+
+ <target name="internal.install.eclipse.non.windows" if="isNotWindows">
+ <gunzip src="${eclipse.distro.dir}/${eclipse.filename}" dest="${eclipse.distro.dir}" />
+ <untar src="${eclipse.distro.dir}/${eclipse.tarfilename}" dest="${jbpm.home}" overwrite="true" />
+ <delete file="${eclipse.distro.dir}/${eclipse.tarfilename}"/>
+ </target>
+
</project>
Copied: jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml (from rev 5585, jbpm4/trunk/qa/jboss/jboss-log4j.xml)
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml 2009-08-29 14:39:48 UTC (rev 5587)
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml 64096 2007-07-17 14:36:23Z stan.silvert(a)jboss.com $ -->
+
+<!--
+ | For more configuration information and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/server.log"/>
+ <param name="Append" value="false"/>
+ <!--
+ Set the threshold via a system property. Note this is parsed by log4j,
+ so the full JBoss system property format is not supported; e.g.
+ setting a default via ${jboss.server.log.threshold:WARN} will not work.
+ -->
+ <param name="Threshold" value="${jboss.server.log.threshold}"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] (Thread) Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="TRACE"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the jacorb category to WARN as its INFO is verbose -->
+ <category name="jacorb">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Set the logging level of the JSF implementation -->
+ <category name="javax.enterprise.resource.webcontainer.jsf">
+ <priority value="INFO" />
+ </category>
+
+ <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+ <category name="org.jgroups">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the org.quartz category to INFO as its DEBUG is verbose -->
+ <category name="org.quartz">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit JBoss categories -->
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+
+ <category name="org.hibernate">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- category name="org.hibernate.SQL">
+ <priority value="DEBUG"/>
+ </category -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/jboss/log/jboss-log4j.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-08-29 08:58:55 UTC (rev 5586)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/JbpmConfiguration.java 2009-08-29 14:39:48 UTC (rev 5587)
@@ -93,7 +93,7 @@
private static final Log log = Log.getLog(JbpmConfiguration.class.getName());
protected boolean isConfigured = false;
- protected WireContext processEngineWireContext = new WireContext(new WireDefinition(), Context.CONTEXTNAME_PROCESS_ENGINE);
+ protected WireContext processEngineWireContext = new WireContext(new WireDefinition(), Context.CONTEXTNAME_PROCESS_ENGINE, true);
protected WireDefinition transactionWireDefinition = new WireDefinition();
protected ThreadLocal<List<UserProvidedEnvironmentObject>> userProvidedEnvironmentObjectsThreadLocal = new ThreadLocal<List<UserProvidedEnvironmentObject>>();
@@ -129,6 +129,7 @@
}
}
}
+ processEngineWireContext.create();
userCommandService = (CommandService) processEngineWireContext.get("user.command.service");
return this;
}
@@ -222,7 +223,7 @@
}
protected void installTransactionContext(PvmEnvironment environment) {
- WireContext transactionContext = new WireContext(transactionWireDefinition, Context.CONTEXTNAME_TRANSACTION, environment, true);
+ WireContext transactionContext = new WireContext(transactionWireDefinition, Context.CONTEXTNAME_TRANSACTION, true);
// add the environment block context to the environment
environment.setContext(transactionContext);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-08-29 08:58:55 UTC (rev 5586)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/WireContext.java 2009-08-29 14:39:48 UTC (rev 5587)
@@ -225,7 +225,7 @@
}
public WireContext(WireDefinition wireDefinition) {
- this(wireDefinition, null, null, false);
+ this(wireDefinition, null, false);
}
/** when this {@link Context} is used in an {@link EnvironmentImpl}, it
@@ -246,7 +246,7 @@
* set and the scope needs to be added to the environment before the creation of this wire scope is done.
* @see JbpmConfiguration#openEnvironment()
*/
- public WireContext(WireDefinition wireDefinition, String name, EnvironmentImpl environment, boolean delayCreate) {
+ public WireContext(WireDefinition wireDefinition, String name, boolean delayCreate) {
this.wireDefinition = wireDefinition;
this.name = name;
this.classLoader = (wireDefinition!=null ? wireDefinition.getClassLoader() : null);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java 2009-08-29 08:58:55 UTC (rev 5586)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/binding/JobExecutorBinding.java 2009-08-29 14:39:48 UTC (rev 5587)
@@ -24,6 +24,7 @@
import org.jbpm.pvm.internal.cmd.CommandService;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.util.XmlUtil;
+import org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.ContextTypeRefDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.IntegerDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.JobExecutorDescriptor;
@@ -80,6 +81,7 @@
invokeStartOperation.setMethodName("start");
descriptor.addOperation(invokeStartOperation);
descriptor.setAutoStart(true);
+ descriptor.setInit(AbstractDescriptor.INIT_EAGER);
}
return descriptor;
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-08-29 08:58:55 UTC (rev 5586)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2009-08-29 14:39:48 UTC (rev 5587)
@@ -78,20 +78,6 @@
protected synchronized void initialize() {
if (processEngine==null) {
- String jbpmTestCfgType = System.getProperty("jbpm.test.cfg.type");
- String jbpmTestCfgResource = System.getProperty("jbpm.test.cfg.resource");
- initialize(jbpmTestCfgType, jbpmTestCfgResource);
- }
- }
-
- protected synchronized void initialize(String jbpmTestCfgResource) {
- if (processEngine==null) {
- initialize(jbpmTestCfgResource, null);
- }
- }
-
- protected synchronized void initialize(String jbpmTestCfgResource, String jbpmTestCfgType) {
- if (processEngine==null) {
processEngine = Configuration.getProcessEngine();
repositoryService = processEngine.get(RepositoryService.class);
Modified: jbpm4/trunk/qa/build.xml
===================================================================
--- jbpm4/trunk/qa/build.xml 2009-08-29 08:58:55 UTC (rev 5586)
+++ jbpm4/trunk/qa/build.xml 2009-08-29 14:39:48 UTC (rev 5587)
@@ -100,8 +100,6 @@
description="reinstalls jbpm, reinstalls jboss, installs jbpm into jboss, starts jboss and then creates the jbpm schema">
<ant antfile="${jbpm.home}/install/build.xml" target="reinstall.jboss" />
<ant antfile="${jbpm.home}/install/build.xml" target="install.jbpm.into.jboss" />
-
- <antcall target="internal.enable.jboss.debug" />
<ant antfile="${jbpm.home}/install/build.xml" target="create.user.webapp" />
<ant antfile="${jbpm.home}/examples/build.xml" target="examples.jar" />
@@ -181,10 +179,9 @@
todir="${jbpm.home}/lib"/>
</target>
- <!-- ################################################## -->
- <!-- ### INTERNAL TARGETS ### -->
- <!-- ### These targets can NOT be called separately ### -->
- <!-- ################################################## -->
+ <!-- ############################ -->
+ <!-- ### OLD IDENTITY TARGETS ### -->
+ <!-- ############################
<target name="internal.install.idm.into.jboss.integrationtestspecifics" if="jbpm.identity.idm">
<copy todir="${jboss.server.config.dir}/deploy/jbpm/jbpm-service.sar" overwrite="true">
@@ -192,14 +189,6 @@
</copy>
</target>
-
- <target name="internal.enable.jboss.debug" if="jbpm.debug">
- <replace file="${jboss.home}/bin/run.bat"
- token="rem set JAVA_OPTS=%JAVA_OPTS% -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"
- value="set JAVA_OPTS=%JAVA_OPTS% -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"/>
- <copy file="jboss/jboss-log4j.xml" todir="${jboss.server.config.dir}/conf" overwrite="true" />
- </target>
-
<condition property="identity.component.idm">
<equals arg1="${identity.component}" arg2="jboss.idm"/>
</condition>
@@ -207,10 +196,10 @@
<target name="copy.jbossidm.jdbc.configuration" if="identity.component.idm">
<copy file="../modules/distro/target/libs/ojdbc14.jar"
todir="${jbossidm.home}/lib" />
- <!--copy file="jdbc/${database}.properties"
+ <copy file="jdbc/${database}.properties"
todir="${jbossidm.home}/db/jdbc"
overwrite="true"
- failonerror="false" /-->
+ failonerror="false" />
</target>
<target name="drop.jbossidm.schema" if="identity.component.idm">
@@ -220,5 +209,6 @@
<target name="create.jbossidm.schema" if="identity.component.idm">
<ant antfile="${jbossidm.home}/db/build.xml" target="create.jbossidm.schema" />
</target>
+ -->
</project>
14 years, 8 months
JBoss JBPM SVN: r5586 - in jbpm4/trunk: modules/distro/src/main/files and 2 other directories.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-29 04:58:55 -0400 (Sat, 29 Aug 2009)
New Revision: 5586
Added:
jbpm4/trunk/qa/demo.setup.jboss.sh
jbpm4/trunk/qa/demo.setup.tomcat.bat
jbpm4/trunk/qa/demo.setup.tomcat.sh
Removed:
jbpm4/trunk/modules/distro/scripts/antrun-installer.xml
jbpm4/trunk/modules/distro/src/main/files/db/
jbpm4/trunk/modules/distro/src/main/files/gpd/
jbpm4/trunk/modules/distro/src/main/files/jboss/
jbpm4/trunk/qa/test.demo.setup.sh
Modified:
jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
jbpm4/trunk/modules/distro/src/main/files/install/build.xml
Log:
distribution cleanup
Deleted: jbpm4/trunk/modules/distro/scripts/antrun-installer.xml
===================================================================
--- jbpm4/trunk/modules/distro/scripts/antrun-installer.xml 2009-08-28 21:23:48 UTC (rev 5585)
+++ jbpm4/trunk/modules/distro/scripts/antrun-installer.xml 2009-08-29 08:58:55 UTC (rev 5586)
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id: antrun-installer.xml 3319 2008-12-10 14:29:01Z thomas.diesler(a)jboss.com $ -->
-<project>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
- <property name="output.dir" value="${basedir}/target" />
- <property name="resources.dir" value="${basedir}/src/main/resources" />
- <property name="filtered.resources.dir" value="${output.dir}/resources" />
- <property name="deploy.artifacts.dir" value="${output.dir}/deploy-artifacts" />
- <property name="deploy.artifacts.lib" value="${deploy.artifacts.dir}/lib" />
- <property name="deploy.artifacts.resources" value="${deploy.artifacts.dir}/resources" />
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
- <target name="init">
- </target>
-
- <!-- ================================================================== -->
- <!-- Configuration -->
- <!-- ================================================================== -->
- <target name="configure" depends="init">
- <mkdir dir="${deploy.artifacts.dir}/resources/hsqldb" />
-
- <echo message="creating hsqldb db" />
-
- <echo message="USER DIR: ${user.dir}/target/db" />
- <mkdir dir="${user.dir}/target/db" />
-
- <ant antfile="src/main/resources/config-tool/build.xml"
- target="db.create"
- inheritall="false">
-
- <property name="test_classpath" value="${maven.test.classpath}" />
- <property name="runtime_classpath" value="${maven.runtime.classpath}" />
-
- <property name="database" value="hsqldb.url" />
- <property name="jdbc.hsqldb.url" value="jdbc:hsqldb:file:target/db/jbpm4DB" />
- <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-hsqldb-config" />
- <property name="db.scripts.dir" value="${output.dir}/config.tool.tmp/hsqldb.scripts" />
- <property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
- <property name="libs.dir" value="${deploy.artifacts.dir}/lib" />
- </ant>
-
- <sql driver="org.hsqldb.jdbcDriver"
- url="jdbc:hsqldb:file:target/db/jbpm4DB"
- userid="sa"
- password=""
- onerror="continue">
- <transaction>SHUTDOWN</transaction>
-
- <classpath>
- <pathelement path="${maven.runtime.classpath}"/>
- </classpath>
-
- <!--classpath>
- <fileset dir="${deploy.artifacts.dir}/lib">
- <include name="*.jar"/>
- </fileset>
- </classpath-->
- </sql>
-
- <mkdir dir="${deploy.artifacts.dir}/resources/hsqldb" />
- <copy todir="${deploy.artifacts.dir}/resources/hsqldb">
- <fileset dir="${user.dir}/target/db" />
- </copy>
-
-
- <echo message="creating db configurations" />
- <ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false">
-
- <property name="test_classpath" value="${maven.test.classpath}" />
- <property name="runtime_classpath" value="${maven.runtime.classpath}" />
-
- <property name="database" value="hsqldb" />
- <property name="connection.type" value="datasource" />
- <property name="deployment.type" value="sar" />
- <property name="hibernate.session" value="current" />
- <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-hsqldb-config" />
- <property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" />
- <property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
- <property name="libs.dir" value="${deploy.artifacts.dir}/lib" />
- </ant>
- <ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false">
-
- <property name="test_classpath" value="${maven.test.classpath}" />
- <property name="runtime_classpath" value="${maven.runtime.classpath}" />
-
- <property name="database" value="mysql" />
- <property name="connection.type" value="datasource" />
- <property name="deployment.type" value="sar" />
- <property name="hibernate.session" value="current" />
- <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-mysql-config" />
- <property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" />
- <property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
- <property name="libs.dir" value="${deploy.artifacts.dir}/lib" />
- </ant>
- <ant antfile="src/main/resources/config-tool/build.xml" target="create.db.scripts" inheritall="false">
-
- <property name="test_classpath" value="${maven.test.classpath}" />
- <property name="runtime_classpath" value="${maven.runtime.classpath}" />
-
- <property name="database" value="oracle" />
- <property name="connection.type" value="datasource" />
- <property name="deployment.type" value="sar" />
- <property name="hibernate.session" value="current" />
- <property name="config.files.dir" value="${deploy.artifacts.resources}/jbpm-oracle-config" />
- <property name="db.scripts.dir" value="${deploy.artifacts.dir}/db.scripts" />
- <property name="tmp.dir" value="${output.dir}/config.tool.tmp" />
- <property name="libs.dir" value="${deploy.artifacts.dir}/lib" />
- </ant>
-
-
- <!-- the next copy depends on previous config-tool execution -->
- <mkdir dir="${deploy.artifacts.dir}/resources/datasources" />
- <copy todir="${deploy.artifacts.dir}/resources/datasources">
- <fileset dir="${output.dir}/config.tool.tmp/resolved/jboss/datasource"/>
- </copy>
-
- <condition property="database.is.hsqldb" value="true" else="false">
- <equals arg1="${database}" arg2="hsqldb"/>
- </condition>
- <condition property="database.is.mysql" value="true" else="false">
- <equals arg1="${database}" arg2="mysql"/>
- </condition>
- <condition property="database.is.postgresql" value="true" else="false">
- <equals arg1="${database}" arg2="postgresql"/>
- </condition>
- <condition property="database.is.oracle" value="true" else="false">
- <equals arg1="${database}" arg2="oracle"/>
- </condition>
- <condition property="database.is.sybase" value="true" else="false">
- <equals arg1="${database}" arg2="sybase"/>
- </condition>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Distribution -->
- <!-- ================================================================== -->
- <target name="build-installer" depends="configure">
-
- <copy todir="${filtered.resources.dir}" filtering="true" overwrite="true">
- <fileset dir="${resources.dir}/installer" />
- <filterset>
- <filter token="database" value="${database}" />
- <filter token="database.is.hsqldb" value="${database.is.hsqldb}" />
- <filter token="database.is.mysql" value="${database.is.mysql}" />
- <filter token="database.is.postgresql" value="${database.is.postgresql}" />
- <filter token="database.is.oracle" value="${database.is.oracle}" />
- <filter token="database.is.sybase" value="${database.is.sybase}" />
- <filter token="jbpm.target.container" value="${jbpm.target.container}" />
- <filter token="jboss.home" value="${jboss.home}" />
- <filter token="product.version" value="${product.version}" />
- <filter token="user.home" value="${user.home}" />
- </filterset>
- </copy>
-
- <!-- Allows us to use the IzPack Ant task, standalone-compiler.jar added to Ant lib -->
- <taskdef name="izpack" classname="com.izforge.izpack.ant.IzPackTask">
- <classpath>
- <pathelement path="${maven.runtime.classpath}" />
- </classpath>
- </taskdef>
- <property name="izpack.temp.dir" value="${output.dir}/izpack-temp" />
- <mkdir dir="${izpack.temp.dir}" />
-
- <!-- Run installer build -->
- <echo message="Running IzPack to build the installer..." />
- <izpack input="${resources.dir}/installer/install-definition.xml"
- output="${output.dir}/jbpm-installer-${product.version}.jar"
- installerType="standard"
- inheritAll="true"
- basedir="${izpack.temp.dir}" />
-
- <!-- Clean working directory -->
- <delete dir="${izpack.temp.dir}" quiet="true" includeemptydirs="true" />
- </target>
-</project>
\ No newline at end of file
Modified: jbpm4/trunk/modules/distro/scripts/assembly-distro.xml
===================================================================
--- jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-08-28 21:23:48 UTC (rev 5585)
+++ jbpm4/trunk/modules/distro/scripts/assembly-distro.xml 2009-08-29 08:58:55 UTC (rev 5586)
@@ -79,13 +79,6 @@
</fileSet>
<fileSet>
<directory>../db/target/classes</directory>
- <outputDirectory>db/schema.scripts</outputDirectory>
- <includes>
- <include>*.sql</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../db/target/classes</directory>
<outputDirectory>install/src/db</outputDirectory>
<includes>
<include>*.sql</include>
Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-28 21:23:48 UTC (rev 5585)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml 2009-08-29 08:58:55 UTC (rev 5586)
@@ -285,8 +285,10 @@
</fileset>
</copy>
- <!-- Copy Signavio war into /webapps -->
+ <!-- Copy Signavio war into /webapps
+ commented cause it doesn't seem to run on jdk 5
<antcall target="install.signavio.into.jboss" />
+ -->
<copy todir="${jboss.server.config.dir}/deploy/jbpm" overwrite="true">
<fileset dir="${jbpm.home}/lib">
Copied: jbpm4/trunk/qa/demo.setup.jboss.sh (from rev 5585, jbpm4/trunk/qa/test.demo.setup.sh)
===================================================================
--- jbpm4/trunk/qa/demo.setup.jboss.sh (rev 0)
+++ jbpm4/trunk/qa/demo.setup.jboss.sh 2009-08-29 08:58:55 UTC (rev 5586)
@@ -0,0 +1,3 @@
+set MAVEN_OPTS=-Xms1024M -Xmx1024M
+mvn -U -Pdistro clean install
+ant -f qa/build.xml manual.testrun.setup
Added: jbpm4/trunk/qa/demo.setup.tomcat.bat
===================================================================
--- jbpm4/trunk/qa/demo.setup.tomcat.bat (rev 0)
+++ jbpm4/trunk/qa/demo.setup.tomcat.bat 2009-08-29 08:58:55 UTC (rev 5586)
@@ -0,0 +1,6 @@
+echo To run this, make sure that at least you have jbpm.parent.dir specified in your ${user.home}/.jbpm4/build.properties
+cmd /C mvn -U -Pdistro clean install
+cmd /C ant -f qa/build.xml reinstall.jbpm
+cmd /C ant -f modules/distro/src/main/files/install/build.xml demo.setup.tomcat
+
+echo
\ No newline at end of file
Added: jbpm4/trunk/qa/demo.setup.tomcat.sh
===================================================================
--- jbpm4/trunk/qa/demo.setup.tomcat.sh (rev 0)
+++ jbpm4/trunk/qa/demo.setup.tomcat.sh 2009-08-29 08:58:55 UTC (rev 5586)
@@ -0,0 +1,4 @@
+set MAVEN_OPTS=-Xms1024M -Xmx1024M
+mvn -U -Pdistro clean install
+ant -f qa/build.xml reinstall.jbpm
+ant -f modules/distro/src/main/files/install/build.xml demo.setup.tomcat
Deleted: jbpm4/trunk/qa/test.demo.setup.sh
===================================================================
--- jbpm4/trunk/qa/test.demo.setup.sh 2009-08-28 21:23:48 UTC (rev 5585)
+++ jbpm4/trunk/qa/test.demo.setup.sh 2009-08-29 08:58:55 UTC (rev 5586)
@@ -1,3 +0,0 @@
-set MAVEN_OPTS=-Xms1024M -Xmx1024M
-mvn -U -Pdistro clean install
-ant -f qa/build.xml manual.testrun.setup
14 years, 8 months
JBoss JBPM SVN: r5585 - jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-08-28 17:23:48 -0400 (Fri, 28 Aug 2009)
New Revision: 5585
Modified:
jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
Log:
[JBPM-1365] Add QA for mssql
install sql server driver from hudson script
Modified: jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2009-08-28 20:09:36 UTC (rev 5584)
+++ jbpm3/branches/jbpm-3.2-soa/hudson/hudson-home/command.sh 2009-08-28 21:23:48 UTC (rev 5585)
@@ -86,21 +86,40 @@
echo $MVN_CMD; $MVN_CMD
cat resolve.tmp
-# Install Sybase driver
-if [ "$DATABASE" = "sybase" ]; then
- JCONNECT_VERSION=`grep com.sybase:jconnect resolve.tmp | awk --field-separator : '{ print $4 }'`
- JCONNECT_JAR=~/.m2/repository/com/sybase/jconnect/$JCONNECT_VERSION/jconnect-$JCONNECT_VERSION.jar
- if [ -f $JCONNECT_JAR ]; then
- CP_CMD="cp $JCONNECT_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib"
+# Install DB2 driver
+if [ "$DATABASE" = "db2" ]; then
+ DB2JCC_VERSION=`grep com.ibm:db2jcc:jar resolve.tmp | awk --field-separator : '{ print $4 }'`
+ DB2JCC_JAR=~/.m2/repository/com/ibm/db2jcc/$DB2JCC_VERSION/db2jcc-$DB2JCC_VERSION.jar
+ if [ -f $DB2JCC_JAR ]; then
+ CP_CMD="cp $DB2JCC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib"
echo $CP_CMD; $CP_CMD
else
- echo "WARNING: Sybase driver not found: $JCONNECT_JAR"
+ echo "WARNING: DB2 driver not found: $DB2JCC_JAR"
fi
+ DB2JCC_LICENSE=~/.m2/repository/com/ibm/db2jcc_license_cu/$DB2JCC_VERSION/db2jcc_license_cu-$DB2JCC_VERSION.jar
+ if [ -f $DB2JCC_LICENSE ]; then
+ CP_CMD="cp $DB2JCC_LICENSE $JBOSS_HOME/server/$JBOSS_SERVER/lib"
+ echo $CP_CMD; $CP_CMD
+ else
+ echo "WARNING: DB2 license not found: $DB2JCC_LICENSE"
+ fi
fi
+# Install MSSQL driver
+if [ "$DATABASE" = "mssql" ]; then
+ MSJDBC_VERSION=`grep com.microsoft.sqlserver:msjdbc resolve.tmp | awk --field-separator : '{ print $4 }'`
+ MSJDBC_JAR=~/.m2/repository/com/microsoft/sqlserver/msjdbc/$MSJDBC_VERSION/msjdbc-$MSJDBC_VERSION.jar
+ if [ -f $MSJDBC_JAR ]; then
+ CP_CMD="cp $MSJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib"
+ echo $CP_CMD; $CP_CMD
+ else
+ echo "WARNING: MSSQL driver not found: $MSSQL_JAR"
+ fi
+fi
+
# Install Oracle driver
if [ "$DATABASE" = "oracle" ]; then
- OJDBC_VERSION=`grep com.oracle:ojdbc14:jar resolve.tmp | awk --field-separator : '{ print $4 }'`
+ OJDBC_VERSION=`grep com.oracle:ojdbc14 resolve.tmp | awk --field-separator : '{ print $4 }'`
OJDBC_JAR=~/.m2/repository/com/oracle/ojdbc14/$OJDBC_VERSION/ojdbc14-$OJDBC_VERSION.jar
if [ -f $OJDBC_JAR ]; then
CP_CMD="cp $OJDBC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib"
@@ -110,23 +129,16 @@
fi
fi
-# Install DB2 driver
-if [ "$DATABASE" = "db2" ]; then
- DB2JCC_VERSION=`grep com.ibm:db2jcc:jar resolve.tmp | awk --field-separator : '{ print $4 }'`
- DB2JCC_JAR=~/.m2/repository/com/ibm/db2jcc/$DB2JCC_VERSION/db2jcc-$DB2JCC_VERSION.jar
- if [ -f $DB2JCC_JAR ]; then
- CP_CMD="cp $DB2JCC_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib"
+# Install Sybase driver
+if [ "$DATABASE" = "sybase" ]; then
+ JCONNECT_VERSION=`grep com.sybase:jconnect resolve.tmp | awk --field-separator : '{ print $4 }'`
+ JCONNECT_JAR=~/.m2/repository/com/sybase/jconnect/$JCONNECT_VERSION/jconnect-$JCONNECT_VERSION.jar
+ if [ -f $JCONNECT_JAR ]; then
+ CP_CMD="cp $JCONNECT_JAR $JBOSS_HOME/server/$JBOSS_SERVER/lib"
echo $CP_CMD; $CP_CMD
else
- echo "WARNING: DB2 driver not found: $DB2JCC_JAR"
+ echo "WARNING: Sybase driver not found: $JCONNECT_JAR"
fi
- DB2JCC_LICENSE=~/.m2/repository/com/ibm/db2jcc_license_cu/$DB2JCC_VERSION/db2jcc_license_cu-$DB2JCC_VERSION.jar
- if [ -f $DB2JCC_LICENSE ]; then
- CP_CMD="cp $DB2JCC_LICENSE $JBOSS_HOME/server/$JBOSS_SERVER/lib"
- echo $CP_CMD; $CP_CMD
- else
- echo "WARNING: DB2 license not found: $DB2JCC_LICENSE"
- fi
fi
# Remove resolution output file
14 years, 8 months
JBoss JBPM SVN: r5584 - in jbpm3/branches/jbpm-3.2-soa/modules/enterprise: src/test/resources and 1 other directory.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-08-28 16:09:36 -0400 (Fri, 28 Aug 2009)
New Revision: 5584
Added:
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/test.policy
Removed:
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/tst.policy
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
Log:
exclude failing console test
Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2009-08-28 19:29:22 UTC (rev 5583)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml 2009-08-28 20:09:36 UTC (rev 5584)
@@ -29,7 +29,7 @@
<!-- Properties -->
<properties>
- <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
+ <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/test.policy</surefire.security.args>
</properties>
<!-- Dependencies -->
@@ -96,6 +96,7 @@
<filtering>true</filtering>
</testResource>
</testResources>
+
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
@@ -116,6 +117,7 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
@@ -133,6 +135,7 @@
</descriptors>
</configuration>
</execution>
+
<execution>
<id>assembly-test-dependencies</id>
<phase>generate-test-resources</phase>
@@ -150,12 +153,14 @@
</execution>
</executions>
</plugin>
+
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<showDeprecation>false</showDeprecation>
</configuration>
</plugin>
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -166,6 +171,9 @@
<value>${project.build.directory}</value>
</property>
</systemProperties>
+ <excludes>
+ <exclude>org/jbpm/enterprise/console/ConsoleAvailabilityTest.java</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
Copied: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/test.policy (from rev 5492, jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/tst.policy)
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/test.policy (rev 0)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/test.policy 2009-08-28 20:09:36 UTC (rev 5584)
@@ -0,0 +1,4 @@
+grant {
+ permission java.security.AllPermission;
+};
+
Deleted: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/tst.policy
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/tst.policy 2009-08-28 19:29:22 UTC (rev 5583)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/resources/tst.policy 2009-08-28 20:09:36 UTC (rev 5584)
@@ -1,4 +0,0 @@
-grant {
- permission java.security.AllPermission;
-};
-
14 years, 8 months
JBoss JBPM SVN: r5583 - jbpm3/branches/jbpm-3.2-soa/modules/core.
by do-not-reply@jboss.org
Author: alex.guizar(a)jboss.com
Date: 2009-08-28 15:29:22 -0400 (Fri, 28 Aug 2009)
New Revision: 5583
Modified:
jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
Log:
[JBPM-1365] Add QA for mssql
Exclude JobExecutorDbTest from SQL Server suite because it hangs
Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2009-08-28 17:02:53 UTC (rev 5582)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml 2009-08-28 19:29:22 UTC (rev 5583)
@@ -238,9 +238,9 @@
</dependencies>
</profile>
- <!--
+ <!--
Name: db2
- Descr: DB2 Database Setup
+ Descr: DB2 Test Exclusions
-->
<profile>
<id>db2</id>
@@ -264,9 +264,35 @@
</build>
</profile>
- <!--
+ <!--
+ Name: mssql
+ Descr: SQL Server Test Exclusions
+ -->
+ <profile>
+ <id>mssql</id>
+ <activation>
+ <property>
+ <name>database</name>
+ <value>mssql</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/jbpm/job/executor/JobExecutorDbTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
Name: oracle
- Descr: Oracle Database Setup
+ Descr: Oracle Test Exclusions
-->
<profile>
<id>oracle</id>
14 years, 8 months
JBoss JBPM SVN: r5582 - in jbpm4/trunk: qa and 1 other directory.
by do-not-reply@jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2009-08-28 13:02:53 -0400 (Fri, 28 Aug 2009)
New Revision: 5582
Modified:
jbpm4/trunk/modules/test-cactus/pom.xml
jbpm4/trunk/qa/hudson-jbpm4-tomcat.bat
Log:
added removal of the generated AllIntegrationTests.java source file after the cactus test have run
Modified: jbpm4/trunk/modules/test-cactus/pom.xml
===================================================================
--- jbpm4/trunk/modules/test-cactus/pom.xml 2009-08-28 14:17:56 UTC (rev 5581)
+++ jbpm4/trunk/modules/test-cactus/pom.xml 2009-08-28 17:02:53 UTC (rev 5582)
@@ -186,6 +186,18 @@
</tasks>
</configuration>
</execution>
+ <execution>
+ <id>remove-generated-cactus-test</id>
+ <phase>package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <delete file="src/test/java/org/jbpm/test/AllIntegrationTests.java" />
+ </tasks>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
Modified: jbpm4/trunk/qa/hudson-jbpm4-tomcat.bat
===================================================================
--- jbpm4/trunk/qa/hudson-jbpm4-tomcat.bat 2009-08-28 14:17:56 UTC (rev 5581)
+++ jbpm4/trunk/qa/hudson-jbpm4-tomcat.bat 2009-08-28 17:02:53 UTC (rev 5582)
@@ -5,7 +5,7 @@
cmd /C ant -f qa/build.xml testsuite.tomcat.setup
cd modules\test-cactus
-cmd /C mvn -Pruntest test
+cmd /C mvn -Pruntest package
cd ..\..
cmd /C ant -f qa/build.xml testsuite.tomcat.teardown
14 years, 8 months