[jbpm-commits] JBoss JBPM SVN: r5589 - in jbpm4/trunk/modules: distro/src/main/files/install/src/cfg/jbpm and 3 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sat Aug 29 16:09:05 EDT 2009
Author: tom.baeyens at 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/galileo/R/${eclipse.filename}" />
- <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
More information about the jbpm-commits
mailing list