[jboss-cvs] JBoss Messaging SVN: r2749 - in trunk: docs/examples/bridge/etc and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jun 1 08:32:41 EDT 2007
Author: timfox
Date: 2007-06-01 08:32:41 -0400 (Fri, 01 Jun 2007)
New Revision: 2749
Modified:
trunk/build-messaging.xml
trunk/docs/examples/bridge/etc/test-bridge-service.xml
trunk/docs/userguide/en/modules/installation.xml
trunk/src/main/org/jboss/jms/server/recovery/MessagingXAResourceRecovery.java
trunk/util/release-admin.properties
trunk/util/release-admin.xml
Log:
Some tweaks for recovery
Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml 2007-06-01 11:01:06 UTC (rev 2748)
+++ trunk/build-messaging.xml 2007-06-01 12:32:41 UTC (rev 2749)
@@ -376,11 +376,12 @@
</target>
-
+ <!-- Note that the sar doesn't contain jboss-messaging.jar - this is because jboss-messaging.jar actually needs
+ to go in server/<config_name>/lib directory, since other components e.g. the JTA recovery manager need to access it
+ and won't be able to if it is in the sar -->
<target name="sar" depends="compile, jar, sar-structure">
<mkdir dir="${build.lib}"/>
<jar jarfile="${build.lib}/jboss-${module.name}.sar" manifest="${build.etc}/default.mf">
- <fileset dir="${build.lib}" includes="jboss-${module.name}.jar"/>
<fileset dir="${build.sar}" includes="**"/>
<fileset dir="${build.jar}">
<exclude name="aop-messaging-*.xml"/>
Modified: trunk/docs/examples/bridge/etc/test-bridge-service.xml
===================================================================
--- trunk/docs/examples/bridge/etc/test-bridge-service.xml 2007-06-01 11:01:06 UTC (rev 2748)
+++ trunk/docs/examples/bridge/etc/test-bridge-service.xml 2007-06-01 12:32:41 UTC (rev 2749)
@@ -72,6 +72,7 @@
<!-- The maximum number of connection retries to make in case of failure, before giving up
-1 means try forever-->
<attribute name="MaxRetries">-1</attribute>
- </mbean>
+
+ </mbean>
</server>
\ No newline at end of file
Modified: trunk/docs/userguide/en/modules/installation.xml
===================================================================
--- trunk/docs/userguide/en/modules/installation.xml 2007-06-01 11:01:06 UTC (rev 2748)
+++ trunk/docs/userguide/en/modules/installation.xml 2007-06-01 12:32:41 UTC (rev 2749)
@@ -130,7 +130,6 @@
</itemizedlist>
</para>
-
<para>There are few extra steps at <xref
linkend="install.extra-steps" /></para>
@@ -228,11 +227,18 @@
<listitem>
<para>Unzip jboss-messaging.sar from your download package into the directory
<literal>JBOSS_CONFIG/deploy/jboss-messaging.sar</literal></para>
- <para>JBoss Messaging should be deployed unzipped (exploded) so you have easy access to its config
+ <para>JBoss Messaging sar should be deployed unzipped (exploded) so you have easy access to its config
files which are stored there.</para>
</listitem>
<listitem>
+ <para>Copy jboss-messaging.jar from your download package into the directory
+ <literal>JBOSS_CONFIG/lib</literal></para>
+ <para>jboss-messaging.jar needs to go in the lib directory so it is accessible to other services e.g.
+the JBoss Transactions Recovery Manager</para>
+ </listitem>
+
+ <listitem>
<para><warning>For use in production it is highly recommended to use a
different database other than the HSQLDB. HSQLDB does not have any transaction isolation.
For simple non clustered development evaluation HSQLDB may suffice.
@@ -533,6 +539,13 @@
files which are stored there.</para>
</listitem>
+ <listitem>
+ <para>Copy jboss-messaging.jar from your download package into the directory
+ <literal>JBOSS_CONFIG/lib</literal></para>
+ <para>jboss-messaging.jar needs to go in the lib directory so it is accessible to other services e.g.
+the JBoss Transactions Recovery Manager</para>
+ </listitem>
+
<listitem>
<para><warning>For a clustered installation it is mandatory that a shared database is available to
all nodes in the cluster.
@@ -1031,4 +1044,4 @@
</itemizedlist>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
Modified: trunk/src/main/org/jboss/jms/server/recovery/MessagingXAResourceRecovery.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/recovery/MessagingXAResourceRecovery.java 2007-06-01 11:01:06 UTC (rev 2748)
+++ trunk/src/main/org/jboss/jms/server/recovery/MessagingXAResourceRecovery.java 2007-06-01 12:32:41 UTC (rev 2749)
@@ -103,7 +103,9 @@
}
catch (Exception e)
{
- log.error("Failed to look up provider adaptor", e);
+ //Note - we only log at trace, since this is likely to happen on the first pass since, when
+ //deployed in JBAS the recovery manager will typically start up before the JMSProviderLoaders
+ log.trace("Failed to look up provider adaptor", e);
return false;
}
Modified: trunk/util/release-admin.properties
===================================================================
--- trunk/util/release-admin.properties 2007-06-01 11:01:06 UTC (rev 2748)
+++ trunk/util/release-admin.properties 2007-06-01 12:32:41 UTC (rev 2749)
@@ -1,4 +1,5 @@
#
# This file shouldn't be available on the Zip bundle
#
-sar.location=../output/lib
+artifacts.location=../output/lib
+
Modified: trunk/util/release-admin.xml
===================================================================
--- trunk/util/release-admin.xml 2007-06-01 11:01:06 UTC (rev 2748)
+++ trunk/util/release-admin.xml 2007-06-01 12:32:41 UTC (rev 2749)
@@ -29,11 +29,12 @@
to change them, do it in release-admin.properties.
-->
- <!-- The location of the sar file -->
- <property name="sar.location" value="../"/>
+ <!-- The location of the sar and jar files -->
+ <property name="artifacts.location" value="../"/>
<!-- The name of the sar -->
<property name="sar.name" value="jboss-messaging.sar"/>
+ <property name="jar.name" value="jboss-messaging.jar"/>
<!-- ======================================================================================== -->
<!-- Top level targets. These are the "modes" this script is supposed to work in. -->
@@ -64,8 +65,8 @@
<!-- We make sure the sar file exists -->
<target name="validate-messaging-artifact">
- <available property="messaging-artifact-exists" type="file" file="${sar.location}/${sar.name}"/>
- <fail unless="messaging-artifact-exists" message="${sar.location}/${sar.name} does not exist! Build it and try again."/>
+ <available property="messaging-artifact-exists" type="file" file="${artifacts.location}/${sar.name}"/>
+ <fail unless="messaging-artifact-exists" message="${artifacts.location}/${sar.name} does not exist! Build it and try again."/>
</target>
<!-- Create a server configuration based on a default server configuration -->
@@ -104,6 +105,10 @@
<!-- we deploy the archive exploded so that users can easily access the configuration files -->
<antcall target="expand-sar"/>
+ <!-- copy jboss-messaging.jar to the lib directory. It needs to be in lib so it can be seen by the JTA
+ recovery manager for example -->
+ <copy file="${artifacts.location}/${jar.name}" todir="${jboss.home}/server/${messaging.config.name}/lib"/>
+
<!-- Copy the default security properties files to conf/props-->
<copy todir="${jboss.home}/server/${messaging.config.name}/conf/props">
<fileset dir="../src/etc/server/default/config">
@@ -125,7 +130,7 @@
<!-- Expand the sar file in the deploy directory -->
<target name="expand-sar">
- <unjar src="${sar.location}/${sar.name}"
+ <unjar src="${artifacts.location}/${sar.name}"
dest="${jboss.home}/server/${messaging.config.name}/deploy/jboss-messaging.sar">
</unjar>
</target>
More information about the jboss-cvs-commits
mailing list