riftsaw SVN: r638 - in trunk/distribution/src/main: release/install and 1 other directory.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-04-30 12:01:40 -0400 (Fri, 30 Apr 2010)
New Revision: 638
Modified:
trunk/distribution/src/main/assembly/bin.xml
trunk/distribution/src/main/release/install/build.xml
Log:
Updated binary distribution to include riftsaw-utils jar in samples/common/lib, as this was not being included since the build had been changed. Also changed the riftsaw install script to effectively remove the h2-1.0.68.jar from the default/server/lib (installed as part of the esb deploy), as this is an older version than used by riftsaw, and appears to be causing RIFTSAW-184. Also might be the cause of the undeploy exception - needs further testing.
Modified: trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- trunk/distribution/src/main/assembly/bin.xml 2010-04-30 12:53:38 UTC (rev 637)
+++ trunk/distribution/src/main/assembly/bin.xml 2010-04-30 16:01:40 UTC (rev 638)
@@ -96,17 +96,7 @@
<outputDirectory>lib</outputDirectory>
</fileSet>
- <!-- Short term fix as dependency on riftsaw-utils is not being resolved,
- so copy from BPEL war instead -->
<fileSet>
- <directory>../runtime/engine-assembly/target/riftsaw-engine/lib</directory>
- <outputDirectory>/samples/common/lib</outputDirectory>
- <includes>
- <include>riftsaw-utils-*.jar</include>
- </includes>
- </fileSet>
-
- <fileSet>
<directory>../docs/docbook/gettingstartedguide/target/docbook/publish/en-US</directory>
<outputDirectory>docs/gettingstartedguide</outputDirectory>
</fileSet>
@@ -168,6 +158,7 @@
<outputDirectory>/samples/common/lib</outputDirectory>
<includes>
<include>org.jboss.soa.bpel:riftsaw-tools</include>
+ <include>org.jboss.soa.bpel:riftsaw-utils</include>
<include>commons-codec:commons-codec</include>
<include>commons-httpclient:commons-httpclient</include>
<include>commons-logging:commons-logging</include>
Modified: trunk/distribution/src/main/release/install/build.xml
===================================================================
--- trunk/distribution/src/main/release/install/build.xml 2010-04-30 12:53:38 UTC (rev 637)
+++ trunk/distribution/src/main/release/install/build.xml 2010-04-30 16:01:40 UTC (rev 638)
@@ -141,7 +141,11 @@
<!-- install database specific driver -->
- <target name="internal.install.riftsaw.into.jboss.db.hsql">
+ <target name="internal.install.riftsaw.into.jboss.db.hsql">
+ <!-- If the older version of h2 exists, as installed by the ESB (4.7), then rename it -->
+ <move file="${server.lib.dir}/h2-1.0.68.jar" tofile="${server.lib.dir}/h2-1.0.68.jar.OLD"
+ failonerror="no" />
+
<copy todir="${server.lib.dir}" overwrite="true">
<fileset dir="../db/drivers">
<include name="h2*.jar" />