svn commit: r413633 - in /incubator/activemq/branches/activemq-4.0: activemq-core/src/main/java/org/apache/activemq/ assembly/src/release/conf/

[jstrachan]

Author: jstrachan
Date: Mon Jun 12 04:01:45 2006
New Revision: 413633

URL: http://svn.apache.org/viewvc?rev=413633&view=rev
Log:
backported a trivial snippet macro change as a test for the 
activemq-backport.sh script

Modified:
    
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
    
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
    
incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/activemq.xml

Modified: 
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
URL: 
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java?rev=413633&r1=413632&r2=413633&view=diff
==============================================================================
--- 
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
 (original)
+++ 
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
 Mon Jun 12 04:01:45 2006
@@ -125,7 +125,7 @@
     protected boolean asyncDispatch = false;
     protected boolean alwaysSessionAsync=true;
     private boolean useAsyncSend = false;
-    private boolean optimizeAcknowledge = true;
+    private boolean optimizeAcknowledge = false;
     private boolean useRetroactiveConsumer;
     private int closeTimeout = 15000;
     

Modified: 
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java?rev=413633&r1=413632&r2=413633&view=diff
==============================================================================
--- 
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
 (original)
+++ 
incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
 Mon Jun 12 04:01:45 2006
@@ -81,7 +81,7 @@
     protected boolean asyncDispatch = false;
     protected boolean alwaysSessionAsync=true;
     private boolean useAsyncSend = false;
-    private boolean optimizeAcknowledge = true;
+    private boolean optimizeAcknowledge = false;
     private int closeTimeout = 15000;
     private boolean useRetroactiveConsumer;
 

Modified: 
incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/activemq.xml
URL: 
http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/activemq.xml?rev=413633&r1=413632&r2=413633&view=diff
==============================================================================
--- 
incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/activemq.xml 
(original)
+++ 
incubator/activemq/branches/activemq-4.0/assembly/src/release/conf/activemq.xml 
Mon Jun 12 04:01:45 2006
@@ -1,4 +1,4 @@
-<!-- START SNIPPET: xbean -->
+<!-- START SNIPPET: example -->
 <beans xmlns="http://activemq.org/config/1.0";>
   
   <broker useJmx="true">
@@ -91,4 +91,4 @@
   -->  
 
 </beans>
-<!-- END SNIPPET: xbean -->
+<!-- END SNIPPET: example -->