[jbpm-commits] JBoss JBPM SVN: r4007 - in jbpm4/trunk/modules/distro: src/main/resources/installer and 1 other directory.

do-not-reply at jboss.org do-not-reply at jboss.org
Tue Feb 24 05:39:10 EST 2009


Author: heiko.braun at jboss.com
Date: 2009-02-24 05:39:10 -0500 (Tue, 24 Feb 2009)
New Revision: 4007

Removed:
   jbpm4/trunk/modules/distro/assembly-distro-package.xml
   jbpm4/trunk/modules/distro/assembly-jbpm-single-jar.xml
Modified:
   jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml
Log:
Fix jBPM distribution on AS 4

Deleted: jbpm4/trunk/modules/distro/assembly-distro-package.xml
===================================================================
--- jbpm4/trunk/modules/distro/assembly-distro-package.xml	2009-02-24 04:21:30 UTC (rev 4006)
+++ jbpm4/trunk/modules/distro/assembly-distro-package.xml	2009-02-24 10:39:10 UTC (rev 4007)
@@ -1,130 +0,0 @@
-<assembly>
-  <id>package</id>
-  <formats>
-    <format>zip</format>
-    <format>tar.gz</format>
-  </formats>
-  <includeBaseDirectory>true</includeBaseDirectory>
-  <baseDirectory>jbpm-${version}</baseDirectory>
-  
-  <dependencySets>
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-gpd:zip</include>
-      </includes>
-      <outputFileNameMapping>jbpm-gpd-site.zip</outputFileNameMapping>
-      <outputDirectory>gpd</outputDirectory>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
-      <scope>test</scope>
-      <excludes>
-        <exclude>jbpm-*</exclude>
-      </excludes>
-    </dependencySet>
-    <!-- 
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-workspace:zip</include>
-      </includes>
-      <outputDirectory>workspace</outputDirectory>
-      <unpack>true</unpack>
-    </dependencySet>
-     -->
-  </dependencySets>
-  
-  <fileSets>
-    <fileSet>
-      <directory>target</directory>
-      <includes>
-        <include>jbpm.jar</include>
-      </includes>
-      <outputDirectory></outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>src/main/resources</directory>
-      <outputDirectory></outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../api/target/site/apidocs</directory>
-      <outputDirectory>doc/javadocs</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../api/target/schemadoc</directory>
-      <outputDirectory>doc/schemadoc</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../db/target/create</directory>
-      <outputDirectory>db/create</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../db/target/drop</directory>
-      <outputDirectory>db/drop</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../devguide/target/docbook/publish/en</directory>
-      <outputDirectory>doc/devguide</outputDirectory>
-      <excludes>
-        <exclude>**/*.fo</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>../userguide/target/docbook/publish/en</directory>
-      <outputDirectory>doc/userguide</outputDirectory>
-      <excludes>
-        <exclude>**/*.fo</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>../api/target/schemadocs</directory>
-      <outputDirectory>doc/schemadocs</outputDirectory>
-      <excludes>
-        <exclude>**/*.fo</exclude>
-      </excludes>
-    </fileSet>
-    <fileSet>
-      <directory>../api/src/main/java</directory>
-      <outputDirectory>src</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../api/src/main/resources</directory>
-      <outputDirectory>src</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../log/src/main/java</directory>
-      <outputDirectory>src</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../pvm/src/main/java</directory>
-      <outputDirectory>src</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../pvm/src/main/resources</directory>
-      <outputDirectory>src</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../jpdl/src/main/java</directory>
-      <outputDirectory>src</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../jpdl/src/main/resources</directory>
-      <outputDirectory>src</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../test-base/src/main/java</directory>
-      <outputDirectory>src</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../examples/src/test/java</directory>
-      <outputDirectory>examples/src</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../examples/src/test/resources</directory>
-      <outputDirectory>examples/src</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>../examples/src/eclipse</directory>
-      <outputDirectory>examples</outputDirectory>
-    </fileSet>
-  </fileSets>  
-</assembly>
\ No newline at end of file

Deleted: jbpm4/trunk/modules/distro/assembly-jbpm-single-jar.xml
===================================================================
--- jbpm4/trunk/modules/distro/assembly-jbpm-single-jar.xml	2009-02-24 04:21:30 UTC (rev 4006)
+++ jbpm4/trunk/modules/distro/assembly-jbpm-single-jar.xml	2009-02-24 10:39:10 UTC (rev 4007)
@@ -1,46 +0,0 @@
-<assembly>
-  <id>package</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-api</include>
-      </includes>
-      <unpack>true</unpack>
-      <outputFileNameMapping></outputFileNameMapping>
-      <outputDirectory></outputDirectory>
-    </dependencySet>
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-log</include>
-      </includes>
-      <unpack>true</unpack>
-      <outputFileNameMapping></outputFileNameMapping>
-      <outputDirectory></outputDirectory>
-    </dependencySet>
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-pvm</include>
-      </includes>
-      <unpack>true</unpack>
-      <outputDirectory></outputDirectory>
-    </dependencySet>
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-jpdl</include>
-      </includes>
-      <unpack>true</unpack>
-      <outputDirectory></outputDirectory>
-    </dependencySet>
-    <dependencySet>
-      <includes>
-        <include>org.jbpm.jbpm4:jbpm-test-base</include>
-      </includes>
-      <unpack>true</unpack>
-      <outputDirectory></outputDirectory>
-    </dependencySet>
-  </dependencySets>
-</assembly>
\ No newline at end of file

Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml	2009-02-24 04:21:30 UTC (rev 4006)
+++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml	2009-02-24 10:39:10 UTC (rev 4007)
@@ -201,12 +201,40 @@
       </fileset>
 
       <!--
+         ==============================
+         JBoss 422
+         ==============================
+       -->
+      <fileset dir="@{deploy.artifacts.dir}/lib/"
+               targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib/"
+               override="true"
+               condition="isJBoss422">
+        <include name="jbpm-api.jar"/>
+        <include name="jbpm-spi.jar"/>
+      </fileset>
+
+
+      <!--
         ==============================
-        JBoss 5        
+        JBoss 423
         ==============================
       -->
 
       <fileset dir="@{deploy.artifacts.dir}/lib/"
+               targetdir="${jbossInstallPath}/server/${jbossTargetServer}/lib/"
+               override="true"
+               condition="isJBoss423">
+        <include name="jbpm-api.jar"/>
+        <include name="jbpm-spi.jar"/>
+      </fileset>
+
+      <!--
+        ==============================
+        JBoss 5
+        ==============================
+      -->
+
+      <fileset dir="@{deploy.artifacts.dir}/lib/"
                targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/jbpm.deployer"
                override="true"
                condition="isJBoss500">
@@ -249,8 +277,8 @@
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL">
         <include name="mysql-connector-java.jar" />
       </fileset>
-      
-      
+
+
       <!--
          ==============================
          GWT Console
@@ -279,7 +307,7 @@
     <!-- JBoss-5.0.0 
     <pack name="Download JBoss-5.0.0" required="no" parent="Optional Components" preselected="no">
       <description>Download and Install JBoss-5.0.0</description>
-      <!-- http://jira.codehaus.org/browse/IZPACK-158 
+      http://jira.codehaus.org/browse/IZPACK-158 
       <file src="@{resources.dir}/installer/download-helper.xml" targetdir="$INSTALL_PATH/Uninstaller"/>
     </pack>
     -->




More information about the jbpm-commits mailing list