[jbpm-commits] JBoss JBPM SVN: r2142 - in jbpm3/trunk/modules/distribution: scripts and 1 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Sep 8 10:01:30 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-09-08 10:01:30 -0400 (Mon, 08 Sep 2008)
New Revision: 2142

Modified:
   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
Log:
Add docs, config to installer

Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml	2008-09-08 10:17:34 UTC (rev 2141)
+++ jbpm3/trunk/modules/distribution/pom.xml	2008-09-08 14:01:30 UTC (rev 2142)
@@ -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,14 +18,14 @@
   <artifactId>jbpm-distribution</artifactId>
   <packaging>pom</packaging>
 
-   <!-- Parent -->
+  <!-- Parent -->
   <parent>
     <groupId>org.jboss.jbpm</groupId>
     <artifactId>jbpm</artifactId>
     <version>3.3.0-SNAPSHOT</version>
   </parent>
 
-   <!-- Dependencies -->
+  <!-- Dependencies -->
   <dependencies>
     <dependency>
       <groupId>org.jboss.jbpm</groupId>
@@ -35,23 +35,29 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.jbpm</groupId>
-      <artifactId>jbpm-enterprise</artifactId>
+      <artifactId>jbpm-core</artifactId>
       <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbpm</groupId>
-      <artifactId>jbpm-enterprise</artifactId>
+      <artifactId>jbpm-core</artifactId>
       <classifier>config</classifier>
       <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbpm</groupId>
       <artifactId>jbpm-core</artifactId>
+      <classifier>sources</classifier>
       <version>${version}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbpm</groupId>
-      <artifactId>jbpm-core</artifactId>
+      <artifactId>jbpm-enterprise</artifactId>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbpm</groupId>
+      <artifactId>jbpm-enterprise</artifactId>
       <classifier>config</classifier>
       <version>${version}</version>
     </dependency>
@@ -69,6 +75,12 @@
     <dependency>
       <groupId>org.jboss.jbpm</groupId>
       <artifactId>jbpm-identity</artifactId>
+      <classifier>sources</classifier>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.jbpm</groupId>
+      <artifactId>jbpm-identity</artifactId>
       <classifier>service</classifier>
       <version>${version}</version>
       <type>zip</type>
@@ -84,17 +96,21 @@
       <version>${version}</version>
       <type>jdocbook</type>
     </dependency>
-    
+
     <!-- Thirdparty Dependencies -->
     <dependency>
       <groupId>org.apache.ant</groupId>
       <artifactId>ant</artifactId>
     </dependency>
     <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+    </dependency>
+    <dependency>
       <groupId>izpack</groupId>
       <artifactId>standalone-compiler</artifactId>
     </dependency>
-    
+
     <!-- Database Drivers -->
     <dependency>
       <groupId>mysql</groupId>
@@ -144,6 +160,9 @@
                 <property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
                 <property name="database" value="${database}" />
                 <property name="jboss.home" value="${jboss.home}" />
+                <property name="jboss422.home" value="${jboss422.home}" />
+                <property name="jboss423.home" value="${jboss423.home}" />
+                <property name="jboss500.home" value="${jboss500.home}" />
                 <property name="jboss.id" value="${jboss.id}" />
                 <property name="product.name" value="${project.name}" />
                 <property name="product.short.name" value="${artifactId}" />

Modified: jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml
===================================================================
--- jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml	2008-09-08 10:17:34 UTC (rev 2141)
+++ jbpm3/trunk/modules/distribution/scripts/antrun-installer.xml	2008-09-08 14:01:30 UTC (rev 2142)
@@ -121,6 +121,7 @@
     <mkdir dir="${izpack.temp.dir}" />
 
     <!--  http://jira.codehaus.org/browse/IZPACK-151 -->
+    <copy file="${deploy.artifacts.lib}/jbpm-core-config.jar" tofile="${deploy.artifacts.lib}/jbpm-core-config.zip" />
     <copy file="${deploy.artifacts.lib}/jbpm-console.war" tofile="${deploy.artifacts.lib}/jbpm-console.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-08 10:17:34 UTC (rev 2141)
+++ jbpm3/trunk/modules/distribution/scripts/assembly-deploy-artifacts.xml	2008-09-08 14:01:30 UTC (rev 2142)
@@ -31,6 +31,16 @@
       </includes>
       <unpack>true</unpack>
     </dependencySet>
+    <dependencySet>
+      <outputDirectory>src</outputDirectory>
+      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+      <useStrictFiltering>true</useStrictFiltering>
+      <includes>
+        <include>*:jbpm-core:jar:sources</include>
+        <include>*:jbpm-identity:jar:sources</include>
+      </includes>
+      <unpack>false</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-08 10:17:34 UTC (rev 2141)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml	2008-09-08 14:01:30 UTC (rev 2142)
@@ -85,17 +85,40 @@
   <!-- Packs -->
   <packs>
     <!-- jBPM3 Standalone -->
-    <pack name="jBPM3 Standalone" required="yes" preselected="no">
+    <pack name="jBPM3 Standalone" required="yes" preselected="yes">
       <description>The jBPM3 Standalone Components</description>
+      
+      <!-- jbpm3/config -->
+      <file src="@{deploy.artifacts.dir}/lib/jbpm-core-config.zip" targetdir="$INSTALL_PATH/jbpm3/config"
+        unpack="true" override="true" />
+      
+      <!-- jbpm3/docs -->
+      <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.zip" targetdir="$INSTALL_PATH/jbpm3/docs/userguide"
+        unpack="true" override="true" />
+        
+      <!-- jbpm3/lib -->
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/jbpm3/lib" override="true">
-        <include name="jboss-bpm-api.jar" />
         <include name="jbpm-enterprise.jar" />
         <include name="jbpm-core.jar" />
         <include name="jbpm-identity.jar" />
-        <include name="jbpm-integration.jar" />
+        
+        <include name="activation.jar" />
+        <include name="antlr.jar" />
+        <include name="asm.jar" />
+        <include name="bsh.jar" />
+        <include name="cglib.jar" />
+        <include name="commons-collections.jar" />
+        <include name="commons-logging.jar" />
+        <include name="dom4j.jar" />
+        <include name="hibernate.jar" />
+        <include name="hsqldb.jar" />
       </fileset>
-      <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.zip" targetdir="$INSTALL_PATH/jbpm3/docs/userguide"
-        unpack="true" override="true" />
+      
+      <!-- jbpm3/src -->
+      <fileset dir="@{deploy.artifacts.dir}/src" targetdir="$INSTALL_PATH/jbpm3/src" override="true">
+        <include name="jbpm-core-sources.jar" />
+        <include name="jbpm-identity-sources.jar" />
+      </fileset>
     </pack>
     
     <!-- Optional Downloads -->
@@ -120,23 +143,30 @@
     <!-- jBPM3 Server Components -->
     <pack name="jBPM3 Server Components" required="yes" preselected="yes">
       <description>The jBPM3 Server Components</description>
+      
+      <!-- jbpm -->
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" override="true">
+        <include name="jbpm-enterprise.jar" />
+      </fileset>
+      
+      <!-- jbpm/jbpm-service.sar -->
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
         override="true">
-        <include name="jboss-bpm-api.jar" />
         <include name="jbpm-core.jar" />
         <include name="jbpm-identity.jar" />
-        <include name="jbpm-integration.jar" />
       </fileset>
-      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" override="true">
-        <include name="jbpm-enterprise.jar" />
-      </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" />
+      
+      <!-- jbpm/jbpm-console.war -->
       <file src="@{deploy.artifacts.dir}/lib/jbpm-console.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-console.war"
         unpack="true" override="true" />
+        
+      <!-- jbpm/jbpm-userguide.war -->
       <file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
         unpack="true" override="true" />
-      <file src="@{deploy.artifacts.dir}/lib/jbpm-identity-service.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar"
-        unpack="true" override="true" />
-      <file src="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config/jbpm.cfg.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" />
+        
     </pack>
 
     <!-- jBPM Databases -->




More information about the jbpm-commits mailing list