12:59 a.m.
Author: jeff.yuchang
Date: 2010-10-27 01:59:49 -0400 (Wed, 27 Oct 2010)
New Revision: 1062
Modified:
branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml
branches/RiftSaw-2.1.x/docs/docbook/gettingstartedguide/src/main/module/installation.xml
branches/RiftSaw-2.1.x/integration-tests/pom.xml
branches/RiftSaw-2.1.x/pom.xml
branches/RiftSaw-2.1.x/qa/hudson-riftsaw-db.sh
branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jboss.sh
branches/RiftSaw-2.1.x/qa/hudson-riftsaw-local.sh
branches/RiftSaw-2.1.x/qa/hudson-riftsaw-soa-p.sh
branches/RiftSaw-2.1.x/qa/hudson-riftsaw-ws.sh
branches/RiftSaw-2.1.x/runtime/jbossesb-bpel/pom.xml
Log:
* RIFTSAW-307, RIFTSAW-308: upgrade ESB to 4.9
Modified: branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml
===================================================================
--- branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml 2010-10-26
01:09:22 UTC (rev 1061)
+++ branches/RiftSaw-2.1.x/distribution/src/main/release/install/build.xml 2010-10-27
05:59:49 UTC (rev 1062)
@@ -129,9 +129,6 @@
<!-- install database specific driver -->
<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">
Modified:
branches/RiftSaw-2.1.x/docs/docbook/gettingstartedguide/src/main/module/installation.xml
===================================================================
---
branches/RiftSaw-2.1.x/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2010-10-26
01:09:22 UTC (rev 1061)
+++
branches/RiftSaw-2.1.x/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2010-10-27
05:59:49 UTC (rev 1062)
@@ -24,7 +24,7 @@
<listitem>JBossAS (version 5.1.0.GA or higher) <emphasis
role="bold">jdk6</emphasis> version, available from
<ulink
url="http://www.jboss.org/jbossas">http://www.jboss.org/jbos...;,
and please upgrade the web
service stack to version 3.2.2.GA, as described in the following 'Upgrade
web service for JBoss AS' section.</listitem>
- <listitem>JBossESB (version 4.8.GA or higher), should download the
<emphasis role="bold">jbossesb-4.8.GA.zip</emphasis>,
+ <listitem>JBossESB (version 4.9 or higher), should download the
<emphasis role="bold">jbossesb-4.8.GA.zip</emphasis>,
available from <ulink
url="http://www.jboss.org/jbossesb">http://www.jboss.org/jbo...;.
This is only required to run the ESB/BPEL examples.</listitem>
<listitem>RiftSaw, available from
Modified: branches/RiftSaw-2.1.x/integration-tests/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/integration-tests/pom.xml 2010-10-26 01:09:22 UTC (rev 1061)
+++ branches/RiftSaw-2.1.x/integration-tests/pom.xml 2010-10-27 05:59:49 UTC (rev 1062)
@@ -49,9 +49,9 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
+ <groupId>jboss.jbossts</groupId>
<artifactId>jbossts-common</artifactId>
- <version>${jbossesb.version}</version>
+ <version>${jbossts.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: branches/RiftSaw-2.1.x/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/pom.xml 2010-10-26 01:09:22 UTC (rev 1061)
+++ branches/RiftSaw-2.1.x/pom.xml 2010-10-27 05:59:49 UTC (rev 1062)
@@ -79,7 +79,8 @@
<junit.version>3.8.1</junit.version>
<jboss.version>5.1.0.GA</jboss.version>
<log4j.version>1.2.14</log4j.version>
- <jbossesb.version>4.8</jbossesb.version>
+ <jbossesb.version>4.9</jbossesb.version>
+ <jbossts.version>4.6.1.GA</jbossts.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
<h2.version>1.2.124</h2.version>
<javassist.version>3.11.0.GA</javassist.version>
@@ -282,26 +283,26 @@
<version>${commons.httpclient.version}</version>
</dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon-dom</artifactId>
- <version>${saxon.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon-xpath</artifactId>
- <version>${saxon.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon-xqj</artifactId>
- <version>${saxon.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.saxon</groupId>
- <artifactId>saxon</artifactId>
- <version>${saxon.version}</version>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-dom</artifactId>
+ <version>${saxon.version}</version>
</dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-xpath</artifactId>
+ <version>${saxon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-xqj</artifactId>
+ <version>${saxon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>${saxon.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-db.sh
===================================================================
--- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-db.sh 2010-10-26 01:09:22 UTC (rev 1061)
+++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-db.sh 2010-10-27 05:59:49 UTC (rev 1062)
@@ -13,7 +13,7 @@
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
-JBOSS_ESB_VERSION="4.8"
+JBOSS_ESB_VERSION="4.9"
JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION"
WS_VERSION="3.2.2.GA"
Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jboss.sh
===================================================================
--- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jboss.sh 2010-10-26 01:09:22 UTC (rev 1061)
+++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-jboss.sh 2010-10-27 05:59:49 UTC (rev 1062)
@@ -12,7 +12,7 @@
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
-JBOSS_ESB_VERSION="4.8"
+JBOSS_ESB_VERSION="4.9"
JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION"
STARTUP_TIME="6"
Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-local.sh
===================================================================
--- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-local.sh 2010-10-26 01:09:22 UTC (rev 1061)
+++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-local.sh 2010-10-27 05:59:49 UTC (rev 1062)
@@ -12,7 +12,7 @@
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
-JBOSS_ESB_VERSION="4.8"
+JBOSS_ESB_VERSION="4.9"
JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION"
DATABASE="db2"
Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-soa-p.sh
===================================================================
--- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-soa-p.sh 2010-10-26 01:09:22 UTC (rev 1061)
+++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-soa-p.sh 2010-10-27 05:59:49 UTC (rev 1062)
@@ -14,7 +14,7 @@
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
-JBOSS_ESB_VERSION="4.8"
+JBOSS_ESB_VERSION="4.9"
JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION"
WS_VERSION="3.2.2.GA"
Modified: branches/RiftSaw-2.1.x/qa/hudson-riftsaw-ws.sh
===================================================================
--- branches/RiftSaw-2.1.x/qa/hudson-riftsaw-ws.sh 2010-10-26 01:09:22 UTC (rev 1061)
+++ branches/RiftSaw-2.1.x/qa/hudson-riftsaw-ws.sh 2010-10-27 05:59:49 UTC (rev 1062)
@@ -14,7 +14,7 @@
WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
REPLACE_QA_JDBC="true"
-JBOSS_ESB_VERSION="4.8"
+JBOSS_ESB_VERSION="4.9"
JBOSS_ESB_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jbossesb-$JBOSS_ESB_VERSION"
WS_VERSION="3.2.2.GA"
Modified: branches/RiftSaw-2.1.x/runtime/jbossesb-bpel/pom.xml
===================================================================
--- branches/RiftSaw-2.1.x/runtime/jbossesb-bpel/pom.xml 2010-10-26 01:09:22 UTC (rev
1061)
+++ branches/RiftSaw-2.1.x/runtime/jbossesb-bpel/pom.xml 2010-10-27 05:59:49 UTC (rev
1062)
@@ -26,9 +26,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
+ <groupId>jboss.jbossts</groupId>
<artifactId>jbossts-common</artifactId>
- <version>${jbossesb.version}</version>
+ <version>${jbossts.version}</version>
<scope>test</scope>
</dependency>
<dependency>