[jbpm-commits] JBoss JBPM SVN: r2147 - in jbpm3/trunk/modules: distribution and 5 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-09-09 08:20:10 -0400 (Tue, 09 Sep 2008) New Revision: 2147 Added: jbpm3/trunk/modules/enterprise/ear/ jbpm3/trunk/modules/enterprise/ear/pom.xml jbpm3/trunk/modules/enterprise/jar/ jbpm3/trunk/modules/enterprise/jar/pom.xml jbpm3/trunk/modules/enterprise/jar/scripts/ jbpm3/trunk/modules/enterprise/jar/src/ Removed: jbpm3/trunk/modules/enterprise/scripts/ jbpm3/trunk/modules/enterprise/src/ Modified: jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/web.xml jbpm3/trunk/modules/distribution/pom.xml jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml jbpm3/trunk/modules/enterprise/pom.xml Log: Use enterprise EAR packaging Modified: jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml 2008-09-09 09:30:11 UTC (rev 2146) +++ jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/jboss-web.xml 2008-09-09 12:20:10 UTC (rev 2147) @@ -1,36 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> + <!DOCTYPE jboss-web PUBLIC "-//JBoss//DTD Web Application 2.4//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_4_0.dtd"> <jboss-web> - <!-- - Specify the security domain to use. This will be java:/jaas/<name> where - <name> is one of the names configured in your login-config.xml. - --> - <security-domain>java:/jaas/jbpm-console</security-domain> - <context-root>jbpm-console</context-root> + <!-- + Specify the security domain to use. This will be java:/jaas/<name> where <name> is one of the names configured in your login-config.xml. + --> + <security-domain>java:/jaas/jbpm-console</security-domain> + <context-root>jbpm-console</context-root> - <resource-ref> - <res-ref-name>jdbc/JbpmDataSource</res-ref-name> - <jndi-name>java:/JbpmDS</jndi-name> - </resource-ref> + <resource-ref> + <res-ref-name>jdbc/JbpmDataSource</res-ref-name> + <jndi-name>java:/JbpmDS</jndi-name> + </resource-ref> - <!-- EJB local references (begin) === - <resource-ref> - <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> - <jndi-name>java:JmsXA</jndi-name> - </resource-ref> + <resource-ref> + <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> + <jndi-name>java:JmsXA</jndi-name> + </resource-ref> - <ejb-local-ref> - <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> - <local-jndi-name>java:ejb/TimerEntityBean</local-jndi-name> - </ejb-local-ref> + <ejb-local-ref> + <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> + <local-jndi-name>java:ejb/TimerEntityBean</local-jndi-name> + </ejb-local-ref> - <message-destination-ref> - <message-destination-ref-name>jms/JobQueue</message-destination-ref-name> - <jndi-name>queue/JbpmJobQueue</jndi-name> - </message-destination-ref> - ==== EJB local references (end) --> + <message-destination-ref> + <message-destination-ref-name>jms/JobQueue</message-destination-ref-name> + <jndi-name>queue/JbpmJobQueue</jndi-name> + </message-destination-ref> </jboss-web> Modified: jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/web.xml =================================================================== --- jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/web.xml 2008-09-09 09:30:11 UTC (rev 2146) +++ jbpm3/trunk/modules/console/src/main/webapp/WEB-INF/web.xml 2008-09-09 12:20:10 UTC (rev 2147) @@ -110,7 +110,7 @@ </login-config> <!== End Login configuration option #2 --> - <!-- Job executor launcher (begin) --> + <!-- Job executor launcher (begin) === <listener> <description> Starts the job executor on servlet context initialization and stops it on @@ -118,7 +118,7 @@ </description> <listener-class>org.jbpm.web.JobExecutorLauncher</listener-class> </listener> - <!-- Job executor launcher (end) --> + ==== Job executor launcher (end) --> <listener> <description> @@ -145,52 +145,50 @@ </servlet-mapping> ==== Job executor servlet (end) --> - <resource-ref> - <description> + <resource-ref> + <description> Logical name of the data source that provides connections to the persistence service. Must match the hibernate.connection.datasource property in the Hibernate configuration file. - </description> - <res-ref-name>jdbc/JbpmDataSource</res-ref-name> - <res-type>javax.sql.DataSource</res-type> - <res-auth>Container</res-auth> - </resource-ref> + </description> + <res-ref-name>jdbc/JbpmDataSource</res-ref-name> + <res-type>javax.sql.DataSource</res-type> + <res-auth>Container</res-auth> + </resource-ref> - <!-- This section is so that the web console can deploy in the jbpm-enterprise.ear module --> - <!-- EJB local references (begin) === - <resource-ref> - <description> + <!-- This section is so that the web console can deploy in the jbpm-enterprise.ear module --> + <resource-ref> + <description> Logical name of the factory that provides JMS connections to the message service. Required for processes that contain asynchronous continuations. - </description> - <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> - <res-type>javax.jms.ConnectionFactory</res-type> - <res-auth>Container</res-auth> - </resource-ref> + </description> + <res-ref-name>jms/JbpmConnectionFactory</res-ref-name> + <res-type>javax.jms.ConnectionFactory</res-type> + <res-auth>Container</res-auth> + </resource-ref> - <ejb-local-ref> - <description> + <ejb-local-ref> + <description> Link to the local entity bean that implements the scheduler service. Required for processes that contain timers. - </description> - <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> - <ejb-ref-type>Entity</ejb-ref-type> - <local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home> - <local>org.jbpm.ejb.LocalTimerEntity</local> - <ejb-link>TimerEntityBean</ejb-link> - </ejb-local-ref> + </description> + <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name> + <ejb-ref-type>Entity</ejb-ref-type> + <local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home> + <local>org.jbpm.ejb.LocalTimerEntity</local> + <ejb-link>TimerEntityBean</ejb-link> + </ejb-local-ref> - <message-destination-ref> - <description> + <message-destination-ref> + <description> The message service sends job messages to the queue referenced here. To ensure this is the same queue from which the JobListenerBean receives messages, the message-destination-link element points to a common logical destination, JobQueue. </description> - <message-destination-ref-name>jms/JobQueue</message-destination-ref-name> - <message-destination-type>javax.jms.Queue</message-destination-type> - <message-destination-usage>Produces</message-destination-usage> - <message-destination-link>JobQueue</message-destination-link> - </message-destination-ref> - ==== EJB local references (end) --> + <message-destination-ref-name>jms/JobQueue</message-destination-ref-name> + <message-destination-type>javax.jms.Queue</message-destination-type> + <message-destination-usage>Produces</message-destination-usage> + <message-destination-link>JobQueue</message-destination-link> + </message-destination-ref> </web-app> Modified: jbpm3/trunk/modules/distribution/pom.xml =================================================================== --- jbpm3/trunk/modules/distribution/pom.xml 2008-09-09 09:30:11 UTC (rev 2146) +++ jbpm3/trunk/modules/distribution/pom.xml 2008-09-09 12:20:10 UTC (rev 2147) @@ -29,12 +29,6 @@ <dependencies> <dependency> <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-console</artifactId> - <version>${version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-core</artifactId> <version>${version}</version> </dependency> @@ -52,17 +46,24 @@ </dependency> <dependency> <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-enterprise</artifactId> + <artifactId>jbpm-enterprise-beans</artifactId> <version>${version}</version> + <type>ejb</type> </dependency> <dependency> <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-enterprise</artifactId> + <artifactId>jbpm-enterprise-beans</artifactId> <classifier>config</classifier> <version>${version}</version> </dependency> <dependency> <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-enterprise-archive</artifactId> + <version>${version}</version> + <type>ear</type> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-identity</artifactId> <version>${version}</version> </dependency> Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-09 09:30:11 UTC (rev 2146) +++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml 2008-09-09 12:20:10 UTC (rev 2147) @@ -92,12 +92,6 @@ <equals arg1="${database}" arg2="postgresql"/> </condition> - <property name="web.xml" value="${deploy.artifacts.resources}/jbpm-console/WEB-INF/web.xml"/> - <macro-disable file="${web.xml}" section="Job executor launcher"/> - <macro-enable file="${web.xml}" section="EJB local references"/> - - <macro-enable file="${deploy.artifacts.resources}/jbpm-console/WEB-INF/jboss-web.xml" - section="EJB local references"/> </target> <!-- ================================================================== --> @@ -128,6 +122,7 @@ <mkdir dir="${izpack.temp.dir}" /> <!-- http://jira.codehaus.org/browse/IZPACK-151 --> + <copy file="${deploy.artifacts.lib}/jbpm-enterprise-archive.ear" tofile="${deploy.artifacts.lib}/jbpm-enterprise-archive.zip" /> <copy file="${deploy.artifacts.lib}/jbpm-core-config.jar" tofile="${deploy.artifacts.lib}/jbpm-core-config.zip" /> <copy file="${deploy.artifacts.lib}/jbpm-userguide.jdocbook" tofile="${deploy.artifacts.lib}/jbpm-userguide.zip" /> Modified: jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-09 09:30:11 UTC (rev 2146) +++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml 2008-09-09 12:20:10 UTC (rev 2147) @@ -27,7 +27,7 @@ <outputDirectory>resources/jbpm-enterprise-config</outputDirectory> <useStrictFiltering>true</useStrictFiltering> <includes> - <include>*:jbpm-enterprise:jar:config</include> + <include>*:jbpm-enterprise-beans:jar:config</include> </includes> <unpack>true</unpack> </dependencySet> @@ -41,14 +41,6 @@ </includes> <unpack>false</unpack> </dependencySet> - <dependencySet> - <outputDirectory>resources/jbpm-console</outputDirectory> - <useStrictFiltering>true</useStrictFiltering> - <includes> - <include>*:jbpm-console:war</include> - </includes> - <unpack>true</unpack> - </dependencySet> </dependencySets> <fileSets> Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-09-09 09:30:11 UTC (rev 2146) +++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-09-09 12:20:10 UTC (rev 2147) @@ -100,7 +100,7 @@ <!-- jbpm3/lib --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/jbpm3/lib" override="true"> - <include name="jbpm-enterprise.jar" /> + <include name="jbpm-enterprise-archive.ear" /> <include name="jbpm-core.jar" /> <include name="jbpm-identity.jar" /> <include name="activation.jar" /> @@ -160,12 +160,10 @@ <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-identity-service.zip&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" unpack="true" override="true" /> - <!-- jbpm/jbpm-console.war --> - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jbpm-console&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-console.war" - override="true"> - <exclude name="WEB-INF/lib/jbpm-jpdl-core-*.jar" /> - <exclude name="WEB-INF/lib/jbpm-jpdl-identity-*.jar" /> - </fileset> + <!-- jbpm/jbpm-enterprise.ear --> + <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-enterprise-archive.zip&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise-archive.ear" + unpack="true" override="true"> + </file> <!-- jbpm/jbpm-userguide.war --> <file src=&quot;(a){deploy.artifacts.dir}/lib/jbpm-userguide.zip&quot; targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war" Copied: jbpm3/trunk/modules/enterprise/ear/pom.xml (from rev 2146, jbpm3/trunk/modules/enterprise/pom.xml) =================================================================== --- jbpm3/trunk/modules/enterprise/ear/pom.xml (rev 0) +++ jbpm3/trunk/modules/enterprise/ear/pom.xml 2008-09-09 12:20:10 UTC (rev 2147) @@ -0,0 +1,102 @@ +<?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 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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>JBoss jBPM - Enterprise Archive</name> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-enterprise-archive</artifactId> + <packaging>ear</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-enterprise</artifactId> + <version>3.3.0-SNAPSHOT</version> + </parent> + + <!-- Dependencies --> + <dependencies> + <!-- jBPM Dependencies --> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-enterprise-beans</artifactId> + <version>${version}</version> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-console</artifactId> + <version>${version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-core</artifactId> + <version>${version}</version> + <exclusions> + <exclusion> + <groupId>bsh</groupId> + <artifactId>bsh</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + + <!-- Plugins --> + <build> + <plugins> + <plugin> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <generateApplicationXml>true</generateApplicationXml> + <version>1.4</version> + <modules> + <jarModule> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-core</artifactId> + </jarModule> + <ejbModule> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-enterprise-beans</artifactId> + </ejbModule> + <webModule> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-console</artifactId> + <contextRoot>/jbpm-console</contextRoot> + <unpack>true</unpack> + </webModule> + </modules> + </configuration> + </plugin> + </plugins> + </build> + + +</project> Copied: jbpm3/trunk/modules/enterprise/jar/pom.xml (from rev 2146, jbpm3/trunk/modules/enterprise/pom.xml) =================================================================== --- jbpm3/trunk/modules/enterprise/jar/pom.xml (rev 0) +++ jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-09-09 12:20:10 UTC (rev 2147) @@ -0,0 +1,201 @@ +<?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 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/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <name>JBoss jBPM - Enterprise Beans</name> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-enterprise-beans</artifactId> + <packaging>ejb</packaging> + + <!-- Parent --> + <parent> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-enterprise</artifactId> + <version>3.3.0-SNAPSHOT</version> + </parent> + + <!-- Dependencies --> + <dependencies> + <!-- jBPM Dependencies --> + <dependency> + <groupId>org.jboss.jbpm</groupId> + <artifactId>jbpm-core</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.jboss.client</groupId> + <artifactId>jbossall-client</artifactId> + <!-- verify that this version works for all target containers --> + <version>4.2.2.GA</version> + <scope>test</scope> + </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> + </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> + <exclude>hibernate.*</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <!-- https://jira.jboss.org/jira/browse/JBPM-1708 --> + <exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude> + <!-- https://jira.jboss.org/jira/browse/JBPM-1709 --> + <exclude>org/jbpm/msg/jms/AsyncProcessingTest.java</exclude> + </excludes> + </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> + </profiles> + +</project> Copied: jbpm3/trunk/modules/enterprise/jar/scripts (from rev 2146, jbpm3/trunk/modules/enterprise/scripts) Copied: jbpm3/trunk/modules/enterprise/jar/src (from rev 2146, jbpm3/trunk/modules/enterprise/src) Modified: jbpm3/trunk/modules/enterprise/pom.xml =================================================================== --- jbpm3/trunk/modules/enterprise/pom.xml 2008-09-09 09:30:11 UTC (rev 2146) +++ jbpm3/trunk/modules/enterprise/pom.xml 2008-09-09 12:20:10 UTC (rev 2147) @@ -1,23 +1,23 @@ <?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. --> -<!-- --> -<!-- ====================================================================== --> + <!-- ====================================================================== --> + <!-- --> + <!-- JBoss, the OpenSource J2EE webOS --> + <!-- --> + <!-- Distributable under LGPL license. --> + <!-- See terms of license at http://www.gnu.org. --> + <!-- --> + <!-- ====================================================================== --> -<!-- $Id$ --> + <!-- $Id$ --> <project 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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss jBPM - Enterprise</name> <groupId>org.jboss.jbpm</groupId> <artifactId>jbpm-enterprise</artifactId> - <packaging>jar</packaging> - + <packaging>pom</packaging> + <!-- Parent --> <parent> <groupId>org.jboss.jbpm</groupId> @@ -25,180 +25,10 @@ <version>3.3.0-SNAPSHOT</version> </parent> - <!-- Dependencies --> - <dependencies> - <!-- jBPM Dependencies --> - <dependency> - <groupId>org.jboss.jbpm</groupId> - <artifactId>jbpm-core</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.jboss.client</groupId> - <artifactId>jbossall-client</artifactId> - <!-- verify that this version works for all target containers --> - <version>4.2.2.GA</version> - <scope>test</scope> - </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> - </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> - <exclude>hibernate.*</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <excludes> - <!-- https://jira.jboss.org/jira/browse/JBPM-1708 --> - <exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude> - <!-- https://jira.jboss.org/jira/browse/JBPM-1709 --> - <exclude>org/jbpm/msg/jms/AsyncProcessingTest.java</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> + <!-- Modules --> + <modules> + <module>jar</module> + <module>ear</module> + </modules> - <!-- 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> - </profiles> - </project>