[jbpm-commits] JBoss JBPM SVN: r4395 - in jbpm4/trunk: modules/examples and 1 other directories.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-04-02 16:01:33 -0400 (Thu, 02 Apr 2009)
New Revision: 4395

Modified:
   jbpm4/trunk/modules/examples/pom.xml
   jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml
   jbpm4/trunk/pom.xml
Log:
TODO JBPM-2141: Distinguish deployment suffixes for integration tests

Modified: jbpm4/trunk/modules/examples/pom.xml
===================================================================
--- jbpm4/trunk/modules/examples/pom.xml	2009-04-02 19:34:49 UTC (rev 4394)
+++ jbpm4/trunk/modules/examples/pom.xml	2009-04-02 20:01:33 UTC (rev 4395)
@@ -84,6 +84,7 @@
                 <property name="build.dir" value="${project.build.directory}" />
                 <property name="test.resources.dir" value="${build.dir}/test-classes" />
                 <property name="build.finalName" value="${project.build.finalName}" />
+                <property name="jbpm.target.container" value="${jbpm.target.container}"/>
                 <ant antfile="scripts/antrun-test-jars.xml" target="build-jars" />
               </tasks>
             </configuration>

Modified: jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml
===================================================================
--- jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml	2009-04-02 19:34:49 UTC (rev 4394)
+++ jbpm4/trunk/modules/examples/scripts/antrun-test-jars.xml	2009-04-02 20:01:33 UTC (rev 4395)
@@ -12,8 +12,20 @@
 
   <description>Example test archives</description>
 
+  <!--
+      
+     Currently the JBPMDeployer in AS 4 and AS 5 uses different
+     archives suffixes, hence we need to distinguish here
+  -->
+
+  <condition property="archive.suffix" value="jar" else="jpdl">
+    <equals arg1="${jbpm.target.container}" arg2="jboss500"/>
+  </condition>
+
   <target name="build-jars" description="Build the test modules.">
 
+    <echo>FIXME JBPM-2141: Deployment suffix ${archive.suffix} ***</echo>
+    
     <mkdir dir="${build.dir}/test-libs"/>
 
     <!-- ConcurrencyGraphBasedTest -->
@@ -23,11 +35,11 @@
     <test-jar name="EndMultipleTest" pkg="end/multiple"/>
 
     <!-- EndProcessInstanceTest -->
-    <test-jar name="EndProcessInstanceTest" pkg="end/processinstance"/>   
+    <test-jar name="EndProcessInstanceTest" pkg="end/processinstance"/>
 
     <!-- EndStateTest -->
     <test-jar name="EndStateTest" pkg="end/state"/>
-   
+
     <!-- EsbTest -->
     <test-jar name="EsbTest" pkg="esb"/>
 
@@ -83,7 +95,7 @@
     <attribute name="name"/>
     <attribute name="pkg"/>
 
-    <sequential>      
+    <sequential>
       <jar destfile="${build.dir}/test-libs/jbpm-@{name}.jar">
         <fileset dir="${build.dir}/test-classes">
           <include name="org/jbpm/examples/@{pkg}/**/*" />

Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml	2009-04-02 19:34:49 UTC (rev 4394)
+++ jbpm4/trunk/pom.xml	2009-04-02 20:01:33 UTC (rev 4395)
@@ -509,7 +509,23 @@
       </dependencies>
     </profile>
 
+    <!--
+       Name:  no-target-container
+       Descr: Setup the default target container
+       -->
     <profile>
+      <id>no-target-container</id>
+      <activation>
+        <property>
+          <name>!jbpm.target.container</name>
+        </property>
+      </activation>
+      <properties>
+        <jbpm.target.container>jboss500</jbpm.target.container>
+      </properties>
+    </profile>
+
+    <profile>
       <id>hsql</id>
       <activation>
         <property>