http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/StandaloneNamingServer.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/StandaloneNamingServer.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/StandaloneNamingServer.java index 7255e1e..2652990 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/StandaloneNamingServer.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/StandaloneNamingServer.java @@ -11,15 +11,15 @@ * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.impl; +package org.apache.activemq.jms.server.impl; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.apache.activemq6.core.server.ActivateCallback; -import org.apache.activemq6.core.server.HornetQComponent; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ActivateCallback; +import org.apache.activemq.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.HornetQServerLogger; import org.jnp.server.Main; import org.jnp.server.NamingBeanImpl;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSManagementService.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSManagementService.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSManagementService.java index a72fbbe..79c81d3 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSManagementService.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSManagementService.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.management; - -import org.apache.activemq6.api.jms.management.JMSServerControl; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQQueue; -import org.apache.activemq6.jms.client.HornetQTopic; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; +package org.apache.activemq.jms.server.management; + +import org.apache.activemq.api.jms.management.JMSServerControl; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQQueue; +import org.apache.activemq.jms.client.HornetQTopic; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSNotificationType.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSNotificationType.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSNotificationType.java index 3de5f3e..a2ed357 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSNotificationType.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/JMSNotificationType.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.management; +package org.apache.activemq.jms.server.management; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.management.NotificationType; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.management.NotificationType; public enum JMSNotificationType implements NotificationType { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/impl/JMSManagementServiceImpl.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/impl/JMSManagementServiceImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/impl/JMSManagementServiceImpl.java index ee29649..151a20d 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/impl/JMSManagementServiceImpl.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/management/impl/JMSManagementServiceImpl.java @@ -10,32 +10,32 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.management.impl; +package org.apache.activemq.jms.server.management.impl; import javax.management.ObjectName; -import org.apache.activemq6.api.core.management.AddressControl; -import org.apache.activemq6.api.core.management.QueueControl; -import org.apache.activemq6.api.core.management.ResourceNames; -import org.apache.activemq6.api.jms.management.ConnectionFactoryControl; -import org.apache.activemq6.api.jms.management.JMSQueueControl; -import org.apache.activemq6.api.jms.management.JMSServerControl; -import org.apache.activemq6.api.jms.management.TopicControl; -import org.apache.activemq6.core.messagecounter.MessageCounter; -import org.apache.activemq6.core.messagecounter.MessageCounterManager; -import org.apache.activemq6.core.server.HornetQServer; -import org.apache.activemq6.core.server.Queue; -import org.apache.activemq6.core.server.management.ManagementService; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; -import org.apache.activemq6.jms.client.HornetQQueue; -import org.apache.activemq6.jms.client.HornetQTopic; -import org.apache.activemq6.jms.management.impl.JMSConnectionFactoryControlImpl; -import org.apache.activemq6.jms.management.impl.JMSQueueControlImpl; -import org.apache.activemq6.jms.management.impl.JMSServerControlImpl; -import org.apache.activemq6.jms.management.impl.JMSTopicControlImpl; -import org.apache.activemq6.jms.server.JMSServerManager; -import org.apache.activemq6.jms.server.config.ConnectionFactoryConfiguration; -import org.apache.activemq6.jms.server.management.JMSManagementService; +import org.apache.activemq.api.core.management.AddressControl; +import org.apache.activemq.api.core.management.QueueControl; +import org.apache.activemq.api.core.management.ResourceNames; +import org.apache.activemq.api.jms.management.ConnectionFactoryControl; +import org.apache.activemq.api.jms.management.JMSQueueControl; +import org.apache.activemq.api.jms.management.JMSServerControl; +import org.apache.activemq.api.jms.management.TopicControl; +import org.apache.activemq.core.messagecounter.MessageCounter; +import org.apache.activemq.core.messagecounter.MessageCounterManager; +import org.apache.activemq.core.server.HornetQServer; +import org.apache.activemq.core.server.Queue; +import org.apache.activemq.core.server.management.ManagementService; +import org.apache.activemq.jms.client.HornetQConnectionFactory; +import org.apache.activemq.jms.client.HornetQQueue; +import org.apache.activemq.jms.client.HornetQTopic; +import org.apache.activemq.jms.management.impl.JMSConnectionFactoryControlImpl; +import org.apache.activemq.jms.management.impl.JMSQueueControlImpl; +import org.apache.activemq.jms.management.impl.JMSServerControlImpl; +import org.apache.activemq.jms.management.impl.JMSTopicControlImpl; +import org.apache.activemq.jms.server.JMSServerManager; +import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration; +import org.apache.activemq.jms.server.management.JMSManagementService; /* * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRecoveryRegistry.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRecoveryRegistry.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRecoveryRegistry.java index 094c4be..d9b5c86 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRecoveryRegistry.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRecoveryRegistry.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.recovery; +package org.apache.activemq.jms.server.recovery; import javax.transaction.xa.XAResource; import java.util.HashSet; @@ -18,9 +18,9 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.jms.server.HornetQJMSServerLogger; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.jms.server.HornetQJMSServerLogger; import org.jboss.tm.XAResourceRecovery; /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRegistryBase.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRegistryBase.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRegistryBase.java index a0b7f5e..c9381bb 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRegistryBase.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQRegistryBase.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.recovery; +package org.apache.activemq.jms.server.recovery; import java.util.concurrent.atomic.AtomicBoolean; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceRecovery.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceRecovery.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceRecovery.java index 2d37598..448e6b1 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceRecovery.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceRecovery.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.recovery; +package org.apache.activemq.jms.server.recovery; import javax.transaction.xa.XAResource; import java.util.HashMap; import java.util.Map; import com.arjuna.ats.jta.recovery.XAResourceRecovery; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.jms.server.HornetQJMSServerLogger; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.jms.server.HornetQJMSServerLogger; /** * A XAResourceRecovery instance that can be used to recover any JMS provider. @@ -29,19 +29,19 @@ import org.apache.activemq6.jms.server.HornetQJMSServerLogger; * To enable this add the following to the jbossts-properties file * <pre> * <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ1" - * value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory"/> + * value="org.apache.activemq.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory"/> * </pre> * <p> * you'll need something like this if the HornetQ Server is remote * <pre> * <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ2" - * value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445"/> + * value="org.apache.activemq.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445"/> * </pre> * <p> * you'll need something like this if the HornetQ Server is remote and has failover configured * <pre> * <property name="com.arjuna.ats.jta.recovery.XAResourceRecovery.HORNETQ2" - * value="org.apache.activemq6.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445;org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=5446"/> + * value="org.apache.activemq.jms.server.recovery.HornetQXAResourceRecovery;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=5445;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=5446"/> * </pre> * * @author <a href="mailto:[email protected]";>Tim Fox</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceWrapper.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceWrapper.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceWrapper.java index c818362..fbcc8aa 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceWrapper.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/HornetQXAResourceWrapper.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.recovery; +package org.apache.activemq.jms.server.recovery; import java.util.Arrays; @@ -18,15 +18,15 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.HornetQNotConnectedException; -import org.apache.activemq6.api.core.client.ClientSession; -import org.apache.activemq6.api.core.client.ClientSessionFactory; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.client.SessionFailureListener; -import org.apache.activemq6.jms.server.HornetQJMSServerLogger; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.HornetQNotConnectedException; +import org.apache.activemq.api.core.client.ClientSession; +import org.apache.activemq.api.core.client.ClientSessionFactory; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.client.SessionFailureListener; +import org.apache.activemq.jms.server.HornetQJMSServerLogger; /** * XAResourceWrapper. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/RecoveryDiscovery.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/RecoveryDiscovery.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/RecoveryDiscovery.java index 4291a53..d1cce42 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/RecoveryDiscovery.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/RecoveryDiscovery.java @@ -10,20 +10,20 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.recovery; +package org.apache.activemq.jms.server.recovery; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.ClusterTopologyListener; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.api.core.client.SessionFailureListener; -import org.apache.activemq6.api.core.client.TopologyMember; -import org.apache.activemq6.core.client.impl.ClientSessionFactoryInternal; -import org.apache.activemq6.jms.server.HornetQJMSServerLogger; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.ClusterTopologyListener; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.api.core.client.SessionFailureListener; +import org.apache.activemq.api.core.client.TopologyMember; +import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; +import org.apache.activemq.jms.server.HornetQJMSServerLogger; /** * <p>This class will have a simple Connection Factory and will listen http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/XARecoveryConfig.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/XARecoveryConfig.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/XARecoveryConfig.java index 7319f2b..6c00917 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/XARecoveryConfig.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/XARecoveryConfig.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.server.recovery; +package org.apache.activemq.jms.server.recovery; import java.util.Arrays; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.api.core.client.ServerLocator; -import org.apache.activemq6.jms.client.HornetQConnectionFactory; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.api.core.client.ServerLocator; +import org.apache.activemq.jms.client.HornetQConnectionFactory; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/package-info.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/package-info.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/package-info.java index efcf98a..7d0ae6e 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/package-info.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/recovery/package-info.java @@ -18,5 +18,5 @@ * III - For each topology member found on the DiscoveryUnits, the RegistryBase will registry a HornetQResourceRecovery * that will exist per server */ -package org.apache.activemq6.jms.server.recovery; +package org.apache.activemq.jms.server.recovery; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java index d3ef9b1..31809a2 100644 --- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java +++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/transaction/JMSTransactionDetail.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.jms.transaction; +package org.apache.activemq.jms.transaction; import java.util.Map; import javax.transaction.xa.Xid; -import org.apache.activemq6.core.server.ServerMessage; -import org.apache.activemq6.core.transaction.Transaction; -import org.apache.activemq6.core.transaction.TransactionDetail; -import org.apache.activemq6.jms.client.HornetQBytesMessage; -import org.apache.activemq6.jms.client.HornetQMapMessage; -import org.apache.activemq6.jms.client.HornetQMessage; -import org.apache.activemq6.jms.client.HornetQObjectMessage; -import org.apache.activemq6.jms.client.HornetQStreamMessage; -import org.apache.activemq6.jms.client.HornetQTextMessage; +import org.apache.activemq.core.server.ServerMessage; +import org.apache.activemq.core.transaction.Transaction; +import org.apache.activemq.core.transaction.TransactionDetail; +import org.apache.activemq.jms.client.HornetQBytesMessage; +import org.apache.activemq.jms.client.HornetQMapMessage; +import org.apache.activemq.jms.client.HornetQMessage; +import org.apache.activemq.jms.client.HornetQObjectMessage; +import org.apache.activemq.jms.client.HornetQStreamMessage; +import org.apache.activemq.jms.client.HornetQTextMessage; /** * A JMSTransactionDetail http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd ---------------------------------------------------------------------- diff --git a/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd b/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd index 781f93c..c12a257 100644 --- a/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd +++ b/activemq-jms-server/src/main/resources/schema/hornetq-jms.xsd @@ -3,7 +3,7 @@ <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"; targetNamespace="urn:hornetq" xmlns="urn:hornetq" - xmlns:hq="urn:org.apache.activemq6" + xmlns:hq="urn:org.apache.activemq" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0"> @@ -11,7 +11,7 @@ <xsd:element name="configuration" hq:schema="hornetq-jms-configuration"> <xsd:complexType> <xsd:sequence> - <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq6" + <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq" minOccurs="0" maxOccurs="1"/> <xsd:element ref="connection-factory" maxOccurs="unbounded" minOccurs="0"/> <xsd:choice maxOccurs="unbounded" minOccurs="0"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-journal/pom.xml b/activemq-journal/pom.xml index e1274ca..a0ec4b2 100644 --- a/activemq-journal/pom.xml +++ b/activemq-journal/pom.xml @@ -3,12 +3,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-pom</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-pom</artifactId> <version>6.0.0-SNAPSHOT</version> </parent> - <artifactId>activemq6-journal</artifactId> + <artifactId>activemq-journal</artifactId> <packaging>jar</packaging> <name>ActiveMQ6 Journal</name> @@ -35,13 +35,13 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-commons</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-commons</artifactId> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.activemq6</groupId> - <artifactId>activemq6-native</artifactId> + <groupId>org.apache.activemq</groupId> + <artifactId>activemq-native</artifactId> <version>${project.version}</version> </dependency> <!-- needed to compile the tests --> @@ -73,7 +73,7 @@ <maxmemory>512m</maxmemory> <quiet>false</quiet> <aggregate>true</aggregate> - <excludePackageNames>org.apache.activemq6.core:org.apache.activemq6.utils</excludePackageNames> + <excludePackageNames>org.apache.activemq.core:org.apache.activemq.utils</excludePackageNames> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AIOCallback.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AIOCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AIOCallback.java index d92fedb..c24f5ce 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AIOCallback.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AIOCallback.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.asyncio; +package org.apache.activemq.core.asyncio; /** * The interface used for AIO Callbacks. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java index fad8661..8a12a99 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/AsynchronousFile.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.asyncio; +package org.apache.activemq.core.asyncio; import java.nio.ByteBuffer; -import org.apache.activemq6.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQException; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/BufferCallback.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/BufferCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/BufferCallback.java index 189fb40..4701e55 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/BufferCallback.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/BufferCallback.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.asyncio; +package org.apache.activemq.core.asyncio; import java.nio.ByteBuffer; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/IOExceptionListener.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/IOExceptionListener.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/IOExceptionListener.java index 892c1d0..767957b 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/IOExceptionListener.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/IOExceptionListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.asyncio; +package org.apache.activemq.core.asyncio; /** * A IOExceptionListener http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java index 9ee4b0a..8e94f1e 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/AsynchronousFileImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.asyncio.impl; +package org.apache.activemq.core.asyncio.impl; import java.nio.ByteBuffer; import java.nio.channels.FileLock; @@ -24,15 +24,15 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.core.asyncio.AIOCallback; -import org.apache.activemq6.core.asyncio.AsynchronousFile; -import org.apache.activemq6.core.asyncio.BufferCallback; -import org.apache.activemq6.core.asyncio.IOExceptionListener; -import org.apache.activemq6.core.libaio.Native; -import org.apache.activemq6.journal.HornetQJournalLogger; -import org.apache.activemq6.utils.ReusableLatch; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.core.asyncio.AIOCallback; +import org.apache.activemq.core.asyncio.AsynchronousFile; +import org.apache.activemq.core.asyncio.BufferCallback; +import org.apache.activemq.core.asyncio.IOExceptionListener; +import org.apache.activemq.core.libaio.Native; +import org.apache.activemq.journal.HornetQJournalLogger; +import org.apache.activemq.utils.ReusableLatch; /** * AsynchronousFile implementation http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/HornetQFileLock.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/HornetQFileLock.java b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/HornetQFileLock.java index ba2514a..94546ce 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/HornetQFileLock.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/asyncio/impl/HornetQFileLock.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.asyncio.impl; +package org.apache.activemq.core.asyncio.impl; import java.io.IOException; import java.nio.channels.FileChannel; import java.nio.channels.FileLock; -import org.apache.activemq6.core.libaio.Native; +import org.apache.activemq.core.libaio.Native; /** * A HornetQFileLock http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java index f531434..a6f8d9b 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/EncodingSupport.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal; +package org.apache.activemq.core.journal; -import org.apache.activemq6.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffer; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOAsyncTask.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOAsyncTask.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOAsyncTask.java index e130481..12587d8 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOAsyncTask.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOAsyncTask.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal; +package org.apache.activemq.core.journal; -import org.apache.activemq6.core.asyncio.AIOCallback; +import org.apache.activemq.core.asyncio.AIOCallback; /** * * This class is just a direct extension of AIOCallback. - * Just to avoid the direct dependency of org.apache.activemq6.core.asynciio.AIOCallback from the journal. + * Just to avoid the direct dependency of org.apache.activemq.core.asynciio.AIOCallback from the journal. * * @author <a href="mailto:[email protected]";>Clebert Suconic</a> * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCompletion.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCompletion.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCompletion.java index f1d5915..77387df 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCompletion.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCompletion.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal; +package org.apache.activemq.core.journal; /** * A IOCompletion http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCriticalErrorListener.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCriticalErrorListener.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCriticalErrorListener.java index fba45e8..fc209d0 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCriticalErrorListener.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/IOCriticalErrorListener.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal; +package org.apache.activemq.core.journal; /** * A IOCriticalErrorListener http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java index 85c65e9..c311f70 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/Journal.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal; +package org.apache.activemq.core.journal; import java.util.List; import java.util.Map; -import org.apache.activemq6.core.journal.impl.JournalFile; -import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq.core.journal.impl.JournalFile; +import org.apache.activemq.core.server.HornetQComponent; /** * Most methods on the journal provide a blocking version where you select the sync mode and a non @@ -26,7 +26,7 @@ import org.apache.activemq6.core.server.HornetQComponent; * make sense on the NIO operations. * @author <a href="mailto:[email protected]";>Tim Fox</a> * @author <a href="mailto:[email protected]";>Clebert Suconic</a> - * @see org.apache.activemq6.utils.IDGenerator + * @see org.apache.activemq.utils.IDGenerator */ public interface Journal extends HornetQComponent { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/JournalLoadInformation.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/JournalLoadInformation.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/JournalLoadInformation.java index ed1b18d..0475490 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/JournalLoadInformation.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/JournalLoadInformation.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal; +package org.apache.activemq.core.journal; /** * This is a POJO containing information about the journal during load time. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/LoaderCallback.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/LoaderCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/LoaderCallback.java index 3d1c156..54d62f2 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/LoaderCallback.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/LoaderCallback.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal; +package org.apache.activemq.core.journal; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/PreparedTransactionInfo.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/PreparedTransactionInfo.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/PreparedTransactionInfo.java index 9ae3eb0..c1f6a51 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/PreparedTransactionInfo.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/PreparedTransactionInfo.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal; +package org.apache.activemq.core.journal; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/RecordInfo.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/RecordInfo.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/RecordInfo.java index fb78b24..1bf0067 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/RecordInfo.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/RecordInfo.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal; +package org.apache.activemq.core.journal; /** * A RecordInfo http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java index 94cdfb3..7c8048d 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFile.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal; +package org.apache.activemq.core.journal; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.core.journal.impl.TimedBuffer; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.core.journal.impl.TimedBuffer; /** * A SequentialFile http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFileFactory.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFileFactory.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFileFactory.java index 0492641..c9a2a3c 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFileFactory.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/SequentialFileFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal; +package org.apache.activemq.core.journal; import java.nio.ByteBuffer; import java.util.List; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/TestableJournal.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/TestableJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/TestableJournal.java index 8f578bb..690b248 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/TestableJournal.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/TestableJournal.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal; +package org.apache.activemq.core.journal; -import org.apache.activemq6.core.journal.impl.JournalFile; +import org.apache.activemq.core.journal.impl.JournalFile; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/TransactionFailureCallback.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/TransactionFailureCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/TransactionFailureCallback.java index 09d66d6..ddbff2c 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/TransactionFailureCallback.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/TransactionFailureCallback.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal; +package org.apache.activemq.core.journal; import java.util.List; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java index 11236c7..e18b845 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFile.java @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; import java.util.concurrent.Executor; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.core.asyncio.AsynchronousFile; -import org.apache.activemq6.core.asyncio.BufferCallback; -import org.apache.activemq6.core.asyncio.IOExceptionListener; -import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.core.asyncio.AsynchronousFile; +import org.apache.activemq.core.asyncio.BufferCallback; +import org.apache.activemq.core.asyncio.IOExceptionListener; +import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java index eb46fd3..a2f9e7e 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AIOSequentialFileFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.nio.ByteBuffer; import java.security.AccessController; @@ -20,14 +20,14 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.HornetQInterruptedException; -import org.apache.activemq6.core.asyncio.BufferCallback; -import org.apache.activemq6.core.asyncio.impl.AsynchronousFileImpl; -import org.apache.activemq6.core.journal.IOCriticalErrorListener; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.libaio.Native; -import org.apache.activemq6.journal.HornetQJournalLogger; -import org.apache.activemq6.utils.HornetQThreadFactory; +import org.apache.activemq.api.core.HornetQInterruptedException; +import org.apache.activemq.core.asyncio.BufferCallback; +import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; +import org.apache.activemq.core.journal.IOCriticalErrorListener; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.libaio.Native; +import org.apache.activemq.journal.HornetQJournalLogger; +import org.apache.activemq.utils.HornetQThreadFactory; /** * A AIOSequentialFileFactory @@ -168,7 +168,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor } /* (non-Javadoc) - * @see org.apache.activemq6.core.journal.SequentialFileFactory#releaseBuffer(java.nio.ByteBuffer) + * @see org.apache.activemq.core.journal.SequentialFileFactory#releaseBuffer(java.nio.ByteBuffer) */ @Override public synchronized void releaseBuffer(final ByteBuffer buffer) @@ -226,7 +226,7 @@ public final class AIOSequentialFileFactory extends AbstractSequentialFileFactor private volatile long bufferReuseLastTime = System.currentTimeMillis(); /** - * This queue is fed by {@link org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory.ReuseBuffersController.LocalBufferCallback} + * This queue is fed by {@link org.apache.activemq.core.journal.impl.AIOSequentialFileFactory.ReuseBuffersController.LocalBufferCallback} * which is called directly by NIO or NIO. On the case of the AIO this is almost called by the native layer as * soon as the buffer is not being used any more and ready to be reused or GCed */ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java index 54ab464..18d7b9b 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractJournalUpdateTask.java @@ -10,22 +10,22 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.dataformat.ByteArrayEncoding; -import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecord; -import org.apache.activemq6.core.journal.impl.dataformat.JournalInternalRecord; -import org.apache.activemq6.utils.ConcurrentHashSet; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecord; +import org.apache.activemq.core.journal.impl.dataformat.JournalInternalRecord; +import org.apache.activemq.utils.ConcurrentHashSet; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java index 1f4362a..bbfd626 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFile.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.io.File; import java.io.IOException; @@ -21,16 +21,16 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQIOErrorException; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.journal.HornetQJournalBundle; -import org.apache.activemq6.journal.HornetQJournalLogger; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQIOErrorException; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.journal.HornetQJournalBundle; +import org.apache.activemq.journal.HornetQJournalLogger; /** * A AbstractSequentialFile http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java index 4a4c8f2..312ab31 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/AbstractSequentialFileFactory.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.io.File; import java.io.FilenameFilter; @@ -24,12 +24,12 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.HornetQInterruptedException; -import org.apache.activemq6.core.journal.IOCriticalErrorListener; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.journal.HornetQJournalLogger; -import org.apache.activemq6.utils.HornetQThreadFactory; +import org.apache.activemq.api.core.HornetQInterruptedException; +import org.apache.activemq.core.journal.IOCriticalErrorListener; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.journal.HornetQJournalLogger; +import org.apache.activemq.utils.HornetQThreadFactory; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java index 849219a..c2d68ab 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/CompactJournal.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; -import org.apache.activemq6.core.journal.IOCriticalErrorListener; +import org.apache.activemq.core.journal.IOCriticalErrorListener; /** * This is an undocumented class, that will open a journal and force compacting on it. @@ -29,7 +29,7 @@ public final class CompactJournal // NO_UCD { if (arg.length != 4) { - System.err.println("Use: java -cp hornetq-core.jar org.apache.activemq6.core.journal.impl.CompactJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize>"); + System.err.println("Use: java -cp hornetq-core.jar org.apache.activemq.core.journal.impl.CompactJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize>"); return; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java index c2eaabed..d0e3fb5 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/DummyCallback.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; -import org.apache.activemq6.journal.HornetQJournalLogger; +import org.apache.activemq.journal.HornetQJournalLogger; /** * A DummyCallback http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ExportJournal.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ExportJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ExportJournal.java index aaad661..87ff658 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ExportJournal.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ExportJournal.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.io.BufferedOutputStream; import java.io.File; @@ -18,16 +18,16 @@ import java.io.FileOutputStream; import java.io.PrintStream; import java.util.List; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.utils.Base64; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.utils.Base64; /** * Use this class to export the journal data. You can use it as a main class or through its native method {@link ExportJournal#exportJournal(String, String, String, int, int, String)} * * If you use the main method, use it as <JournalDirectory> <JournalPrefix> <FileExtension> <MinFiles> <FileSize> <FileOutput> * - * Example: java -cp hornetq-core.jar org.apache.activemq6.core.journal.impl.ExportJournal /journalDir hornetq-data hq 2 10485760 /tmp/export.dat + * Example: java -cp hornetq-core.jar org.apache.activemq.core.journal.impl.ExportJournal /journalDir hornetq-data hq 2 10485760 /tmp/export.dat * * @author <a href="mailto:[email protected]";>Clebert Suconic</a> * @@ -50,7 +50,7 @@ public class ExportJournal { if (arg.length != 5) { - System.err.println("Use: java -cp hornetq-core.jar org.apache.activemq6.core.journal.impl.ExportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileOutput>"); + System.err.println("Use: java -cp hornetq-core.jar org.apache.activemq.core.journal.impl.ExportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileOutput>"); return; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java index c7eb8e0..21e7241 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/FileWrapperJournal.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.util.List; import java.util.Map; @@ -19,24 +19,24 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.HornetQUnsupportedPacketException; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.journal.IOCompletion; -import org.apache.activemq6.core.journal.Journal; -import org.apache.activemq6.core.journal.JournalLoadInformation; -import org.apache.activemq6.core.journal.LoaderCallback; -import org.apache.activemq6.core.journal.PreparedTransactionInfo; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.TransactionFailureCallback; -import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecord; -import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecordTX; -import org.apache.activemq6.core.journal.impl.dataformat.JournalCompleteRecordTX; -import org.apache.activemq6.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; -import org.apache.activemq6.core.journal.impl.dataformat.JournalDeleteRecord; -import org.apache.activemq6.core.journal.impl.dataformat.JournalDeleteRecordTX; -import org.apache.activemq6.core.journal.impl.dataformat.JournalInternalRecord; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.HornetQUnsupportedPacketException; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.journal.IOCompletion; +import org.apache.activemq.core.journal.Journal; +import org.apache.activemq.core.journal.JournalLoadInformation; +import org.apache.activemq.core.journal.LoaderCallback; +import org.apache.activemq.core.journal.PreparedTransactionInfo; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.TransactionFailureCallback; +import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecord; +import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecordTX; +import org.apache.activemq.core.journal.impl.dataformat.JournalCompleteRecordTX; +import org.apache.activemq.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; +import org.apache.activemq.core.journal.impl.dataformat.JournalDeleteRecord; +import org.apache.activemq.core.journal.impl.dataformat.JournalDeleteRecordTX; +import org.apache.activemq.core.journal.impl.dataformat.JournalInternalRecord; /** * Journal used at a replicating backup server during the synchronization of data with the 'live' http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ImportJournal.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ImportJournal.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ImportJournal.java index 314fb94..d845e47 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ImportJournal.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/ImportJournal.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.io.BufferedReader; import java.io.File; @@ -23,8 +23,8 @@ import java.util.Map; import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.utils.Base64; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.utils.Base64; /** * Use this class to import the journal data from a listed file. You can use it as a main class or @@ -40,7 +40,7 @@ import org.apache.activemq6.utils.Base64; * Example: * * <pre> - * java -cp hornetq-core.jar org.apache.activemq6.core.journal.impl.ExportJournal /journalDir hornetq-data hq 2 10485760 /tmp/export.dat + * java -cp hornetq-core.jar org.apache.activemq.core.journal.impl.ExportJournal /journalDir hornetq-data hq 2 10485760 /tmp/export.dat * </pre> * @author <a href="mailto:[email protected]";>Clebert Suconic</a> */ @@ -61,7 +61,7 @@ public class ImportJournal { if (arg.length != 5) { - System.err.println("Use: java -cp hornetq-core.jar:netty.jar org.apache.activemq6.core.journal.impl.ImportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileOutput>"); + System.err.println("Use: java -cp hornetq-core.jar:netty.jar org.apache.activemq.core.journal.impl.ImportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileOutput>"); return; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java index 04e5a22..d746719 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalBase.java @@ -10,13 +10,13 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.journal.IOCompletion; -import org.apache.activemq6.core.journal.Journal; -import org.apache.activemq6.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.journal.IOCompletion; +import org.apache.activemq.core.journal.Journal; +import org.apache.activemq.core.journal.impl.dataformat.ByteArrayEncoding; abstract class JournalBase implements Journal { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java index 4fa1020..0ff4c14 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalCompactor.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.util.ArrayList; import java.util.HashMap; @@ -20,21 +20,21 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.impl.dataformat.ByteArrayEncoding; -import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecord; -import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecordTX; -import org.apache.activemq6.core.journal.impl.dataformat.JournalCompleteRecordTX; -import org.apache.activemq6.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; -import org.apache.activemq6.core.journal.impl.dataformat.JournalDeleteRecordTX; -import org.apache.activemq6.core.journal.impl.dataformat.JournalInternalRecord; -import org.apache.activemq6.core.journal.impl.dataformat.JournalRollbackRecordTX; -import org.apache.activemq6.journal.HornetQJournalLogger; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecord; +import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecordTX; +import org.apache.activemq.core.journal.impl.dataformat.JournalCompleteRecordTX; +import org.apache.activemq.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; +import org.apache.activemq.core.journal.impl.dataformat.JournalDeleteRecordTX; +import org.apache.activemq.core.journal.impl.dataformat.JournalInternalRecord; +import org.apache.activemq.core.journal.impl.dataformat.JournalRollbackRecordTX; +import org.apache.activemq.journal.HornetQJournalLogger; /** * A JournalCompactor http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalConstants.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalConstants.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalConstants.java index 1b5ab65..c5bf215 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalConstants.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalConstants.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; public final class JournalConstants { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFile.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFile.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFile.java index 87f3dbe..fdf9168 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFile.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFile.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; -import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFile; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFileImpl.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFileImpl.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFileImpl.java index 8aeee12..eced04c 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFileImpl.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFileImpl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFile; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java index 56ab68f..81b31eb 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalFilesRepository.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.security.AccessController; import java.security.PrivilegedActionException; @@ -27,9 +27,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.journal.HornetQJournalLogger; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.journal.HornetQJournalLogger; /** * This is a helper class for the Journal, which will control access to dataFiles, openedFiles and freeFiles http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java index b54b004..46fe900 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalImpl.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.io.Serializable; import java.nio.ByteBuffer; @@ -39,33 +39,33 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq6.api.core.HornetQBuffer; -import org.apache.activemq6.api.core.HornetQBuffers; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.core.journal.EncodingSupport; -import org.apache.activemq6.core.journal.IOAsyncTask; -import org.apache.activemq6.core.journal.IOCompletion; -import org.apache.activemq6.core.journal.JournalLoadInformation; -import org.apache.activemq6.core.journal.LoaderCallback; -import org.apache.activemq6.core.journal.PreparedTransactionInfo; -import org.apache.activemq6.core.journal.RecordInfo; -import org.apache.activemq6.core.journal.SequentialFile; -import org.apache.activemq6.core.journal.SequentialFileFactory; -import org.apache.activemq6.core.journal.TestableJournal; -import org.apache.activemq6.core.journal.TransactionFailureCallback; -import org.apache.activemq6.core.journal.impl.dataformat.ByteArrayEncoding; -import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecord; -import org.apache.activemq6.core.journal.impl.dataformat.JournalAddRecordTX; -import org.apache.activemq6.core.journal.impl.dataformat.JournalCompleteRecordTX; -import org.apache.activemq6.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; -import org.apache.activemq6.core.journal.impl.dataformat.JournalDeleteRecord; -import org.apache.activemq6.core.journal.impl.dataformat.JournalDeleteRecordTX; -import org.apache.activemq6.core.journal.impl.dataformat.JournalInternalRecord; -import org.apache.activemq6.core.journal.impl.dataformat.JournalRollbackRecordTX; -import org.apache.activemq6.journal.HornetQJournalBundle; -import org.apache.activemq6.journal.HornetQJournalLogger; -import org.apache.activemq6.utils.ConcurrentHashSet; -import org.apache.activemq6.utils.DataConstants; +import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.HornetQBuffers; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.core.journal.EncodingSupport; +import org.apache.activemq.core.journal.IOAsyncTask; +import org.apache.activemq.core.journal.IOCompletion; +import org.apache.activemq.core.journal.JournalLoadInformation; +import org.apache.activemq.core.journal.LoaderCallback; +import org.apache.activemq.core.journal.PreparedTransactionInfo; +import org.apache.activemq.core.journal.RecordInfo; +import org.apache.activemq.core.journal.SequentialFile; +import org.apache.activemq.core.journal.SequentialFileFactory; +import org.apache.activemq.core.journal.TestableJournal; +import org.apache.activemq.core.journal.TransactionFailureCallback; +import org.apache.activemq.core.journal.impl.dataformat.ByteArrayEncoding; +import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecord; +import org.apache.activemq.core.journal.impl.dataformat.JournalAddRecordTX; +import org.apache.activemq.core.journal.impl.dataformat.JournalCompleteRecordTX; +import org.apache.activemq.core.journal.impl.dataformat.JournalCompleteRecordTX.TX_RECORD_TYPE; +import org.apache.activemq.core.journal.impl.dataformat.JournalDeleteRecord; +import org.apache.activemq.core.journal.impl.dataformat.JournalDeleteRecordTX; +import org.apache.activemq.core.journal.impl.dataformat.JournalInternalRecord; +import org.apache.activemq.core.journal.impl.dataformat.JournalRollbackRecordTX; +import org.apache.activemq.journal.HornetQJournalBundle; +import org.apache.activemq.journal.HornetQJournalLogger; +import org.apache.activemq.utils.ConcurrentHashSet; +import org.apache.activemq.utils.DataConstants; /** * <p>A circular log implementation.</p http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallback.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallback.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallback.java index 2cd5efe..19b238e 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallback.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallback.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; -import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq.core.journal.RecordInfo; /** * A JournalReader http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallbackAbstract.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallbackAbstract.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallbackAbstract.java index fdd50bd..1e1aa91 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallbackAbstract.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalReaderCallbackAbstract.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; -import org.apache.activemq6.core.journal.RecordInfo; +import org.apache.activemq.core.journal.RecordInfo; /** * A JournalReaderCallbackAbstract http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecord.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecord.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecord.java index 414f01d..8ffb579 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecord.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecord.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.util.ArrayList; import java.util.List; -import org.apache.activemq6.api.core.Pair; +import org.apache.activemq.api.core.Pair; /** * This holds the relationship a record has with other files in regard to reference counting. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecordProvider.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecordProvider.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecordProvider.java index e72fe49..a5174aa 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecordProvider.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalRecordProvider.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java ---------------------------------------------------------------------- diff --git a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java index a5dadbc..c049a43 100644 --- a/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java +++ b/activemq-journal/src/main/java/org/apache/activemq/core/journal/impl/JournalTransaction.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.journal.impl; +package org.apache.activemq.core.journal.impl; import java.util.ArrayList; import java.util.HashMap; @@ -20,8 +20,8 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq6.api.core.HornetQExceptionType; -import org.apache.activemq6.core.journal.impl.dataformat.JournalInternalRecord; +import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.core.journal.impl.dataformat.JournalInternalRecord; /** * A JournalTransaction
