Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switching to Java 5.. Build and Runtime now require Java 5 see: http://www.nabble.com/Switching-to-ActiveMQ-4.2-to-Java-5----tf2637427.html 

- Update maven build
- Removed dependency on concurrent-backport



git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@475999 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-11-17 00:29:03 +00:00
parent 849d2f330e
commit 86cbdfd5db
311 changed files with 466 additions and 496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activemq-core/pom.xml
View File

@ -37,12 +37,6 @@
<!-- =============================== -->
<!-- Required Dependencies -->
<!-- =============================== -->
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<optional>false</optional>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>

18
activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
View File

@ -85,14 +85,14 @@ import org.apache.activemq.util.ServiceSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue;
import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor;
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
public class ActiveMQConnection implements Connection, TopicConnection, QueueConnection, StatsCapable, Closeable, StreamConnection, TransportListener {
@ -183,7 +183,7 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon
thread.setDaemon(true);
return thread;
}});
asyncConnectionThread.allowCoreThreadTimeOut(true);
//asyncConnectionThread.allowCoreThreadTimeOut(true);
this.info = new ConnectionInfo(new ConnectionId(connectionIdGenerator.generateId()));
this.info.setManageable(true);

6
activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java
View File

@ -43,9 +43,9 @@ import org.apache.activemq.util.JMSExceptionSupport;
import org.apache.activemq.util.URISupport;
import org.apache.activemq.util.URISupport.CompositeData;
import edu.emory.mathcs.backport.java.util.concurrent.Executor;
import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor;
import edu.emory.mathcs.backport.java.util.concurrent.ThreadFactory;
import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
/**
* A ConnectionFactory is an an Administered object, and is used for creating

8
activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
View File

@ -47,10 +47,10 @@ import org.apache.activemq.util.JMSExceptionSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ExecutorService;
import edu.emory.mathcs.backport.java.util.concurrent.Executors;
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* A client uses a <CODE>MessageConsumer</CODE> object to receive messages

2
activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java
View File

@ -33,7 +33,7 @@ import org.apache.activemq.management.JMSProducerStatsImpl;
import org.apache.activemq.management.StatsCapable;
import org.apache.activemq.management.StatsImpl;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicLong;
/**
* A client uses a <CODE>MessageProducer</CODE> object to send messages to a

2
activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java
View File

@ -201,4 +201,4 @@ public class ActiveMQMessageTransformation {
toMesage.setObjectProperty(name, obj);
}
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java
View File

@ -29,7 +29,7 @@ import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ConsumerId;
import org.apache.activemq.command.MessageDispatch;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* A client uses a <CODE>QueueBrowser</CODE> object to look at messages on a

4
activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java
View File

@ -79,8 +79,8 @@ import org.apache.activemq.util.LongSequenceGenerator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* <P>

2
activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java
View File

@ -72,4 +72,4 @@ public class ActiveMQXAConnection extends ActiveMQConnection implements XATopicC
ensureConnectionInfoSent();
return new ActiveMQXASession(this, getNextSessionId(), Session.SESSION_TRANSACTED, dispatchAsync);
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java
View File

@ -112,4 +112,4 @@ public class ActiveMQXASession extends ActiveMQSession implements QueueSession,
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/Closeable.java
View File

@ -37,4 +37,4 @@ public interface Closeable {
* some internal error.
*/
public void close() throws JMSException;
}
}

2
activemq-core/src/main/java/org/apache/activemq/ThreadPriorities.java
View File

@ -30,4 +30,4 @@ public interface ThreadPriorities {
public static final int INBOUND_CLIENT_CONNECTION = 7;
public static final int INBOUND_CLIENT_SESSION = 7;
public static final int BROKER_MANAGEMENT = 9;
}
}

4
activemq-core/src/main/java/org/apache/activemq/TransactionContext.java
View File

@ -41,7 +41,7 @@ import org.apache.activemq.util.LongSequenceGenerator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentHashMap;
/**
* A TransactionContext provides the means to control a JMS transaction. It
@ -620,4 +620,4 @@ public class TransactionContext implements XAResource {
associatedXid=null;
transactionId=null;
}
}
}

4
activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
View File

@ -38,7 +38,7 @@ import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.util.IdGenerator;
import org.apache.activemq.util.LongSequenceGenerator;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentHashMap;
/**
* This broker filter handles tracking the state of the broker for purposes of publishing advisory messages
@ -275,4 +275,4 @@ public class AdvisoryBroker extends BrokerFilter {
}
}
}
}

4
activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java
View File

@ -17,8 +17,8 @@
*/
package org.apache.activemq.advisory;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.Service;
import org.apache.activemq.command.ActiveMQDestination;

4
activemq-core/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java
View File

@ -33,8 +33,8 @@ import org.apache.activemq.command.ProducerInfo;
import org.apache.activemq.command.RemoveInfo;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
/**
* An object which can be used to listen to the number of active consumers

4
activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -77,8 +77,8 @@ import org.apache.activemq.util.ServiceStopper;
import org.apache.activemq.util.URISupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* Manages the lifecycle of an ActiveMQ Broker. A BrokerService consists of a number of transport

4
activemq-core/src/main/java/org/apache/activemq/broker/ConnectionContext.java
View File

@ -17,8 +17,8 @@
*/
package org.apache.activemq.broker;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.broker.region.MessageReference;
import org.apache.activemq.command.ConnectionId;

2
activemq-core/src/main/java/org/apache/activemq/broker/TransactionBroker.java
View File

@ -17,7 +17,7 @@
*/
package org.apache.activemq.broker;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.activemq.command.ConnectionInfo;
import org.apache.activemq.command.LocalTransactionId;

8
activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
View File

@ -73,10 +73,10 @@ import org.apache.activemq.util.ServiceSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* @version $Revision: 1.8 $

2
activemq-core/src/main/java/org/apache/activemq/broker/TransportConnector.java
View File

@ -41,7 +41,7 @@ import org.apache.activemq.util.ServiceSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArrayList;
/**
* @org.apache.xbean.XBean

4
activemq-core/src/main/java/org/apache/activemq/broker/TransportStatusDetector.java
View File

@ -17,8 +17,8 @@
*/
package org.apache.activemq.broker;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.Service;
import org.apache.activemq.ThreadPriorities;

2
activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterBroker.java
View File

@ -17,7 +17,7 @@
*/
package org.apache.activemq.broker.ft;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.broker.Connection;
import org.apache.activemq.broker.ConnectionContext;

2
activemq-core/src/main/java/org/apache/activemq/broker/ft/MasterConnector.java
View File

@ -44,7 +44,7 @@ import org.apache.activemq.util.ServiceStopper;
import org.apache.activemq.util.ServiceSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* Connects a Slave Broker to a Master when using <a

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerView.java
View File

@ -17,7 +17,7 @@
*/
package org.apache.activemq.broker.jmx;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicInteger;
import javax.management.ObjectName;

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/BrokerViewMBean.java
View File

@ -119,4 +119,4 @@ public interface BrokerViewMBean extends Service {
*/
public void destroyDurableSubscriber(String clientId, String subscriberName) throws Exception;
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectionViewMBean.java
View File

@ -71,4 +71,4 @@ public interface ConnectionViewMBean extends Service {
*/
public String getRemoteAddress();
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/ConnectorViewMBean.java
View File

@ -40,4 +40,4 @@ public interface ConnectorViewMBean extends Service {
*/
public long getDequeueCount();
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/DestinationViewMBean.java
View File

@ -116,4 +116,4 @@ public interface DestinationViewMBean {
*/
public List browseMessages(String selector) throws InvalidSelectorException;
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionView.java
View File

@ -85,4 +85,4 @@ public class DurableSubscriptionView extends SubscriptionView implements Durabl
public String toString(){
return "InactiveDurableSubscriptionView: " + getClientId() + ":" + getSubscriptionName();
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/DurableSubscriptionViewMBean.java
View File

@ -52,4 +52,4 @@ public interface DurableSubscriptionViewMBean extends SubscriptionViewMBean{
* Destroys the durable subscription so that messages will no longer be stored for this subscription
*/
public void destroy() throws Exception;
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/FTConnectorViewMBean.java
View File

@ -21,4 +21,4 @@ import org.apache.activemq.Service;
public interface FTConnectorViewMBean extends Service {
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/InactiveDurableSubscriptionView.java
View File

@ -135,4 +135,4 @@ public class InactiveDurableSubscriptionView extends SubscriptionView implements
public String toString(){
return "InactiveDurableSubscriptionView: " + getClientId() + ":" + getSubscriptionName();
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/JmsConnectorViewMBean.java
View File

@ -21,4 +21,4 @@ import org.apache.activemq.Service;
public interface JmsConnectorViewMBean extends Service {
}
}

4
activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagedRegionBroker.java
View File

@ -70,8 +70,8 @@ import org.apache.activemq.util.SubscriptionKey;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArraySet;
public class ManagedRegionBroker extends RegionBroker {
private static final Log log = LogFactory.getLog(ManagedRegionBroker.class);

4
activemq-core/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
View File

@ -36,7 +36,7 @@ import org.apache.activemq.Service;
import org.apache.activemq.util.ClassLoading;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* A Flow provides different dispatch policies within the NMR
*
@ -435,4 +435,4 @@ public class ManagementContext implements Service{
public void setCreateConnector(boolean createConnector){
this.createConnector=createConnector;
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkConnectorViewMBean.java
View File

@ -21,4 +21,4 @@ import org.apache.activemq.Service;
public interface NetworkConnectorViewMBean extends Service {
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/ProxyConnectorViewMBean.java
View File

@ -21,4 +21,4 @@ import org.apache.activemq.Service;
public interface ProxyConnectorViewMBean extends Service {
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/QueueViewMBean.java
View File

@ -113,4 +113,4 @@ public interface QueueViewMBean extends DestinationViewMBean {
*/
public int moveMatchingMessagesTo(String selector, String destinationName, int maximumMessages) throws Exception;
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/SubscriptionViewMBean.java
View File

@ -148,4 +148,4 @@ public interface SubscriptionViewMBean {
* consumers.
*/
public String getSubcriptionName();
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/jmx/TopicViewMBean.java
View File

@ -18,4 +18,4 @@
package org.apache.activemq.broker.jmx;
public interface TopicViewMBean extends DestinationViewMBean {
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractRegion.java
View File

@ -39,7 +39,7 @@ import org.apache.activemq.thread.TaskRunnerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentHashMap;
/**
*

2
activemq-core/src/main/java/org/apache/activemq/broker/region/AbstractSubscription.java
View File

@ -37,7 +37,7 @@ import org.apache.activemq.selector.SelectorParser;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArrayList;
abstract public class AbstractSubscription implements Subscription {

2
activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectionStatistics.java
View File

@ -79,4 +79,4 @@ public class ConnectionStatistics extends StatsImpl {
public void onMessageDequeue(Message message) {
dequeues.increment();
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/region/ConnectorStatistics.java
View File

@ -90,4 +90,4 @@ public class ConnectorStatistics extends StatsImpl {
public void setMessagesCached(PollCountStatisticImpl messagesCached) {
this.messagesCached = messagesCached;
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/region/Destination.java
View File

@ -52,4 +52,4 @@ public interface Destination extends Service {
public Message[] browse();
public String getName();
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationInterceptor.java
View File

@ -27,4 +27,4 @@ public interface DestinationInterceptor {
Destination intercept(Destination destination);
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/region/DestinationStatistics.java
View File

@ -107,4 +107,4 @@ public class DestinationStatistics extends StatsImpl {
public CountStatisticImpl getDispatched() {
return dispatched;
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
View File

@ -31,7 +31,7 @@ import org.apache.activemq.command.Message;
import org.apache.activemq.command.MessageAck;
import org.apache.activemq.command.MessageDispatch;
import org.apache.activemq.util.SubscriptionKey;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentHashMap;
public class DurableTopicSubscription extends PrefetchSubscription {

2
activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
View File

@ -57,7 +57,7 @@ import org.apache.activemq.util.BrokerSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArrayList;
/**
* The Queue is a List of MessageEntry objects that are dispatched to matching

6
activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
View File

@ -60,9 +60,9 @@ import org.apache.activemq.util.IdGenerator;
import org.apache.activemq.util.LongSequenceGenerator;
import org.apache.activemq.util.ServiceStopper;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
/**
* Routes Broker operations to the correct messaging regions for processing.

2
activemq-core/src/main/java/org/apache/activemq/broker/region/Subscription.java
View File

@ -199,4 +199,4 @@ public interface Subscription {
*/
public boolean isRecoveryRequired();
}
}

6
activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
View File

@ -44,9 +44,9 @@ import org.apache.activemq.transaction.Synchronization;
import org.apache.activemq.util.SubscriptionKey;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
/**
* The Topic is a destination that sends a copy of a message to every active

2
activemq-core/src/main/java/org/apache/activemq/broker/region/TopicRegion.java
View File

@ -43,7 +43,7 @@ import org.apache.activemq.util.SubscriptionKey;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentHashMap;
/**
*

2
activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
View File

@ -43,7 +43,7 @@ import org.apache.activemq.transaction.Synchronization;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicLong;
public class TopicSubscription extends AbstractSubscription{

2
activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/StoreDurableSubscriberCursor.java
View File

@ -27,7 +27,7 @@ import org.apache.activemq.command.Message;
import org.apache.activemq.kaha.Store;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* perist pending messages pending message (messages awaiting disptach to a consumer) cursor

2
activemq-core/src/main/java/org/apache/activemq/broker/region/group/SimpleMessageGroupMap.java
View File

@ -17,7 +17,7 @@
*/
package org.apache.activemq.broker.region.group;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.activemq.command.ConsumerId;

2
activemq-core/src/main/java/org/apache/activemq/broker/region/policy/QueryBasedSubscriptionRecoveryPolicy.java
View File

@ -17,7 +17,7 @@
*/
package org.apache.activemq.broker.region.policy;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.activemq.ActiveMQMessageTransformation;
import org.apache.activemq.broker.ConnectionContext;

2
activemq-core/src/main/java/org/apache/activemq/broker/region/virtual/VirtualDestinationInterceptor.java
View File

@ -86,4 +86,4 @@ public class VirtualDestinationInterceptor implements DestinationInterceptor {
};
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java
View File

@ -134,4 +134,4 @@ public class NetworkBridgeFilter implements DataStructure, BooleanExpression {
this.networkBrokerId = remoteBrokerPath;
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/filter/ConstantExpression.java
View File

@ -161,4 +161,4 @@ public class ConstantExpression implements Expression {
return b.toString();
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java
View File

@ -266,4 +266,4 @@ public class MultiExpressionEvaluator {
}
}
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/filter/XPathExpression.java
View File

@ -118,4 +118,4 @@ public final class XPathExpression implements BooleanExpression {
return object!=null && object==Boolean.TRUE;
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/filter/XQueryExpression.java
View File

@ -48,4 +48,4 @@ public final class XQueryExpression implements BooleanExpression {
return object!=null && object==Boolean.TRUE;
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java
View File

@ -38,7 +38,7 @@ import org.apache.activemq.broker.Broker;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentHashMap;
/**
* A factory of the ActiveMQ InitialContext which contains {@link ConnectionFactory}

2
activemq-core/src/main/java/org/apache/activemq/kaha/IndexTypes.java
View File

@ -32,4 +32,4 @@ public interface IndexTypes{
* use disk-based indexes
*/
public final static String DISK_INDEX = "DiskIndex";
}
}

2
activemq-core/src/main/java/org/apache/activemq/kaha/MapContainer.java
View File

@ -181,4 +181,4 @@ public interface MapContainer extends Map{
* @return the index map
*/
public Map getIndexMap();
}
}

2
activemq-core/src/main/java/org/apache/activemq/kaha/Marshaller.java
View File

@ -47,4 +47,4 @@ public interface Marshaller {
public Object readPayload(DataInput dataIn) throws IOException;
}
}

2
activemq-core/src/main/java/org/apache/activemq/kaha/Store.java
View File

@ -240,4 +240,4 @@ public interface Store{
* @see org.apache.activemq.kaha.IndexTypes
*/
public void setIndexType(String type);
}
}

2
activemq-core/src/main/java/org/apache/activemq/kaha/StoreEntry.java
View File

@ -56,4 +56,4 @@ public interface StoreEntry{
public abstract int getKeySize();
public abstract int getValueSize();
}
}

2
activemq-core/src/main/java/org/apache/activemq/kaha/StoreLocation.java
View File

@ -39,4 +39,4 @@ public interface StoreLocation{
* @return Returns the file.
*/
public int getFile();
}
}

4
activemq-core/src/main/java/org/apache/activemq/kaha/impl/IndexRootContainer.java
View File

@ -34,7 +34,7 @@ import org.apache.activemq.kaha.impl.index.IndexManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentHashMap;
/**
* A container of roots for other Containers
@ -138,4 +138,4 @@ class IndexRootContainer {
}
}

2
activemq-core/src/main/java/org/apache/activemq/kaha/impl/KahaStore.java
View File

@ -45,7 +45,7 @@ import org.apache.activemq.kaha.impl.index.IndexManager;
import org.apache.activemq.kaha.impl.index.RedoStoreIndexItem;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentHashMap;
/**
* Store Implementation

2
activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/ContainerId.java
View File

@ -85,4 +85,4 @@ public class ContainerId implements Externalizable{
public String toString(){
return "CID{"+dataContainerName + ":" + key + "}";
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/kaha/impl/container/MapContainerImpl.java
View File

@ -448,4 +448,4 @@ public final class MapContainerImpl extends BaseContainerImpl implements MapCont
indexMap = map;
}
}
}

4
activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/AsyncDataFileWriter.java
View File

@ -27,8 +27,8 @@ import org.apache.activemq.kaha.StoreLocation;
import org.apache.activemq.memory.UsageManager;
import org.apache.activemq.util.DataByteArrayOutputStream;
import edu.emory.mathcs.backport.java.util.LinkedList;
import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
import java.util.LinkedList;
import java.util.concurrent.CountDownLatch;
/**
* Optimized Store writer that uses an async thread do batched writes to

2
activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataFileReader.java
View File

@ -21,4 +21,4 @@ interface DataFileReader {
Object readItem(Marshaller marshaller, StoreLocation item)
throws IOException;
}
}

2
activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataFileWriter.java
View File

@ -24,4 +24,4 @@ interface DataFileWriter {
public void force(DataFile dataFile) throws IOException;
public void close() throws IOException;
}
}

2
activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/DataItem.java
View File

@ -99,4 +99,4 @@ public final class DataItem implements Item, StoreLocation{
public DataItem copy() {
return new DataItem(this);
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/Item.java
View File

@ -28,4 +28,4 @@ public interface Item{
static final int ACTIVE=22;
static final int FREE=33;
static final int LOCATION_SIZE=24;
}
}

2
activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexItem.java
View File

@ -322,4 +322,4 @@ import org.apache.activemq.kaha.impl.data.Item;
public int hashCode(){
return (int)offset;
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/IndexLinkedList.java
View File

@ -180,4 +180,4 @@ public interface IndexLinkedList{
* @return update StoreEntry
*/
public StoreEntry refreshEntry(StoreEntry current);
}
}

2
activemq-core/src/main/java/org/apache/activemq/management/CountStatisticImpl.java
View File

@ -19,7 +19,7 @@ package org.apache.activemq.management;
import javax.management.j2ee.statistics.CountStatistic;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicLong;
/**
* A count statistic implementation

2
activemq-core/src/main/java/org/apache/activemq/management/JMSStatsImpl.java
View File

@ -22,7 +22,7 @@ import java.util.List;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.util.IndentPrinter;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArrayList;
/**
* Statistics for a number of JMS connections

2
activemq-core/src/main/java/org/apache/activemq/memory/Cache.java
View File

@ -61,4 +61,4 @@ public interface Cache {
*/
public int size();
}
}

2
activemq-core/src/main/java/org/apache/activemq/memory/CacheEntry.java
View File

@ -53,4 +53,4 @@ public class CacheEntry {
return true;
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/memory/CacheEvictionUsageListener.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.thread.TaskRunnerFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArrayList;
public class CacheEvictionUsageListener implements UsageListener {

2
activemq-core/src/main/java/org/apache/activemq/memory/MapCache.java
View File

@ -19,7 +19,7 @@ package org.apache.activemq.memory;
import java.util.Map;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentHashMap;
/**
* Use any Map to implement the Cache. No cache eviction going on here. Just gives

2
activemq-core/src/main/java/org/apache/activemq/memory/UsageManager.java
View File

@ -22,7 +22,7 @@ import java.util.Iterator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArrayList;
/**

2
activemq-core/src/main/java/org/apache/activemq/memory/UsageManagerCacheFilter.java
View File

@ -17,7 +17,7 @@
*/
package org.apache.activemq.memory;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicLong;
/**
* Simple CacheFilter that increases/decreases usage on a UsageManager as

2
activemq-core/src/main/java/org/apache/activemq/memory/buffer/MessageBuffer.java
View File

@ -43,4 +43,4 @@ public interface MessageBuffer {
public void clear();
}
}

6
activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
View File

@ -59,9 +59,9 @@ import org.apache.activemq.util.ServiceSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* A useful base class for implementing demand forwarding bridges.

4
activemq-core/src/main/java/org/apache/activemq/network/DemandSubscription.java
View File

@ -17,8 +17,8 @@
*/
package org.apache.activemq.network;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArraySet;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.command.ConsumerId;
import org.apache.activemq.command.ConsumerInfo;

2
activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
View File

@ -31,7 +31,7 @@ import org.apache.activemq.transport.discovery.DiscoveryListener;
import org.apache.activemq.util.ServiceStopper;
import org.apache.activemq.util.ServiceSupport;
import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentHashMap;
/**
* A network connector which uses a discovery agent to detect the remote brokers

2
activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java
View File

@ -30,7 +30,7 @@ import org.apache.activemq.util.ServiceSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArrayList;
/**
* @version $Revision$

4
activemq-core/src/main/java/org/apache/activemq/network/jms/DestinationBridge.java
View File

@ -17,7 +17,7 @@
*/
package org.apache.activemq.network.jms;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.Service;
import org.apache.commons.logging.Log;
@ -183,4 +183,4 @@ public abstract class DestinationBridge implements Service, MessageListener {
jmsConnector.restartProducerConnection();
createProducer();
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/network/jms/InboundQueueBridge.java
View File

@ -75,4 +75,4 @@ public class InboundQueueBridge extends QueueBridge{
this.localQueueName=localQueueName;
}
}
}

2
activemq-core/src/main/java/org/apache/activemq/network/jms/InboundTopicBridge.java
View File

@ -75,4 +75,4 @@ public class InboundTopicBridge extends TopicBridge{
this.localTopicName=localTopicName;
}
}
}

6
activemq-core/src/main/java/org/apache/activemq/network/jms/JmsConnector.java
View File

@ -34,8 +34,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.jndi.JndiTemplate;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
/**
* This bridge joins the gap between foreign JMS providers and ActiveMQ As some
@ -320,4 +320,4 @@ public abstract class JmsConnector implements Service {
}
public abstract void restartProducerConnection() throws NamingException, JMSException;
}
}

2
activemq-core/src/main/java/org/apache/activemq/network/jms/JmsMesageConvertor.java
View File

@ -41,4 +41,4 @@ public interface JmsMesageConvertor {
public void setConnection(Connection connection);
}
}

Some files were not shown because too many files have changed in this diff Show More