Return-Path: Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org Received: (qmail 21549 invoked from network); 28 Dec 2005 17:32:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Dec 2005 17:32:36 -0000 Received: (qmail 32507 invoked by uid 500); 28 Dec 2005 17:32:32 -0000 Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org Received: (qmail 32412 invoked by uid 500); 28 Dec 2005 17:32:31 -0000 Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: activemq-dev@geronimo.apache.org Delivered-To: mailing list activemq-commits@geronimo.apache.org Received: (qmail 32383 invoked by uid 99); 28 Dec 2005 17:32:30 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Dec 2005 09:32:30 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 28 Dec 2005 09:32:16 -0800 Received: (qmail 21177 invoked by uid 65534); 28 Dec 2005 17:31:55 -0000 Message-ID: <20051228173155.21176.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r359567 [8/13] - in /incubator/activemq/trunk/activemq-core: ./ src/gram/java/org/activemq/openwire/tool/ src/gram/script/ src/main/grammar/ src/main/java/org/activemq/ src/main/java/org/activemq/advisory/ src/main/java/org/activemq/broker/... Date: Wed, 28 Dec 2005 17:28:57 -0000 To: activemq-commits@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactoryBean.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactoryBean.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/PersistenceAdapterFactoryBean.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; import org.springframework.beans.factory.FactoryBean; Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/ProxyMessageStore.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/ProxyMessageStore.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/ProxyMessageStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyMessageStore.java Wed Dec 28 09:24:02 2005 @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; import java.io.IOException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageId; /** * A simple proxy that delegates to another MessageStore. Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/ProxyTopicMessageStore.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/ProxyTopicMessageStore.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/ProxyTopicMessageStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/ProxyTopicMessageStore.java Wed Dec 28 09:24:02 2005 @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; import java.io.IOException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; /** * A simple proxy that delegates to another MessageStore. Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/TopicMessageStore.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/TopicMessageStore.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/TopicMessageStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TopicMessageStore.java Wed Dec 28 09:24:02 2005 @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; import java.io.IOException; import javax.jms.JMSException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; /** * A MessageStore for durable topic subscriptions Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TransactionRecoveryListener.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/TransactionRecoveryListener.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TransactionRecoveryListener.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TransactionRecoveryListener.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/TransactionRecoveryListener.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/TransactionRecoveryListener.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TransactionRecoveryListener.java Wed Dec 28 09:24:02 2005 @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.XATransactionId; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.XATransactionId; public interface TransactionRecoveryListener { public void recover(XATransactionId xid, Message[] addedMessages, MessageAck aks[]); Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TransactionStore.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/TransactionStore.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TransactionStore.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TransactionStore.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/TransactionStore.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/TransactionStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/TransactionStore.java Wed Dec 28 09:24:02 2005 @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store; +package org.apache.activemq.store; import java.io.IOException; -import org.activemq.Service; -import org.activemq.command.TransactionId; +import org.apache.activemq.Service; +import org.apache.activemq.command.TransactionId; /** Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCAdapter.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCAdapter.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCAdapter.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCAdapter.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCAdapter.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCAdapter.java Wed Dec 28 09:24:02 2005 @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; import java.io.IOException; import java.sql.SQLException; import java.util.Set; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; /** * @version $Revision: 1.5 $ Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageRecoveryListener.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageRecoveryListener.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageRecoveryListener.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageRecoveryListener.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageRecoveryListener.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageRecoveryListener.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageRecoveryListener.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; import java.io.IOException; Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageStore.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageStore.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCMessageStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCMessageStore.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; import java.io.IOException; import java.sql.SQLException; @@ -22,14 +22,14 @@ import org.activeio.Packet; import org.activeio.command.WireFormat; import org.activeio.packet.ByteArrayPacket; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.MessageStore; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.util.IOExceptionSupport; /** * @version $Revision: 1.10 $ @@ -168,7 +168,7 @@ } /** - * @see org.activemq.store.MessageStore#removeAllMessages(ConnectionContext) + * @see org.apache.activemq.store.MessageStore#removeAllMessages(ConnectionContext) */ public void removeAllMessages(ConnectionContext context) throws IOException { // Get a connection and remove the message from the DB Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCPersistenceAdapter.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCPersistenceAdapter.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCPersistenceAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; import java.io.IOException; import java.sql.SQLException; @@ -25,17 +25,17 @@ import org.activeio.FactoryFinder; import org.activeio.command.WireFormat; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.openwire.OpenWireFormat; -import org.activemq.store.MessageStore; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.TopicMessageStore; -import org.activemq.store.TransactionStore; -import org.activemq.store.jdbc.adapter.DefaultJDBCAdapter; -import org.activemq.store.memory.MemoryTransactionStore; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.store.TransactionStore; +import org.apache.activemq.store.jdbc.adapter.DefaultJDBCAdapter; +import org.apache.activemq.store.memory.MemoryTransactionStore; +import org.apache.activemq.util.IOExceptionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -59,7 +59,7 @@ public class JDBCPersistenceAdapter implements PersistenceAdapter { private static final Log log = LogFactory.getLog(JDBCPersistenceAdapter.class); - private static FactoryFinder factoryFinder = new FactoryFinder("META-INF/services/org/activemq/store/jdbc/"); + private static FactoryFinder factoryFinder = new FactoryFinder("META-INF/services/org/apache/activemq/store/jdbc/"); private WireFormat wireFormat = new OpenWireFormat(false); private DataSource dataSource; Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCTopicMessageStore.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCTopicMessageStore.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/JDBCTopicMessageStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/JDBCTopicMessageStore.java Wed Dec 28 09:24:02 2005 @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; import java.io.IOException; import java.sql.SQLException; import org.activeio.command.WireFormat; import org.activeio.packet.ByteArrayPacket; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.Message; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.TopicMessageStore; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.util.IOExceptionSupport; /** * @version $Revision: 1.6 $ @@ -83,7 +83,7 @@ } /** - * @see org.activemq.store.TopicMessageStore#storeSubsciption(org.activemq.service.SubscriptionInfo, + * @see org.apache.activemq.store.TopicMessageStore#storeSubsciption(org.apache.activemq.service.SubscriptionInfo, * boolean) */ public void addSubsciption(String clientId, String subscriptionName, String selector, boolean retroactive) @@ -101,7 +101,7 @@ } /** - * @see org.activemq.store.TopicMessageStore#lookupSubscription(String, + * @see org.apache.activemq.store.TopicMessageStore#lookupSubscription(String, * String) */ public SubscriptionInfo lookupSubscription(String clientId, String subscriptionName) throws IOException { Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/StatementProvider.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/StatementProvider.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/StatementProvider.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/StatementProvider.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/StatementProvider.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/StatementProvider.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/StatementProvider.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; /** * Generates the SQL statements that are used by the JDBCAdapter. Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/TransactionContext.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/TransactionContext.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/store/jdbc/TransactionContext.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/TransactionContext.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc; +package org.apache.activemq.store.jdbc; import java.io.IOException; import java.sql.Connection; @@ -23,7 +23,7 @@ import javax.sql.DataSource; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IOExceptionSupport; /** * Helps keep track of the current transaction/JDBC connection. Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/AxionJDBCAdapter.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/AxionJDBCAdapter.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/AxionJDBCAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/AxionJDBCAdapter.java Wed Dec 28 09:24:02 2005 @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * Axion specific Adapter. Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BlobJDBCAdapter.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BlobJDBCAdapter.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BlobJDBCAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BlobJDBCAdapter.java Wed Dec 28 09:24:02 2005 @@ -16,7 +16,7 @@ * limitations under the License. * **/ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; import java.io.IOException; import java.io.InputStream; @@ -30,8 +30,8 @@ import javax.jms.JMSException; import org.activeio.ByteArrayOutputStream; -import org.activemq.store.jdbc.StatementProvider; -import org.activemq.store.jdbc.TransactionContext; +import org.apache.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.TransactionContext; /** Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BytesJDBCAdapter.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BytesJDBCAdapter.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BytesJDBCAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/BytesJDBCAdapter.java Wed Dec 28 09:24:02 2005 @@ -16,13 +16,13 @@ * limitations under the License. * **/ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * This JDBCAdapter inserts and extracts BLOB data using the @@ -47,14 +47,14 @@ } /** - * @see org.activemq.store.jdbc.adapter.DefaultJDBCAdapter#getBinaryData(java.sql.ResultSet, int) + * @see org.apache.activemq.store.jdbc.adapter.DefaultJDBCAdapter#getBinaryData(java.sql.ResultSet, int) */ protected byte[] getBinaryData(ResultSet rs, int index) throws SQLException { return rs.getBytes(index); } /** - * @see org.activemq.store.jdbc.adapter.DefaultJDBCAdapter#setBinaryData(java.sql.PreparedStatement, int, byte[]) + * @see org.apache.activemq.store.jdbc.adapter.DefaultJDBCAdapter#setBinaryData(java.sql.PreparedStatement, int, byte[]) */ protected void setBinaryData(PreparedStatement s, int index, byte[] data) throws SQLException { s.setBytes(index, data); Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/CachingStatementProvider.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/CachingStatementProvider.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/CachingStatementProvider.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/CachingStatementProvider.java Wed Dec 28 09:24:02 2005 @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * A StatementProvider filter that caches the responses Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultJDBCAdapter.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; import java.io.IOException; import java.sql.PreparedStatement; @@ -24,13 +24,13 @@ import java.util.HashSet; import java.util.Set; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; -import org.activemq.store.jdbc.JDBCAdapter; -import org.activemq.store.jdbc.JDBCMessageRecoveryListener; -import org.activemq.store.jdbc.StatementProvider; -import org.activemq.store.jdbc.TransactionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; +import org.apache.activemq.store.jdbc.JDBCAdapter; +import org.apache.activemq.store.jdbc.JDBCMessageRecoveryListener; +import org.apache.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.TransactionContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -393,7 +393,7 @@ } /** - * @see org.activemq.store.jdbc.JDBCAdapter#doSetSubscriberEntry(java.sql.Connection, java.lang.Object, org.activemq.service.SubscriptionInfo) + * @see org.apache.activemq.store.jdbc.JDBCAdapter#doSetSubscriberEntry(java.sql.Connection, java.lang.Object, org.apache.activemq.service.SubscriptionInfo) */ public void doSetSubscriberEntry(TransactionContext c, ActiveMQDestination destination, String clientId, String subscriptionName, String selector, boolean retroactive) throws SQLException, IOException { Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultStatementProvider.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultStatementProvider.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultStatementProvider.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/DefaultStatementProvider.java Wed Dec 28 09:24:02 2005 @@ -16,9 +16,9 @@ * limitations under the License. * **/ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/HsqldbJDBCAdapter.java Wed Dec 28 09:24:02 2005 @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/ImageBasedJDBCAdaptor.java Wed Dec 28 09:24:02 2005 @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * Provides JDBCAdapter since that uses Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/InformixJDBCAdapter.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/InformixJDBCAdapter.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/InformixJDBCAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/InformixJDBCAdapter.java Wed Dec 28 09:24:02 2005 @@ -15,9 +15,9 @@ * limitations under the License. * **/ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * JDBC Adapter for Informix database. Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/OracleJDBCAdapter.java Wed Dec 28 09:24:02 2005 @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; import java.sql.Blob; import java.sql.ResultSet; import java.sql.SQLException; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * Implements all the default JDBC operations that are used Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/PostgresqlJDBCAdapter.java Wed Dec 28 09:24:02 2005 @@ -15,9 +15,9 @@ * limitations under the License. * **/ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * Implements all the default JDBC operations that are used Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/StreamJDBCAdapter.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/StreamJDBCAdapter.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/StreamJDBCAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/jdbc/adapter/StreamJDBCAdapter.java Wed Dec 28 09:24:02 2005 @@ -16,7 +16,7 @@ * limitations under the License. * **/ -package org.activemq.store.jdbc.adapter; +package org.apache.activemq.store.jdbc.adapter; import java.io.IOException; import java.io.InputStream; @@ -26,7 +26,7 @@ import org.activeio.ByteArrayInputStream; import org.activeio.ByteArrayOutputStream; -import org.activemq.store.jdbc.StatementProvider; +import org.apache.activemq.store.jdbc.StatementProvider; /** * This JDBCAdapter inserts and extracts BLOB data using the @@ -50,7 +50,7 @@ } /** - * @see org.activemq.store.jdbc.adapter.DefaultJDBCAdapter#getBinaryData(java.sql.ResultSet, int) + * @see org.apache.activemq.store.jdbc.adapter.DefaultJDBCAdapter#getBinaryData(java.sql.ResultSet, int) */ protected byte[] getBinaryData(ResultSet rs, int index) throws SQLException { @@ -72,7 +72,7 @@ } /** - * @see org.activemq.store.jdbc.adapter.DefaultJDBCAdapter#setBinaryData(java.sql.PreparedStatement, int, byte[]) + * @see org.apache.activemq.store.jdbc.adapter.DefaultJDBCAdapter#setBinaryData(java.sql.PreparedStatement, int, byte[]) */ protected void setBinaryData(PreparedStatement s, int index, byte[] data) throws SQLException { s.setBinaryStream(index, new ByteArrayInputStream(data), data.length); Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalMessageStore.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.ArrayList; @@ -24,18 +24,18 @@ import java.util.LinkedHashMap; import org.activeio.journal.RecordLocation; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.JournalQueueAck; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.MessageStore; -import org.activemq.store.PersistenceAdapter; -import org.activemq.transaction.Synchronization; -import org.activemq.util.Callback; -import org.activemq.util.TransactionTemplate; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.JournalQueueAck; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.transaction.Synchronization; +import org.apache.activemq.util.Callback; +import org.apache.activemq.util.TransactionTemplate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -349,7 +349,7 @@ } /** - * @see org.activemq.store.MessageStore#removeAllMessages(ConnectionContext) + * @see org.apache.activemq.store.MessageStore#removeAllMessages(ConnectionContext) */ public void removeAllMessages(ConnectionContext context) throws IOException { peristenceAdapter.checkpoint(true, true); Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.ArrayList; @@ -26,32 +26,32 @@ import org.activeio.journal.Journal; import org.activeio.journal.JournalEventListener; import org.activeio.journal.RecordLocation; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.DataStructure; -import org.activemq.command.JournalQueueAck; -import org.activemq.command.JournalTopicAck; -import org.activemq.command.JournalTrace; -import org.activemq.command.JournalTransaction; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.memory.UsageListener; -import org.activemq.memory.UsageManager; -import org.activemq.openwire.OpenWireFormat; -import org.activemq.store.MessageStore; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.TopicMessageStore; -import org.activemq.store.TransactionStore; -import org.activemq.store.jdbc.JDBCPersistenceAdapter; -import org.activemq.store.journal.JournalTransactionStore.Tx; -import org.activemq.store.journal.JournalTransactionStore.TxOperation; -import org.activemq.thread.Scheduler; -import org.activemq.thread.Task; -import org.activemq.thread.TaskRunner; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.DataStructure; +import org.apache.activemq.command.JournalQueueAck; +import org.apache.activemq.command.JournalTopicAck; +import org.apache.activemq.command.JournalTrace; +import org.apache.activemq.command.JournalTransaction; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.memory.UsageListener; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.store.TransactionStore; +import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter; +import org.apache.activemq.store.journal.JournalTransactionStore.Tx; +import org.apache.activemq.store.journal.JournalTransactionStore.TxOperation; +import org.apache.activemq.thread.Scheduler; +import org.apache.activemq.thread.Task; +import org.apache.activemq.thread.TaskRunner; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.util.IOExceptionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -261,7 +261,7 @@ * The Journal give us a call back so that we can move old data out of the * journal. Taking a checkpoint does this for us. * - * @see org.activemq.journal.JournalEventListener#overflowNotification(org.activemq.journal.RecordLocation) + * @see org.apache.activemq.journal.JournalEventListener#overflowNotification(org.apache.activemq.journal.RecordLocation) */ public void overflowNotification(RecordLocation safeLocation) { checkpoint(false, true); Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTopicMessageStore.java Wed Dec 28 09:24:02 2005 @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.HashMap; import java.util.Iterator; import org.activeio.journal.RecordLocation; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.JournalTopicAck; -import org.activemq.command.Message; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.TopicMessageStore; -import org.activemq.transaction.Synchronization; -import org.activemq.util.Callback; -import org.activemq.util.SubscriptionKey; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.JournalTopicAck; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.transaction.Synchronization; +import org.apache.activemq.util.Callback; +import org.apache.activemq.util.SubscriptionKey; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTransactionStore.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTransactionStore.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTransactionStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalTransactionStore.java Wed Dec 28 09:24:02 2005 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.ArrayList; @@ -24,14 +24,14 @@ import javax.transaction.xa.XAException; import org.activeio.journal.RecordLocation; -import org.activemq.command.JournalTopicAck; -import org.activemq.command.JournalTransaction; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.TransactionId; -import org.activemq.command.XATransactionId; -import org.activemq.store.TransactionRecoveryListener; -import org.activemq.store.TransactionStore; +import org.apache.activemq.command.JournalTopicAck; +import org.apache.activemq.command.JournalTransaction; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.XATransactionId; +import org.apache.activemq.store.TransactionRecoveryListener; +import org.apache.activemq.store.TransactionStore; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; @@ -125,7 +125,7 @@ /** * @throws IOException - * @see org.activemq.store.TransactionStore#prepare(TransactionId) + * @see org.apache.activemq.store.TransactionStore#prepare(TransactionId) */ public void prepare(TransactionId txid) throws IOException { Tx tx = (Tx) inflightTransactions.remove(txid); @@ -137,7 +137,7 @@ /** * @throws IOException - * @see org.activemq.store.TransactionStore#prepare(TransactionId) + * @see org.apache.activemq.store.TransactionStore#prepare(TransactionId) */ public void replayPrepare(TransactionId txid) throws IOException { Tx tx = (Tx) inflightTransactions.remove(txid); @@ -157,7 +157,7 @@ /** * @throws XAException - * @see org.activemq.store.TransactionStore#commit(org.activemq.service.Transaction) + * @see org.apache.activemq.store.TransactionStore#commit(org.apache.activemq.service.Transaction) */ public void commit(TransactionId txid, boolean wasPrepared) throws IOException { Tx tx; @@ -181,7 +181,7 @@ /** * @throws XAException - * @see org.activemq.store.TransactionStore#commit(org.activemq.service.Transaction) + * @see org.apache.activemq.store.TransactionStore#commit(org.apache.activemq.service.Transaction) */ public Tx replayCommit(TransactionId txid, boolean wasPrepared) throws IOException { if (wasPrepared) { @@ -193,7 +193,7 @@ /** * @throws IOException - * @see org.activemq.store.TransactionStore#rollback(TransactionId) + * @see org.apache.activemq.store.TransactionStore#rollback(TransactionId) */ public void rollback(TransactionId txid) throws IOException { @@ -215,7 +215,7 @@ /** * @throws IOException - * @see org.activemq.store.TransactionStore#rollback(TransactionId) + * @see org.apache.activemq.store.TransactionStore#rollback(TransactionId) */ public void replayRollback(TransactionId txid) throws IOException { if (inflightTransactions.remove(txid) != null) Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageData.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageData.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageData.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageData.java Wed Dec 28 09:24:02 2005 @@ -15,11 +15,11 @@ * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import org.activeio.journal.RecordLocation; -import org.activemq.command.Message; -import org.activemq.command.MessageId; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; public class QuickJournalMessageData { public final MessageId messageId; Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalMessageStore.java Wed Dec 28 09:24:02 2005 @@ -16,7 +16,7 @@ * limitations under the License. * **/ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.ArrayList; @@ -27,18 +27,18 @@ import org.activeio.journal.RecordLocation; import org.activeio.journal.active.Location; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.JournalQueueAck; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.MessageStore; -import org.activemq.store.PersistenceAdapter; -import org.activemq.transaction.Synchronization; -import org.activemq.util.Callback; -import org.activemq.util.TransactionTemplate; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.JournalQueueAck; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.transaction.Synchronization; +import org.apache.activemq.util.Callback; +import org.apache.activemq.util.TransactionTemplate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -381,7 +381,7 @@ } /** - * @see org.activemq.store.MessageStore#removeAllMessages(ConnectionContext) + * @see org.apache.activemq.store.MessageStore#removeAllMessages(ConnectionContext) */ public void removeAllMessages(ConnectionContext context) throws IOException { peristenceAdapter.checkpoint(true, true); Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.ArrayList; @@ -26,32 +26,32 @@ import org.activeio.journal.Journal; import org.activeio.journal.JournalEventListener; import org.activeio.journal.RecordLocation; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.DataStructure; -import org.activemq.command.JournalQueueAck; -import org.activemq.command.JournalTopicAck; -import org.activemq.command.JournalTrace; -import org.activemq.command.JournalTransaction; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.memory.UsageListener; -import org.activemq.memory.UsageManager; -import org.activemq.openwire.OpenWireFormat; -import org.activemq.store.MessageStore; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.TopicMessageStore; -import org.activemq.store.TransactionStore; -import org.activemq.store.jdbc.JDBCPersistenceAdapter; -import org.activemq.store.journal.QuickJournalTransactionStore.Tx; -import org.activemq.store.journal.QuickJournalTransactionStore.TxOperation; -import org.activemq.thread.Scheduler; -import org.activemq.thread.Task; -import org.activemq.thread.TaskRunner; -import org.activemq.thread.TaskRunnerFactory; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.DataStructure; +import org.apache.activemq.command.JournalQueueAck; +import org.apache.activemq.command.JournalTopicAck; +import org.apache.activemq.command.JournalTrace; +import org.apache.activemq.command.JournalTransaction; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.memory.UsageListener; +import org.apache.activemq.memory.UsageManager; +import org.apache.activemq.openwire.OpenWireFormat; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.store.TransactionStore; +import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter; +import org.apache.activemq.store.journal.QuickJournalTransactionStore.Tx; +import org.apache.activemq.store.journal.QuickJournalTransactionStore.TxOperation; +import org.apache.activemq.thread.Scheduler; +import org.apache.activemq.thread.Task; +import org.apache.activemq.thread.TaskRunner; +import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.util.IOExceptionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -261,7 +261,7 @@ * The Journal give us a call back so that we can move old data out of the * journal. Taking a checkpoint does this for us. * - * @see org.activemq.journal.JournalEventListener#overflowNotification(org.activemq.journal.RecordLocation) + * @see org.apache.activemq.journal.JournalEventListener#overflowNotification(org.apache.activemq.journal.RecordLocation) */ public void overflowNotification(RecordLocation safeLocation) { checkpoint(false, true); Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTopicMessageStore.java Wed Dec 28 09:24:02 2005 @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.HashMap; import java.util.Iterator; import org.activeio.journal.RecordLocation; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQTopic; -import org.activemq.command.JournalTopicAck; -import org.activemq.command.Message; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.TopicMessageStore; -import org.activemq.transaction.Synchronization; -import org.activemq.util.Callback; -import org.activemq.util.SubscriptionKey; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.command.JournalTopicAck; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.transaction.Synchronization; +import org.apache.activemq.util.Callback; +import org.apache.activemq.util.SubscriptionKey; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTransactionStore.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTransactionStore.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTransactionStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalTransactionStore.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.journal; +package org.apache.activemq.store.journal; import java.io.IOException; import java.util.ArrayList; @@ -23,14 +23,14 @@ import javax.transaction.xa.XAException; import org.activeio.journal.RecordLocation; -import org.activemq.command.JournalTopicAck; -import org.activemq.command.JournalTransaction; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.TransactionId; -import org.activemq.command.XATransactionId; -import org.activemq.store.TransactionRecoveryListener; -import org.activemq.store.TransactionStore; +import org.apache.activemq.command.JournalTopicAck; +import org.apache.activemq.command.JournalTransaction; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.XATransactionId; +import org.apache.activemq.store.TransactionRecoveryListener; +import org.apache.activemq.store.TransactionStore; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; @@ -126,7 +126,7 @@ /** * @throws IOException - * @see org.activemq.store.TransactionStore#prepare(TransactionId) + * @see org.apache.activemq.store.TransactionStore#prepare(TransactionId) */ public void prepare(TransactionId txid) throws IOException { Tx tx = (Tx) inflightTransactions.remove(txid); @@ -138,7 +138,7 @@ /** * @throws IOException - * @see org.activemq.store.TransactionStore#prepare(TransactionId) + * @see org.apache.activemq.store.TransactionStore#prepare(TransactionId) */ public void replayPrepare(TransactionId txid) throws IOException { Tx tx = (Tx) inflightTransactions.remove(txid); @@ -158,7 +158,7 @@ /** * @throws XAException - * @see org.activemq.store.TransactionStore#commit(org.activemq.service.Transaction) + * @see org.apache.activemq.store.TransactionStore#commit(org.apache.activemq.service.Transaction) */ public void commit(TransactionId txid, boolean wasPrepared) throws IOException { Tx tx; @@ -182,7 +182,7 @@ /** * @throws XAException - * @see org.activemq.store.TransactionStore#commit(org.activemq.service.Transaction) + * @see org.apache.activemq.store.TransactionStore#commit(org.apache.activemq.service.Transaction) */ public Tx replayCommit(TransactionId txid, boolean wasPrepared) throws IOException { if (wasPrepared) { @@ -194,7 +194,7 @@ /** * @throws IOException - * @see org.activemq.store.TransactionStore#rollback(TransactionId) + * @see org.apache.activemq.store.TransactionStore#rollback(TransactionId) */ public void rollback(TransactionId txid) throws IOException { @@ -216,7 +216,7 @@ /** * @throws IOException - * @see org.activemq.store.TransactionStore#rollback(TransactionId) + * @see org.apache.activemq.store.TransactionStore#rollback(TransactionId) */ public void replayRollback(TransactionId txid) throws IOException { if (inflightTransactions.remove(txid) != null) Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryMessageStore.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.memory; +package org.apache.activemq.store.memory; import java.io.IOException; import java.util.Collections; @@ -22,16 +22,16 @@ import java.util.LinkedHashMap; import java.util.Map; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.MessageId; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.MessageStore; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.MessageStore; /** - * An implementation of {@link org.activemq.store.MessageStore} which uses a + * An implementation of {@link org.apache.activemq.store.MessageStore} which uses a * * @version $Revision: 1.7 $ */ Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryPersistenceAdapter.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.memory; +package org.apache.activemq.store.memory; import java.io.File; import java.io.IOException; @@ -22,13 +22,13 @@ import java.util.Iterator; import java.util.Set; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQQueue; -import org.activemq.command.ActiveMQTopic; -import org.activemq.store.MessageStore; -import org.activemq.store.PersistenceAdapter; -import org.activemq.store.TopicMessageStore; -import org.activemq.store.TransactionStore; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.command.ActiveMQTopic; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.PersistenceAdapter; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.store.TransactionStore; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.memory; +package org.apache.activemq.store.memory; import java.io.IOException; import java.util.Collections; @@ -24,14 +24,14 @@ import java.util.Map; import java.util.Map.Entry; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.ActiveMQDestination; -import org.activemq.command.Message; -import org.activemq.command.MessageId; -import org.activemq.command.SubscriptionInfo; -import org.activemq.store.MessageRecoveryListener; -import org.activemq.store.TopicMessageStore; -import org.activemq.util.SubscriptionKey; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.ActiveMQDestination; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageId; +import org.apache.activemq.command.SubscriptionInfo; +import org.apache.activemq.store.MessageRecoveryListener; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.util.SubscriptionKey; /** * @version $Revision: 1.5 $ @@ -83,7 +83,7 @@ } public void deleteSubscription(String clientId, String subscriptionName) { - org.activemq.util.SubscriptionKey key = new SubscriptionKey(clientId, subscriptionName); + org.apache.activemq.util.SubscriptionKey key = new SubscriptionKey(clientId, subscriptionName); ackDatabase.remove(key); subscriberDatabase.remove(key); } Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.store.memory; +package org.apache.activemq.store.memory; import java.io.IOException; import java.util.ArrayList; @@ -22,17 +22,17 @@ import javax.transaction.xa.XAException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.Message; -import org.activemq.command.MessageAck; -import org.activemq.command.TransactionId; -import org.activemq.command.XATransactionId; -import org.activemq.store.MessageStore; -import org.activemq.store.ProxyMessageStore; -import org.activemq.store.ProxyTopicMessageStore; -import org.activemq.store.TopicMessageStore; -import org.activemq.store.TransactionRecoveryListener; -import org.activemq.store.TransactionStore; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.Message; +import org.apache.activemq.command.MessageAck; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.XATransactionId; +import org.apache.activemq.store.MessageStore; +import org.apache.activemq.store.ProxyMessageStore; +import org.apache.activemq.store.ProxyTopicMessageStore; +import org.apache.activemq.store.TopicMessageStore; +import org.apache.activemq.store.TransactionRecoveryListener; +import org.apache.activemq.store.TransactionStore; import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap; @@ -134,7 +134,7 @@ } /** - * @see org.activemq.store.TransactionStore#prepare(TransactionId) + * @see org.apache.activemq.store.TransactionStore#prepare(TransactionId) */ public void prepare(TransactionId txid) { Tx tx = (Tx) inflightTransactions.remove(txid); @@ -154,7 +154,7 @@ /** * @throws XAException - * @see org.activemq.store.TransactionStore#commit(org.activemq.service.Transaction) + * @see org.apache.activemq.store.TransactionStore#commit(org.apache.activemq.service.Transaction) */ public void commit(TransactionId txid, boolean wasPrepared) throws IOException { @@ -172,7 +172,7 @@ } /** - * @see org.activemq.store.TransactionStore#rollback(TransactionId) + * @see org.apache.activemq.store.TransactionStore#rollback(TransactionId) */ public void rollback(TransactionId txid) { preparedTransactions.remove(txid); Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/DefaultThreadPools.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.thread; +package org.apache.activemq.thread; import edu.emory.mathcs.backport.java.util.concurrent.Executor; import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor; Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.thread; +package org.apache.activemq.thread; import java.util.HashMap; Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/SimpleTaskRunner.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/SimpleTaskRunner.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/SimpleTaskRunner.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/SimpleTaskRunner.java Wed Dec 28 09:24:02 2005 @@ -33,7 +33,7 @@ * **/ -package org.activemq.thread; +package org.apache.activemq.thread; import edu.emory.mathcs.backport.java.util.concurrent.Executor; Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Task.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Task.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Task.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Task.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.thread; +package org.apache.activemq.thread; /** * Represents a task that may take a few iterations to complete. Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunner.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunner.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunner.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunner.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.thread; +package org.apache.activemq.thread; /** * Allows you to request a thread execute the associated Task. Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/TaskRunnerFactory.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.thread; +package org.apache.activemq.thread; import edu.emory.mathcs.backport.java.util.concurrent.Executor; import edu.emory.mathcs.backport.java.util.concurrent.SynchronousQueue; Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Valve.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Valve.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Valve.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Valve.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.thread; +package org.apache.activemq.thread; /** * A Valve is a synchronization object used enable or disable the "flow" of concurrent Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/LocalTransaction.java Wed Dec 28 09:24:02 2005 @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transaction; +package org.apache.activemq.transaction; import java.io.IOException; import javax.transaction.xa.XAException; -import org.activemq.broker.ConnectionContext; -import org.activemq.command.LocalTransactionId; -import org.activemq.command.TransactionId; -import org.activemq.store.TransactionStore; +import org.apache.activemq.broker.ConnectionContext; +import org.apache.activemq.command.LocalTransactionId; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.store.TransactionStore; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Synchronization.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transaction; +package org.apache.activemq.transaction; /** * Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/Transaction.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transaction; +package org.apache.activemq.transaction; import java.io.IOException; import java.util.ArrayList; @@ -22,7 +22,7 @@ import javax.transaction.xa.XAException; -import org.activemq.command.TransactionId; +import org.apache.activemq.command.TransactionId; /** * Keeps track of all the actions the need to be done when Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/XATransaction.java URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/XATransaction.java?rev=359567&r1=359554&r2=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/XATransaction.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transaction/XATransaction.java Wed Dec 28 09:24:02 2005 @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transaction; +package org.apache.activemq.transaction; import java.io.IOException; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; -import org.activemq.broker.TransactionBroker; -import org.activemq.command.TransactionId; -import org.activemq.command.XATransactionId; -import org.activemq.store.TransactionStore; +import org.apache.activemq.broker.TransactionBroker; +import org.apache.activemq.command.TransactionId; +import org.apache.activemq.command.XATransactionId; +import org.apache.activemq.store.TransactionStore; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/CompositeTransport.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/transport/CompositeTransport.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/CompositeTransport.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/CompositeTransport.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/transport/CompositeTransport.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/transport/CompositeTransport.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/CompositeTransport.java Wed Dec 28 09:24:02 2005 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import java.net.URI; Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/transport/FutureResponse.java) URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/transport/FutureResponse.java&r1=359554&r2=359567&rev=359567&view=diff ============================================================================== --- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/transport/FutureResponse.java (original) +++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/FutureResponse.java Wed Dec 28 09:24:02 2005 @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.activemq.transport; +package org.apache.activemq.transport; import edu.emory.mathcs.backport.java.util.concurrent.Callable; import edu.emory.mathcs.backport.java.util.concurrent.ExecutionException; import edu.emory.mathcs.backport.java.util.concurrent.FutureTask; -import org.activemq.command.Response; -import org.activemq.util.IOExceptionSupport; +import org.apache.activemq.command.Response; +import org.apache.activemq.util.IOExceptionSupport; import java.io.IOException; import java.io.InterruptedIOException;