Preparng 4.0
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/tags/activemq-4.0@410314 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/README.txt b/README.txt
index 70aa063..b5d9a19 100755
--- a/README.txt
+++ b/README.txt
@@ -1,11 +1,11 @@
-Welcome to ActiveMQ
-===================
-ActiveMQ is a high performance Apache 2.0 licenced Message Broker and JMS 1.1 implementation.
+Welcome to Apache ActiveMQ
+==========================
+Apache ActiveMQ is a high performance Apache 2.0 licenced Message Broker and JMS 1.1 implementation.
Incubation Disclaimer
=====================
-ActiveMQ is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Geronimo PMC.
+Apache ActiveMQ is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Geronimo PMC.
Incubation is required of all newly accepted projects until a further review indicates that the infrastructure,
communications, and decision making process have stabilized in a manner consistent with other successful ASF projects.
@@ -19,22 +19,23 @@
To help you get started, try the following links:-
Getting Started
-http://incubator.apache.org/activemq/Getting+Started
+http://incubator.apache.org/activemq/getting-started.html
Building
-http://incubator.apache.org/activemq/Building
+http://incubator.apache.org/activemq/getting-started.html#GettingStarted-WindowsSourceInstallation
+http://incubator.apache.org/activemq/getting-started.html#GettingStarted-UnixSourceInstallation
Examples
-http://incubator.apache.org/activemq/Examples
+http://incubator.apache.org/activemq/examples.html
We welcome contributions of all kinds, for details of how you can help
-http://incubator.apache.org/activemq/Contributing
+http://incubator.apache.org/activemq/contributing.html
Please refer to the website for details of finding the issue tracker, email lists, wiki or IRC channel
http://incubator.apache.org/activemq/
-Please help us make ActiveMQ better - we appreciate any feedback you may have.
+Please help us make Apache ActiveMQ better - we appreciate any feedback you may have.
Enjoy!
------------------
-The ActiveMQ team
+------------------------
+The Apache ActiveMQ team
diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
index 07e8091..3e30eb7 100755
--- a/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
+++ b/activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
@@ -328,7 +328,7 @@
protected void sendToSlave(Message message){
- if (message.isPersistent() && !message.isInTransaction()){
+ if ( message.isResponseRequired() ){
sendSyncToSlave(message);
}else{
sendAsyncToSlave(message);
@@ -338,8 +338,7 @@
}
protected void sendToSlave(MessageAck ack){
-
- if (ack.isInTransaction()){
+ if ( ack.isResponseRequired() ){
sendAsyncToSlave(ack);
}else{
sendSyncToSlave(ack);
diff --git a/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java b/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
index 552e0b4..9a63c61 100644
--- a/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
+++ b/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
@@ -101,6 +101,7 @@
protected boolean decreaseNetworkConsumerPriority;
protected boolean shutDown;
protected int networkTTL = 1;
+ protected final AtomicBoolean remoteInterupted = new AtomicBoolean(false);
public DemandForwardingBridgeSupport(final Transport localBroker, final Transport remoteBroker) {
@@ -130,28 +131,49 @@
public synchronized void transportInterupted(){
//clear any subscriptions - to try and prevent the bridge from stalling the broker
- log.warn("Outbound transport to " + remoteBrokerName + " interrupted ...");
- clearDownSubscriptions();
- doStopLocal();
- startedLatch = new CountDownLatch(2);
- try{
- triggerLocalStartBridge();
- }catch(IOException e){
- log.warn("Caught exception from local start",e);
+ if( remoteInterupted.compareAndSet(false, true) ) {
+ log.warn("Outbound transport to " + remoteBrokerName + " interrupted ...");
+ clearDownSubscriptions();
+ try{
+ localBroker.oneway(remoteConnectionInfo.createRemoveCommand());
+ }catch(IOException e){
+ log.warn("Caught exception from local start",e);
+ }
+ localBridgeStarted.set(false);
+ remoteBridgeStarted.set(false);
+ startedLatch = new CountDownLatch(2);
}
}
public synchronized void transportResumed(){
- //restart and static subscriptions - the consumer advisories will be replayed
- log.info("Outbound transport to " + remoteBrokerName + " resumed");
- setupStaticDestinations();
- startedLatch.countDown();
+
+ if( remoteInterupted.compareAndSet(true, false) ) {
+
+ //restart and static subscriptions - the consumer advisories will be replayed
+ log.info("Outbound transport to " + remoteBrokerName + " resumed");
+
+// try{
+// triggerLocalStartBridge();
+// }catch(IOException e){
+// log.warn("Caught exception from local start",e);
+// }
+
+ try{
+ // clear out the previous connection as it may have missed some consumer advisories.
+ remoteBroker.oneway(remoteConnectionInfo.createRemoveCommand());
+ triggerRemoteStartBridge();
+ }catch(IOException e){
+ log.warn("Caught exception from remote start",e);
+ }
+
+ }
}
});
localBroker.start();
remoteBroker.start();
+// triggerLocalStartBridge();
triggerRemoteStartBridge();
}
@@ -160,7 +182,7 @@
public void run(){
try{
startLocalBridge();
- }catch(IOException e){
+ }catch(Exception e){
log.error("Failed to start network bridge: "+e,e);
}
}
@@ -173,7 +195,7 @@
public void run(){
try{
startRemoteBridge();
- }catch(IOException e){
+ }catch(Exception e){
log.error("Failed to start network bridge: "+e,e);
}
}
@@ -181,8 +203,9 @@
thead.start();
}
- protected void startLocalBridge() throws IOException {
+ protected void startLocalBridge() throws Exception {
if(localBridgeStarted.compareAndSet(false,true)){
+
localConnectionInfo=new ConnectionInfo();
localConnectionInfo.setConnectionId(new ConnectionId(idGenerator.generateId()));
localClientId="NC_"+remoteBrokerName+"_inbound"+name;
@@ -201,7 +224,7 @@
}
}
- protected void startRemoteBridge() throws IOException {
+ protected void startRemoteBridge() throws Exception {
if(remoteBridgeStarted.compareAndSet(false,true)){
remoteConnectionInfo=new ConnectionInfo();
@@ -229,7 +252,7 @@
+destinationFilter));
demandConsumerInfo.setPrefetchSize(prefetchSize);
remoteBroker.oneway(demandConsumerInfo);
- //we want infomation about Destinations as well
+ //we want information about Destinations as well
ConsumerInfo destinationInfo = new ConsumerInfo(remoteSessionInfo,2);
destinationInfo.setDestination(AdvisorySupport.TEMP_DESTINATION_COMPOSITE_ADVISORY_TOPIC);
destinationInfo.setPrefetchSize(prefetchSize);
@@ -290,6 +313,7 @@
}finally{
ServiceStopper ss=new ServiceStopper();
ss.stop(localBroker);
+ localBridgeStarted.set(false);
}
}
@@ -489,9 +513,13 @@
serviceLocalBrokerInfo(command);
}else if(command.isShutdownInfo()){
log.info(localBrokerName+" Shutting down");
- shutDown = true;
- doStop();
-
+ // Don't shut down the whole connector if the remote side was interrupted.
+ // the local transport is just shutting down temporarily until the remote side
+ // is restored.
+ if( !remoteInterupted.get() ) {
+ shutDown = true;
+ doStop();
+ }
}else{
switch(command.getDataStructureType()){
diff --git a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
index f1ebc36..63846ae 100755
--- a/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
+++ b/activemq-core/src/main/java/org/apache/activemq/openwire/OpenWireFormat.java
@@ -233,11 +233,15 @@
BooleanStream bs = new BooleanStream();
size += dsm.tightMarshal1(this, c, bs);
size += bs.marshalledSize();
-
- dataOut.writeInt(size);
+
+ if( !sizePrefixDisabled ) {
+ dataOut.writeInt(size);
+ }
+
dataOut.writeByte(type);
bs.marshal(dataOut);
dsm.tightMarshal2(this, c, dataOut, bs);
+
} else {
DataOutputStream looseOut = dataOut;
ByteArrayOutputStream baos=null;
@@ -253,7 +257,7 @@
if( !sizePrefixDisabled ) {
looseOut.close();
ByteSequence sequence = baos.toByteSequence();
- dataOut.writeInt(sequence.getLength()-4);
+ dataOut.writeInt(sequence.getLength());
dataOut.write(sequence.getData(), sequence.getOffset(), sequence.getLength());
}
diff --git a/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java b/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
index adbdefe..b13c7be 100755
--- a/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
+++ b/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
@@ -229,8 +229,8 @@
ServiceSupport.dispose(connectedTransport);
connectedTransport = null;
connectedTransportURI = null;
- reconnectTask.wakeup();
}
+ reconnectTask.wakeup();
}
}
diff --git a/assembly/maven.xml b/assembly/maven.xml
index 8ca1812..31740a3 100755
--- a/assembly/maven.xml
+++ b/assembly/maven.xml
@@ -171,7 +171,7 @@
<ant:echo message="${project.root}"/>
<ant:copy todir="${maven.dist.bin.assembly.dir}">
- <fileset dir="${project.root}" includes="*.txt,STATUS,NOTICE"/>
+ <fileset dir="${project.root}" includes="STATUS"/>
</ant:copy>
<!-- Copy documentation -->
diff --git a/assembly/src/release/LICENSE.txt b/assembly/src/release/LICENSE.txt
new file mode 100755
index 0000000..6b0b127
--- /dev/null
+++ b/assembly/src/release/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
diff --git a/assembly/src/release/README.txt b/assembly/src/release/README.txt
index 70aa063..b5d9a19 100755
--- a/assembly/src/release/README.txt
+++ b/assembly/src/release/README.txt
@@ -1,11 +1,11 @@
-Welcome to ActiveMQ
-===================
-ActiveMQ is a high performance Apache 2.0 licenced Message Broker and JMS 1.1 implementation.
+Welcome to Apache ActiveMQ
+==========================
+Apache ActiveMQ is a high performance Apache 2.0 licenced Message Broker and JMS 1.1 implementation.
Incubation Disclaimer
=====================
-ActiveMQ is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Geronimo PMC.
+Apache ActiveMQ is an effort undergoing incubation at the Apache Software Foundation (ASF), sponsored by the Geronimo PMC.
Incubation is required of all newly accepted projects until a further review indicates that the infrastructure,
communications, and decision making process have stabilized in a manner consistent with other successful ASF projects.
@@ -19,22 +19,23 @@
To help you get started, try the following links:-
Getting Started
-http://incubator.apache.org/activemq/Getting+Started
+http://incubator.apache.org/activemq/getting-started.html
Building
-http://incubator.apache.org/activemq/Building
+http://incubator.apache.org/activemq/getting-started.html#GettingStarted-WindowsSourceInstallation
+http://incubator.apache.org/activemq/getting-started.html#GettingStarted-UnixSourceInstallation
Examples
-http://incubator.apache.org/activemq/Examples
+http://incubator.apache.org/activemq/examples.html
We welcome contributions of all kinds, for details of how you can help
-http://incubator.apache.org/activemq/Contributing
+http://incubator.apache.org/activemq/contributing.html
Please refer to the website for details of finding the issue tracker, email lists, wiki or IRC channel
http://incubator.apache.org/activemq/
-Please help us make ActiveMQ better - we appreciate any feedback you may have.
+Please help us make Apache ActiveMQ better - we appreciate any feedback you may have.
Enjoy!
------------------
-The ActiveMQ team
+------------------------
+The Apache ActiveMQ team
diff --git a/assembly/src/release/userGuide.html b/assembly/src/release/userGuide.html
index 18c9a1b..ea835ef 100755
--- a/assembly/src/release/userGuide.html
+++ b/assembly/src/release/userGuide.html
@@ -9,13 +9,13 @@
</h1>
<p>
-Welcome to ActiveMQ. This document gives you a quick overview of how to get started trying out ActiveMQ.
+Welcome to Apache ActiveMQ. This document gives you a quick overview of how to get started trying out Apache ActiveMQ.
</p>
<h2>Running the broker</h2>
<p>
-From the binary distribution you can run the ActiveMQ server pretty easily via the bin/activemq command.
+From the binary distribution you can run the Apache ActiveMQ server pretty easily via the bin/activemq command.
e.g. from a shell type
</p>
<pre>
@@ -24,7 +24,7 @@
</pre>
<p>
-The ActiveMQ broker should now have started
+The Apache ActiveMQ broker should now have started
</p>
<h2>Running the example programs</h2>
