[jbpm-commits] JBoss JBPM SVN: r2158 - in jbpm3/trunk/modules: distribution/src/main/resources/installer and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Sep 10 04:42:44 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-09-10 04:42:43 -0400 (Wed, 10 Sep 2008)
New Revision: 2158
Modified:
jbpm3/trunk/modules/console/pom.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/trunk/modules/enterprise/ear/pom.xml
jbpm3/trunk/modules/enterprise/jar/pom.xml
Log:
Cleanup distro dependencies
Modified: jbpm3/trunk/modules/console/pom.xml
===================================================================
--- jbpm3/trunk/modules/console/pom.xml 2008-09-10 07:07:31 UTC (rev 2157)
+++ jbpm3/trunk/modules/console/pom.xml 2008-09-10 08:42:43 UTC (rev 2158)
@@ -1,15 +1,15 @@
<?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>
@@ -18,77 +18,29 @@
<artifactId>jbpm-console</artifactId>
<packaging>war</packaging>
- <!-- Parent -->
+ <!-- Parent -->
<parent>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm</artifactId>
<version>3.3.0-SNAPSHOT</version>
</parent>
- <!-- Dependencies -->
+ <!-- Dependencies -->
<dependencies>
<!-- jBPM Dependencies -->
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-core</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-identity</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-jbpm4jsf</artifactId>
<version>${version}</version>
<exclusions>
<exclusion>
- <artifactId>jackrabbit-core</artifactId>
- <groupId>org.apache.jackrabbit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hibernate</artifactId>
- <groupId>org.hibernate</groupId>
- </exclusion>
- <exclusion>
- <artifactId>bsh</artifactId>
- <groupId>bsh</groupId>
- </exclusion>
- <exclusion>
- <artifactId>dom4j</artifactId>
- <groupId>dom4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- </exclusion>
- <exclusion>
- <artifactId>ant</artifactId>
- <groupId>org.apache.ant</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-impl</artifactId>
<groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
</exclusion>
<exclusion>
- <artifactId>jcr</artifactId>
- <groupId>javax.jcr</groupId>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-identity</artifactId>
</exclusion>
- <exclusion>
- <artifactId>mail</artifactId>
- <groupId>javax.mail</groupId>
- </exclusion>
- <exclusion>
- <artifactId>el-api</artifactId>
- <groupId>javax.el</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-api</artifactId>
- <groupId>javax.faces</groupId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -96,6 +48,18 @@
<artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-core</artifactId>
+ <version>${version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
@@ -105,13 +69,9 @@
<artifactId>commons-logging</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
</dependencies>
- <!-- Plugins -->
+ <!-- Plugins -->
<build>
<plugins>
<plugin>
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-10 07:07:31 UTC (rev 2157)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-09-10 08:42:43 UTC (rev 2158)
@@ -154,12 +154,10 @@
<description>The jBPM3 Server Components</description>
<!-- jbpm/jbpm-service.sar -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
+ <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
override="true">
- <include name="jbpm-core.jar" />
- <include name="jbpm-identity.jar" />
+ <include name="jbpm.cfg.xml" />
</fileset>
- <file src="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config/jbpm.cfg.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" />
<file src="@{deploy.artifacts.dir}/lib/jbpm-identity-service.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
unpack="true" override="true" />
Modified: jbpm3/trunk/modules/enterprise/ear/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/ear/pom.xml 2008-09-10 07:07:31 UTC (rev 2157)
+++ jbpm3/trunk/modules/enterprise/ear/pom.xml 2008-09-10 08:42:43 UTC (rev 2158)
@@ -13,7 +13,7 @@
<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>
+ <name>JBoss jBPM - Enterprise Bundle</name>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-enterprise-archive</artifactId>
<packaging>ear</packaging>
@@ -30,21 +30,63 @@
<!-- jBPM 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>
+ <exclusions>
+ <exclusion>
+ <groupId>bsh</groupId>
+ <artifactId>bsh</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</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>
+ <dependency>
+ <groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-enterprise-beans</artifactId>
<version>${version}</version>
<type>ejb</type>
<exclusions>
- <exclusion>
- <artifactId>jbpm-core</artifactId>
- <groupId>org.jboss.jbpm</groupId>
- </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.jboss.jbpm</groupId>
- <artifactId>jbpm-console</artifactId>
+ <artifactId>jbpm-identity</artifactId>
<version>${version}</version>
- <type>war</type>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
@@ -61,6 +103,16 @@
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-enterprise-beans</artifactId>
</ejbModule>
+ <jarModule>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-core</artifactId>
+ <includeInApplicationXml>true</includeInApplicationXml>
+ </jarModule>
+ <jarModule>
+ <groupId>org.jboss.jbpm</groupId>
+ <artifactId>jbpm-identity</artifactId>
+ <includeInApplicationXml>true</includeInApplicationXml>
+ </jarModule>
<webModule>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-console</artifactId>
Modified: jbpm3/trunk/modules/enterprise/jar/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-09-10 07:07:31 UTC (rev 2157)
+++ jbpm3/trunk/modules/enterprise/jar/pom.xml 2008-09-10 08:42:43 UTC (rev 2158)
@@ -16,7 +16,7 @@
<name>JBoss jBPM - Enterprise Beans</name>
<groupId>org.jboss.jbpm</groupId>
<artifactId>jbpm-enterprise-beans</artifactId>
- <packaging>jar</packaging>
+ <packaging>ejb</packaging>
<!-- Parent -->
<parent>
More information about the jbpm-commits
mailing list