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

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-06-29 02:49:27 -0400 (Tue, 29 Jun 2010)
New Revision: 6440

Added:
   jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.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/spring.testsuite.jbpm.cfg.xml
   jbpm4/trunk/modules/examples/pom.xml
Log:
JBPM-2893: fix broken jbpm4-spring job - introduce spring.testsuite.examples configuration

Modified: jbpm4/trunk/modules/distro/src/main/files/install/build.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2010-06-29 03:07:20 UTC (rev 6439)
+++ jbpm4/trunk/modules/distro/src/main/files/install/build.xml	2010-06-29 06:49:27 UTC (rev 6440)
@@ -188,10 +188,7 @@
 
     <!-- If the target environment uses Spring, also copy the applicationContext.xml file-->
     <condition property="is.spring.environment">
-      <or>
-        <equals arg1="${tx}" arg2="spring" />
-        <equals arg1="${tx}" arg2="spring.testsuite" />
-      </or>
+      <contains string="${tx}" substring="spring" />
     </condition>
     <antcall target="internal.copy.spring.applicationContext" />
   </target>

Added: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.examples.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.examples.jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.examples.jbpm.cfg.xml	2010-06-29 06:49:27 UTC (rev 6440)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<jbpm-configuration>
+
+  <import resource="jbpm.default.cfg.xml" />
+  <import resource="jbpm.tx.spring.cfg.xml" />
+  <import resource="jbpm.jpdl.cfg.xml" />
+  <import resource="jbpm.bpmn.cfg.xml" />
+  <import resource="jbpm.identity.cfg.xml" />
+  <import resource="jbpm.businesscalendar.cfg.xml" />
+  <import resource="jbpm.console.cfg.xml" />
+  <import resource="jbpm.mail.templates.examples.xml" />
+  
+  <process-engine-context>
+    <string name="spring.cfg" value="applicationContext.xml" />
+  </process-engine-context>
+
+</jbpm-configuration>


Property changes on: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.examples.jbpm.cfg.xml
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + native

Modified: jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml	2010-06-29 03:07:20 UTC (rev 6439)
+++ jbpm4/trunk/modules/distro/src/main/files/install/src/cfg/jbpm/spring.testsuite.jbpm.cfg.xml	2010-06-29 06:49:27 UTC (rev 6440)
@@ -9,7 +9,6 @@
   <import resource="jbpm.identity.cfg.xml" />
   <import resource="jbpm.businesscalendar.cfg.xml" />
   <import resource="jbpm.console.cfg.xml" />
-  <import resource="jbpm.mail.templates.examples.xml" />
   
   <process-engine-context>
     <string name="spring.cfg" value="applicationContext.xml" />

Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml	2010-06-29 03:07:20 UTC (rev 6439)
+++ jbpm4/trunk/modules/examples/pom.xml	2010-06-29 06:49:27 UTC (rev 6440)
@@ -162,7 +162,7 @@
                 <configuration>
                   <tasks>
                     <ant antfile="../distro/src/main/files/install/build.xml" target="create.cfg">
-                      <property name="tx" value="spring.testsuite" />
+                      <property name="tx" value="spring.testsuite.examples" />
                       <property name="hibernate.connection.type" value="spring" />
                       <property name="database" value="hsqldb.inmem" />
                       <property name="mail.cfg" value="testsuite" />