[jbpm-commits] JBoss JBPM SVN: r5262 - in jbpm3/branches/jbpm-3.2-soa/modules: enterprise and 2 other directories.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2009-07-08 22:40:27 -0400 (Wed, 08 Jul 2009)
New Revision: 5262

Modified:
   jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
   jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
   jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java
   jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml
Log:
JBPM-1292: Integrate simulation tests in automated testrun (RESOLVED)
Supply missing xerces dependencies under jdk 1.4

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml	2009-07-08 19:37:50 UTC (rev 5261)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/pom.xml	2009-07-09 02:40:27 UTC (rev 5262)
@@ -174,7 +174,7 @@
           <systemProperties>
             <property>
               <name>log4j.output.dir</name>
-              <value>${basedir}/target</value>
+              <value>${project.build.directory}</value>
             </property>
           </systemProperties>
         </configuration>

Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml	2009-07-08 19:37:50 UTC (rev 5261)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/pom.xml	2009-07-09 02:40:27 UTC (rev 5262)
@@ -163,7 +163,7 @@
           <systemProperties>
             <property>
               <name>log4j.output.dir</name>
-              <value>${basedir}/target</value>
+              <value>${project.build.directory}</value>
             </property>
           </systemProperties>
         </configuration>

Modified: jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java	2009-07-08 19:37:50 UTC (rev 5261)
+++ jbpm3/branches/jbpm-3.2-soa/modules/enterprise/src/test/java/org/jbpm/enterprise/config/AppServerConfigurationsTest.java	2009-07-09 02:40:27 UTC (rev 5262)
@@ -33,12 +33,16 @@
 
 public class AppServerConfigurationsTest extends ServletTestCase {
 
-  JbpmConfiguration jbpmConfiguration = JbpmConfiguration.getInstance();
+  private JbpmConfiguration jbpmConfiguration;
 
   public static Test suite() throws Exception {
     return new IntegrationTestSetup(AppServerConfigurationsTest.class, "enterprise-test.war");
   }
 
+  protected void setUp() throws Exception {
+    jbpmConfiguration = JbpmConfiguration.getInstance();
+  }
+
   public void testUnavailabilityOfTheJobExecutor() {
     assertNull(jbpmConfiguration.getJobExecutor());
   }

Modified: jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml	2009-07-08 19:37:50 UTC (rev 5261)
+++ jbpm3/branches/jbpm-3.2-soa/modules/identity/pom.xml	2009-07-09 02:40:27 UTC (rev 5262)
@@ -52,31 +52,10 @@
     </dependency>
   </dependencies>
 
-   <!-- Plugins -->
+  <!-- Plugins -->
   <build>
     <plugins>
-      <!-- 
       <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>schema</id>
-            <phase>process-test-resources</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <property name="test.classpath" refid="maven.test.classpath" />
-                <property name="log4j.output.dir" location="${basedir}/target" />
-                <ant antfile="scripts/antrun-jbpm-schema.xml" target="create" />
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      -->
-      <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
@@ -93,6 +72,7 @@
               </descriptors>
             </configuration>
           </execution>
+
           <execution>
             <id>assembly-service</id>
             <phase>package</phase>
@@ -109,6 +89,7 @@
           </execution>
         </executions>
       </plugin>
+
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
@@ -117,4 +98,30 @@
       </plugin>
     </plugins>
   </build>
+
+  <!-- Profiles -->
+  <profiles>
+    <!--
+      Name: jdk14
+      Desc: dependencies specific to jdk 1.4
+    -->
+    <profile>
+      <id>jdk14</id>
+      <activation>
+        <jdk>1.4</jdk>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>xerces</groupId>
+          <artifactId>xmlParserAPIs</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>
\ No newline at end of file