Return-Path: 
 <scm-return-22547-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 93034 invoked from network); 5 Oct 2007 02:32:13 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 5 Oct 2007 02:32:13 -0000
Received: (qmail 45224 invoked by uid 500); 5 Oct 2007 02:32:01 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 45216 invoked by uid 500); 5 Oct 2007 02:32:01 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 45205 invoked by uid 99); 5 Oct 2007 02:32:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Oct 2007 19:32:01 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Oct 2007 02:32:03 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id AE0271A9832; Thu,  4 Oct 2007 19:31:43 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r582059 -
 /geronimo/server/trunk/modules/geronimo-activemq-ra/src/main/rar/META-INF/ra.xml
Date: Fri, 05 Oct 2007 02:31:43 -0000
To: scm@geronimo.apache.org
From: hogstrom@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20071005023143.AE0271A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hogstrom
Date: Thu Oct  4 19:31:41 2007
New Revision: 582059

URL: http://svn.apache.org/viewvc?rev=582059&view=rev
Log:
Merged from server/branches/2.0/ at SVN rev number 582058.  Here is the jist of that commit:

Added the following attributes for configuration on the resource adapter.  These properties are 
documented at http://activemq.apache.org/resource-adapter-properties.html

UseInboundSession
DurableTopicPrefetch
QueuePrefetch
InputStreamPrefetch
TopicPrefetch
InitialRedeliveryDelay
MaximumRedeliveries
RedeliveryBackOffMultiplier
RedeliveryUseExponentialBackOff


Modified:
    geronimo/server/trunk/modules/geronimo-activemq-ra/src/main/rar/META-INF/ra.xml

Modified: geronimo/server/trunk/modules/geronimo-activemq-ra/src/main/rar/META-INF/ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-activemq-ra/src/main/rar/META-INF/ra.xml?rev=582059&r1=582058&r2=582059&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-activemq-ra/src/main/rar/META-INF/ra.xml (original)
+++ geronimo/server/trunk/modules/geronimo-activemq-ra/src/main/rar/META-INF/ra.xml Thu Oct  4 19:31:41 2007
@@ -288,6 +288,112 @@
             -->
         </config-property>
 
+        <config-property>
+            <description>
+                Boolean to configure if outbound connections should reuse the inbound connection's 
+                session for sending messages.
+                
+                Default: false
+            </description>
+            <config-property-name>UseInboundSession</config-property-name>
+            <config-property-type>java.lang.Boolean</config-property-type>
+            <config-property-value>false</config-property-value>
+        </config-property>
+
+        <config-property>
+            <description>
+                The maximum number of messages sent to a consumer on a durable topic until 
+                acknowledgments are received.
+                
+                Default: 100
+            </description>
+            <config-property-name>DurableTopicPrefetch</config-property-name>
+            <config-property-type>java.lang.Integer</config-property-type>
+            <config-property-value>100</config-property-value>
+        </config-property>
+
+        <config-property>
+            <description>
+                The maximum number of messages sent to a consumer on a queue until 
+                acknowledgments are received.
+                
+                Default: 1000
+            </description>
+            <config-property-name>QueuePrefetch</config-property-name>
+            <config-property-type>java.lang.Integer</config-property-type>
+            <config-property-value>1000</config-property-value>
+        </config-property>
+
+        <config-property>
+            <description>
+                The maximum number of messages sent to a consumer on a JMS stream
+                until acknowledgments are received.
+                
+                Default: 100
+            </description>
+            <config-property-name>InputStreamPrefetch</config-property-name>
+            <config-property-type>java.lang.Integer</config-property-type>
+            <config-property-value>100</config-property-value>
+        </config-property>
+
+        <config-property>
+            <description>
+                The maximum number of messages sent to a consumer on a non-durable
+                topic until acknowledgments are received.
+                
+                Default: 32766
+            </description>
+            <config-property-name>TopicPrefetch</config-property-name>
+            <config-property-type>java.lang.Integer</config-property-type>
+            <config-property-value>32766</config-property-value>
+        </config-property>
+
+        <config-property>
+            <description>
+                The delay before redeliveries start.
+                
+                Default: 1000
+            </description>
+            <config-property-name>InitialRedeliveryDelay</config-property-name>
+            <config-property-type>java.lang.Long</config-property-type>
+            <config-property-value>1000</config-property-value>
+        </config-property>
+
+        <config-property>
+            <description>
+                The maximum number of redeliveries or -1 for no maximum.
+            
+                Default: 5
+            </description>
+            <config-property-name>MaximumRedeliveries</config-property-name>
+            <config-property-type>java.lang.Integer</config-property-type>
+            <config-property-value>5</config-property-value>
+        </config-property>
+
+        <config-property>
+            <description>
+                The multiplier to use if exponential back off is enabled.
+                
+                Default: 5
+            </description>
+            <config-property-name>RedeliveryBackOffMultiplier</config-property-name>
+            <config-property-type>java.lang.Short</config-property-type>
+            <config-property-value>5</config-property-value>
+        </config-property>
+        
+        <config-property>
+            <description>
+                To enable exponential backoff.
+                 	 
+                Default: false 	 
+            </description>
+            <config-property-name>RedeliveryUseExponentialBackOff</config-property-name>
+            <config-property-type>java.lang.Boolean</config-property-type>
+            <config-property-value>false</config-property-value>
+        </config-property>
+
+ 
+
         <outbound-resourceadapter>
             <connection-definition>
                 <managedconnectionfactory-class>org.apache.activemq.ra.ActiveMQManagedConnectionFactory</managedconnectionfactory-class>