[jbpm-commits] JBoss JBPM SVN: r3302 - in jbpm3/trunk: modules/enterprise and 3 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Dec 9 16:48:46 EST 2008


Author: thomas.diesler at jboss.com
Date: 2008-12-09 16:48:46 -0500 (Tue, 09 Dec 2008)
New Revision: 3302

Added:
   jbpm3/trunk/modules/enterprise/scripts/
   jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml
   jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml
   jbpm3/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml
   jbpm3/trunk/modules/enterprise/src/
   jbpm3/trunk/modules/enterprise/src/main/
   jbpm3/trunk/modules/enterprise/src/test/
Removed:
   jbpm3/trunk/modules/enterprise/ear/
   jbpm3/trunk/modules/enterprise/jar/scripts/
   jbpm3/trunk/modules/enterprise/jar/src/
   jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml
   jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml
   jbpm3/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml
   jbpm3/trunk/modules/enterprise/src/main/
   jbpm3/trunk/modules/enterprise/src/test/
Modified:
   jbpm3/trunk/modules/enterprise/pom.xml
   jbpm3/trunk/pom.xml
Log:
Remove jbpm-enterprise.ear

Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml	2008-12-09 21:41:52 UTC (rev 3301)
+++ jbpm3/trunk/modules/enterprise/pom.xml	2008-12-09 21:48:46 UTC (rev 3302)
@@ -16,7 +16,7 @@
   <name>JBoss jBPM3 - Enterprise</name>
   <groupId>org.jbpm.jbpm3</groupId>
   <artifactId>jbpm-enterprise</artifactId>
-  <packaging>pom</packaging>
+  <packaging>ejb</packaging>
 
   <!-- Parent -->
   <parent>
@@ -26,10 +26,348 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-  <!-- Modules -->
-  <modules>
-    <module>jar</module>
-    <module>ear</module>
-  </modules>
+  <!-- Dependencies -->
+  <dependencies>
+    <!-- jBPM Dependencies -->
+    <dependency>
+      <groupId>org.jbpm.jbpm3</groupId>
+      <artifactId>jbpm-jpdl</artifactId>
+      <version>${version}</version>
+    </dependency>
 
+    <!-- Provided Dependencies -->
+    <dependency>
+      <groupId>javax.ejb</groupId>
+      <artifactId>ejb-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.jms</groupId>
+      <artifactId>jms</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>org.apache.cactus</groupId>
+      <artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>org.mortbay.jetty</artifactId>
+          <groupId>org.mortbay.jetty</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cactus</groupId>
+      <artifactId>cactus.integration.shared.api</artifactId>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>org.mortbay.jetty</artifactId>
+          <groupId>org.mortbay.jetty</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.client</groupId>
+      <artifactId>jbossall-client</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.bpm</groupId>
+      <artifactId>bpm-spec-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <!-- Plugins -->
+  <build>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <filtering>true</filtering>
+      </testResource>
+    </testResources>
+    <plugins>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>build-test-jars</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <property name="tests.output.dir" value="${project.build.directory}" />
+                <property name="tests.resources.dir" value="${basedir}/src/test/resources" />
+                <ant antfile="scripts/antrun-test-jars.xml" target="build-test-jars" />
+              </tasks>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>assembly-config</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <finalName>${project.build.finalName}</finalName>
+              <appendAssemblyId>true</appendAssemblyId>
+              <descriptors>
+                <descriptor>scripts/assembly-config.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+          <execution>
+            <id>assembly-test-dependencies</id>
+            <phase>generate-test-resources</phase>
+            <goals>
+              <goal>directory-single</goal>
+            </goals>
+            <configuration>
+              <finalName>test-dependencies</finalName>
+              <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+              <appendAssemblyId>false</appendAssemblyId>
+              <descriptors>
+                <descriptor>scripts/assembly-test-dependencies.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <showDeprecation>false</showDeprecation>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>jbpm.cfg.xml</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>${surefire.jvm.args}</argLine>
+          <systemProperties>
+            <property>
+              <name>log4j.output.dir</name>
+              <value>${basedir}/target</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <!-- Profiles -->
+  <profiles>
+
+    <!--
+      Name: no-jboss-bind-address 
+      Descr: Set the default jboss.bind.address command line cannot overwrite pom properties
+      http://jira.codehaus.org/browse/MNG-3546
+    -->
+    <profile>
+      <id>no-jboss-bind-address</id>
+      <activation>
+        <property>
+          <name>!jboss.bind.address</name>
+        </property>
+      </activation>
+      <properties>
+        <jboss.bind.address>localhost</jboss.bind.address>
+      </properties>
+    </profile>
+
+    <!-- 
+    Name:  no-jbpm-target-container
+    Descr: Setup the default database   
+    -->
+    <profile>
+      <id>no-jbpm-target-container</id>
+      <activation>
+        <property>
+          <name>!jbpm.target.container</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <systemProperties>
+                <property>
+                  <name>jbpm.target.container</name>
+                  <value>jboss422</value>
+                </property>
+                <property>
+                  <name>log4j.output.dir</name>
+                  <value>${basedir}/target</value>
+                </property>
+              </systemProperties>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- 
+    Name:  no-database
+    Descr: Setup the default database   
+    -->
+    <profile>
+      <id>no-database</id>
+      <activation>
+        <property>
+          <name>!database</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <!-- [JBPM-1708] Enterprise EjbSchedulerTest fails -->
+                <exclude>org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java</exclude>
+                <!-- [JBPM-1811] JmsMessageTest fails intermitently on HSQLDB -->
+                <exclude>org/jbpm/enterprise/jms/JmsMessageTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- 
+    Name:  hsqldb
+    Descr: Hypersonic Database Setup   
+    -->
+    <profile>
+      <id>hsqldb</id>
+      <activation>
+        <property>
+          <name>database</name>
+          <value>hsqldb</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <!-- [JBPM-1708] Enterprise EjbSchedulerTest fails -->
+                <exclude>org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java</exclude>
+                <!-- [JBPM-1811] JmsMessageTest fails intermitently on HSQLDB -->
+                <exclude>org/jbpm/enterprise/jms/JmsMessageTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- 
+    Name:  mysql
+    Descr: MySQL Database Setup   
+    -->
+    <profile>
+      <id>mysql</id>
+      <activation>
+        <property>
+          <name>database</name>
+          <value>mysql</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- 
+    Name:  postgresql
+    Descr: PostgreSQL Database Setup   
+    -->
+    <profile>
+      <id>postgresql</id>
+      <activation>
+        <property>
+          <name>database</name>
+          <value>postgresql</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- 
+    Name:  sybase
+    Descr: Sybase Database Setup   
+    -->
+    <profile>
+      <id>sybase</id>
+      <activation>
+        <property>
+          <name>database</name>
+          <value>sybase</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <!-- [JBPM-1818] Use Sybase instance that supports XA Transaction -->
+                <exclude>org/jbpm/enterprise/ejbtimer/EjbSchedulerTest.java</exclude>
+                <exclude>org/jbpm/enterprise/jta/JtaDbPersistenceTest.java</exclude>
+                <exclude>org/jbpm/enterprise/jms/JmsMessageTest.java</exclude>
+                <!-- [JBPM-1830] Fix AppServerConfigurationsTest for sybase on jboss500 -->
+                <exclude>org/jbpm/enterprise/config/AppServerConfigurationsTest.java</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>

Copied: jbpm3/trunk/modules/enterprise/scripts (from rev 3296, jbpm3/trunk/modules/enterprise/jar/scripts)

Deleted: jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/scripts/antrun-test-jars.xml	2008-12-09 16:17:05 UTC (rev 3296)
+++ jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml	2008-12-09 21:48:46 UTC (rev 3302)
@@ -1,40 +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$ -->
-
-<project>
-  
-  <description>jBPM enterprise test archive builder</description>
-  
-  <!-- ================================================================== -->
-  <!-- Building                                                           -->
-  <!-- ================================================================== -->
-  
-  <target name="build-test-jars" description="Build the test deployments">
-    
-    <mkdir dir="${tests.output.dir}/test-libs"/>
-    
-    <!-- enterprise-test -->
-    <war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/test-classes" />
-      <lib dir="${tests.output.dir}/test-dependencies">
-        <include name="aspectjrt*.jar"/>
-        <include name="cactus*.jar"/>
-        <include name="junit*.jar"/>
-      </lib>
-      <webinf dir="${tests.resources.dir}/WEB-INF">
-        <exclude name="web.xml"/>
-      </webinf>
-    </war>
-
-    <!-- Please add alphabetically -->
-    
-  </target>
-  
-</project>

Copied: jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml (from rev 3301, jbpm3/trunk/modules/enterprise/jar/scripts/antrun-test-jars.xml)
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml	2008-12-09 21:48:46 UTC (rev 3302)
@@ -0,0 +1,40 @@
+<?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$ -->
+
+<project>
+  
+  <description>jBPM enterprise test archive builder</description>
+  
+  <!-- ================================================================== -->
+  <!-- Building                                                           -->
+  <!-- ================================================================== -->
+  
+  <target name="build-test-jars" description="Build the test deployments">
+    
+    <mkdir dir="${tests.output.dir}/test-libs"/>
+    
+    <!-- enterprise-test -->
+    <war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes" />
+      <lib dir="${tests.output.dir}/test-dependencies">
+        <include name="aspectjrt*.jar"/>
+        <include name="cactus*.jar"/>
+        <include name="junit*.jar"/>
+      </lib>
+      <webinf dir="${tests.resources.dir}/WEB-INF">
+        <exclude name="web.xml"/>
+      </webinf>
+    </war>
+
+    <!-- Please add alphabetically -->
+    
+  </target>
+  
+</project>

Deleted: jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/scripts/assembly-config.xml	2008-12-09 16:17:05 UTC (rev 3296)
+++ jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml	2008-12-09 21:48:46 UTC (rev 3302)
@@ -1,18 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-  <id>config</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>${basedir}/src/main/etc</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>jbpm.cfg.xml</include>
-        <include>hibernate.extra.hbm.xml</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
\ No newline at end of file

Copied: jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml (from rev 3301, jbpm3/trunk/modules/enterprise/jar/scripts/assembly-config.xml)
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml	2008-12-09 21:48:46 UTC (rev 3302)
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+  <id>config</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${basedir}/src/main/etc</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>jbpm.cfg.xml</include>
+        <include>hibernate.extra.hbm.xml</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file

Deleted: jbpm3/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/scripts/assembly-test-dependencies.xml	2008-12-09 16:17:05 UTC (rev 3296)
+++ jbpm3/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml	2008-12-09 21:48:46 UTC (rev 3302)
@@ -1,28 +0,0 @@
-<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-
-  <id>test-dependencies</id>
-  <formats>
-    <format>dir</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-
-  <!-- Dependency Sets -->
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/</outputDirectory>
-      <useStrictFiltering>true</useStrictFiltering>
-      <includes>
-        <include>aspectj:aspectjrt:jar</include>
-        <include>org.apache.cactus:cactus.integration.shared.api</include>
-        <include>org.apache.cactus:cactus.core.framework.wrapper.javaEE.14</include>
-        <include>org.apache.cactus:cactus.core.framework.javaEE.13-14</include>
-        <include>org.apache.cactus:cactus.core.framework.javaEE.12-13-14</include>
-        <include>junit:junit</include>
-      </includes>
-      <unpack>false</unpack>
-      <scope>test</scope>
-    </dependencySet>
-  </dependencySets>
-
-</assembly>

Copied: jbpm3/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml (from rev 3301, jbpm3/trunk/modules/enterprise/jar/scripts/assembly-test-dependencies.xml)
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/scripts/assembly-test-dependencies.xml	2008-12-09 21:48:46 UTC (rev 3302)
@@ -0,0 +1,28 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+
+  <id>test-dependencies</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+
+  <!-- Dependency Sets -->
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <useStrictFiltering>true</useStrictFiltering>
+      <includes>
+        <include>aspectj:aspectjrt:jar</include>
+        <include>org.apache.cactus:cactus.integration.shared.api</include>
+        <include>org.apache.cactus:cactus.core.framework.wrapper.javaEE.14</include>
+        <include>org.apache.cactus:cactus.core.framework.javaEE.13-14</include>
+        <include>org.apache.cactus:cactus.core.framework.javaEE.12-13-14</include>
+        <include>junit:junit</include>
+      </includes>
+      <unpack>false</unpack>
+      <scope>test</scope>
+    </dependencySet>
+  </dependencySets>
+
+</assembly>

Copied: jbpm3/trunk/modules/enterprise/src (from rev 3296, jbpm3/trunk/modules/enterprise/jar/src)

Copied: jbpm3/trunk/modules/enterprise/src/main (from rev 3301, jbpm3/trunk/modules/enterprise/jar/src/main)

Copied: jbpm3/trunk/modules/enterprise/src/test (from rev 3301, jbpm3/trunk/modules/enterprise/jar/src/test)

Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml	2008-12-09 21:41:52 UTC (rev 3301)
+++ jbpm3/trunk/pom.xml	2008-12-09 21:48:46 UTC (rev 3302)
@@ -31,7 +31,7 @@
     <module>modules/core</module>
     <module>modules/db</module>
     <module>modules/identity</module>
-    <module>modules/enterprise/jar</module>
+    <module>modules/enterprise</module>
     <module>modules/examples</module>
     <module>modules/simulation</module>
     <module>modules/integration</module>




More information about the jbpm-commits mailing list