http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java ---------------------------------------------------------------------- diff --git a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java b/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java index 409741d..03a6bd6 100644 --- a/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java +++ b/activemq-tools/src/main/java/org/apache/activemq/tools/XmlDataExporter.java @@ -33,9 +33,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -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.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffers; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.Pair; import org.apache.activemq.api.core.SimpleString; @@ -251,7 +251,7 @@ public final class XmlDataExporter { byte[] data = info.data; - HornetQBuffer buff = HornetQBuffers.wrappedBuffer(data); + ActiveMQBuffer buff = ActiveMQBuffers.wrappedBuffer(data); Object o = DescribeJournal.newObjectEncoding(info, storageManager); if (info.getUserRecordType() == JournalRecordIds.ADD_MESSAGE) @@ -369,7 +369,7 @@ public final class XmlDataExporter { long id = record.id; - HornetQBuffer buffer = HornetQBuffers.wrappedBuffer(record.data); + ActiveMQBuffer buffer = ActiveMQBuffers.wrappedBuffer(record.data); byte rec = record.getUserRecordType(); @@ -898,14 +898,14 @@ public final class XmlDataExporter { bufferSize = remainder; } - HornetQBuffer buffer = HornetQBuffers.fixedBuffer(bufferSize.intValue()); + ActiveMQBuffer buffer = ActiveMQBuffers.fixedBuffer(bufferSize.intValue()); encoder.encode(buffer, bufferSize.intValue()); xmlWriter.writeCData(encode(buffer.toByteBuffer().array())); totalBytesWritten += bufferSize; } encoder.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { e.printStackTrace(); } @@ -917,7 +917,7 @@ public final class XmlDataExporter { encoder.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { e.printStackTrace(); }
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq6-native/bin/libHornetQAIO32.so ---------------------------------------------------------------------- diff --git a/activemq6-native/bin/libHornetQAIO32.so b/activemq6-native/bin/libHornetQAIO32.so deleted file mode 100755 index 15d4b47..0000000 Binary files a/activemq6-native/bin/libHornetQAIO32.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq6-native/bin/libHornetQAIO64.so ---------------------------------------------------------------------- diff --git a/activemq6-native/bin/libHornetQAIO64.so b/activemq6-native/bin/libHornetQAIO64.so deleted file mode 100755 index a86fdd3..0000000 Binary files a/activemq6-native/bin/libHornetQAIO64.so and /dev/null differ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/docs/user-manual/en/ha.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/ha.xml b/docs/user-manual/en/ha.xml index f6772f4..b1f3557 100644 --- a/docs/user-manual/en/ha.xml +++ b/docs/user-manual/en/ha.xml @@ -841,14 +841,14 @@ <para>To prevent this, HornetQ will unblock any blocking calls that were in progress at the time of failover by making them throw a <literal >javax.jms.JMSException</literal> (if using JMS), or a <literal - >HornetQException</literal> with error code <literal - >HornetQException.UNBLOCKED</literal>. It is up to the client code to catch + >ActiveMQException</literal> with error code <literal + >ActiveMQException.UNBLOCKED</literal>. It is up to the client code to catch this exception and retry any operations if desired.</para> <para>If the method being unblocked is a call to commit(), or prepare(), then the transaction will be automatically rolled back and HornetQ will throw a <literal >javax.jms.TransactionRolledBackException</literal> (if using JMS), or a - <literal>HornetQException</literal> with error code <literal - >HornetQException.TRANSACTION_ROLLED_BACK</literal> if using the core + <literal>ActiveMQException</literal> with error code <literal + >ActiveMQException.TRANSACTION_ROLLED_BACK</literal> if using the core API.</para> </section> <section id="ha.automatic.failover.transactions"> @@ -859,8 +859,8 @@ <para>Consequently the transaction will be marked as rollback-only, and any subsequent attempt to commit it will throw a <literal >javax.jms.TransactionRolledBackException</literal> (if using JMS), or a - <literal>HornetQException</literal> with error code <literal - >HornetQException.TRANSACTION_ROLLED_BACK</literal> if using the core + <literal>ActiveMQException</literal> with error code <literal + >ActiveMQException.TRANSACTION_ROLLED_BACK</literal> if using the core API.</para> <warning> <title>2 phase commit</title> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/docs/user-manual/en/intercepting-operations.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/intercepting-operations.xml b/docs/user-manual/en/intercepting-operations.xml index e09cd3c..f874230 100644 --- a/docs/user-manual/en/intercepting-operations.xml +++ b/docs/user-manual/en/intercepting-operations.xml @@ -39,7 +39,7 @@ package org.apache.activemq.api.core.interceptor; public interface Interceptor { - boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException; + boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException; }</programlisting> <para>The returned boolean value is important:</para> <itemizedlist> @@ -79,7 +79,7 @@ public interface Interceptor packet is aborted which means that no other interceptors are be called and the packet is not be processed further by the client. Typically this process happens transparently to the client (i.e. it has no idea if a packet was aborted or not). However, in the case of an outgoing packet - that is sent in a <literal>blocking</literal> fashion a <literal>HornetQException</literal> will + that is sent in a <literal>blocking</literal> fashion a <literal>ActiveMQException</literal> will be thrown to the caller. The exception is thrown because blocking sends provide reliability and it is considered an error for them not to succeed. <literal>Blocking</literal> sends occurs when, for example, an application invokes <literal>setBlockOnNonDurableSend(true)</literal> or @@ -87,7 +87,7 @@ public interface Interceptor application is using a JMS connection factory retrieved from JNDI that has either <literal>block-on-durable-send</literal> or <literal>block-on-non-durable-send</literal> set to <literal>true</literal>. Blocking is also used for packets dealing with transactions (e.g. - commit, roll-back, etc.). The <literal>HornetQException</literal> thrown will contain the name + commit, roll-back, etc.). The <literal>ActiveMQException</literal> thrown will contain the name of the interceptor that returned false.</para> <para>As on the server, the client interceptor classes (and their dependencies) must be added to the classpath to be properly instantiated and invoked.</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/docs/user-manual/zh/ha.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/ha.xml b/docs/user-manual/zh/ha.xml index ec954bb..d86c8fc 100644 --- a/docs/user-manual/zh/ha.xml +++ b/docs/user-manual/zh/ha.xml @@ -218,13 +218,13 @@ å æ¤å®¢æ·ç«¯å¯è½æ°¸è¿ä¹ä¸ä¼å¾å°ååºï¼ä¹å°±å¯è½ä¸ç´é»å¡å¨é£éã</para> <para>为äºé²æ¢è¿ç§æ åµçåçï¼HornetQå¨å¤±æå¤æ´æ¶ä¼è§£é¤ææçé»å¡è°ç¨ï¼åæ¶æåºä¸ä¸ª <literal>javax.jms.JMSException</literal>å¼å¸¸ï¼å¦ææ¯JMSï¼æ<literal - >HornetQException</literal>å¼å¸¸ãå¼å¸¸çé误代ç æ¯<literal - >HornetQException.UNBLOCKED</literal>ã客æ·ç«¯éè¦èªè¡å¤çè¿ä¸ªå¼å¸¸ï¼å¹¶ä¸è¿è¡ + >ActiveMQException</literal>å¼å¸¸ãå¼å¸¸çé误代ç æ¯<literal + >ActiveMQException.UNBLOCKED</literal>ã客æ·ç«¯éè¦èªè¡å¤çè¿ä¸ªå¼å¸¸ï¼å¹¶ä¸è¿è¡ å¿ è¦çæä½éè¯ã</para> <para>å¦æ被解é¤é»å¡çè°ç¨æ¯commit()æè prepare()ï¼é£ä¹è¿ä¸ªäºå¡ä¼è¢«èªå¨å°åæ»ï¼å¹¶ä¸HornetQ ä¼æåºä¸ä¸ª<literal>javax.jms.TransactionRolledBackException</literal>ï¼å¦ææ¯JMSï¼ - æé½æ¯ä¸ä¸ª<literal>HornetQException</literal>ï¼é误代ç 为 <literal - >HornetQException.TRANSACTION_ROLLED_BACK</literal>ï¼å¦ææ¯æ ¸å¿æ¥å£ï¼ã</para> + æé½æ¯ä¸ä¸ª<literal>ActiveMQException</literal>ï¼é误代ç 为 <literal + >ActiveMQException.TRANSACTION_ROLLED_BACK</literal>ï¼å¦ææ¯æ ¸å¿æ¥å£ï¼ã</para> </section> <section id="ha.automatic.failover.transactions"> <title>äºå¡ç失æå¤æ´å¤ç</title> @@ -232,8 +232,8 @@ è½ä¿è¯ååºçæ¶æ¯æéç¥æ²¡æ丢失ã</para> <para>å æ¤è¿ä¸ªäºå¡å°±ä¼è¢«æ 记为åªåæ»ï¼ä»»ä½å°è¯æ交çæä½é½ä¼æåºä¸ä¸ª<literal >javax.jms.TransactionRolledBackException</literal>å¼å¸¸ï¼å¦ææ¯JMSï¼ï¼æè æ¯ä¸ - 个<literal>HornetQException</literal>çå¼å¸¸ï¼é误代ç 为<literal - >HornetQException.TRANSACTION_ROLLED_BACK</literal>ï¼å¦ææ¯æ ¸å¿æ¥å£ï¼ã</para> + 个<literal>ActiveMQException</literal>çå¼å¸¸ï¼é误代ç 为<literal + >ActiveMQException.TRANSACTION_ROLLED_BACK</literal>ï¼å¦ææ¯æ ¸å¿æ¥å£ï¼ã</para> <para>客æ·ç«¯éè¦èªè¡å¤çè¿äºå¼å¸¸ï¼è¿è¡å¿ è¦çåæ»å¤çã注æè¿éä¸éè¦äººå·¥å°ä¼è¯è¿è¡åæ»ï¼æ¤æ¶å®å·²ç» 被åæ»äºãç¨æ·å¯ä»¥éè¿åä¸ä¸ªä¼è¯éè¯è¯¥äºå¡æä½ã</para> <para>HornetQåå¸å ä¸å æ¬äºä¸ä¸ªå®æ´çä¾åæ¥å±ç¤ºå¦ä½å¤çè¿ç§æ åµãåè§ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/docs/user-manual/zh/intercepting-operations.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/intercepting-operations.xml b/docs/user-manual/zh/intercepting-operations.xml index 04e5750..1878bc7 100644 --- a/docs/user-manual/zh/intercepting-operations.xml +++ b/docs/user-manual/zh/intercepting-operations.xml @@ -32,7 +32,7 @@ package org.apache.activemq.api.core.interceptor; public interface Interceptor { boolean intercept(Packet packet, RemotingConnection connection) - throws HornetQException; + throws ActiveMQException; } </programlisting> <para>å®çæ¹æ³çè¿åå¼æ¯å¾éè¦çï¼</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/examples/jms/interceptor/readme.html ---------------------------------------------------------------------- diff --git a/examples/jms/interceptor/readme.html b/examples/jms/interceptor/readme.html index c662489..4ded622 100644 --- a/examples/jms/interceptor/readme.html +++ b/examples/jms/interceptor/readme.html @@ -16,7 +16,7 @@ <code> public interface Interceptor { - boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException; + boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException; } </code> </pre> @@ -129,7 +129,7 @@ <code> public class SimpleInterceptor implements Interceptor { - public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException + public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException { System.out.println("SimpleInterceptor gets called!"); System.out.println("Packet: " + packet.getClass().getName()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java ---------------------------------------------------------------------- diff --git a/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java b/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java index 51b4e76..095e1e5 100644 --- a/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java +++ b/examples/jms/interceptor/src/main/java/org/apache/activemq/jms/example/SimpleInterceptor.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.jms.example; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; @@ -28,7 +28,7 @@ import org.apache.activemq.spi.core.protocol.RemotingConnection; public class SimpleInterceptor implements Interceptor { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { System.out.println("SimpleInterceptor gets called!"); System.out.println("Packet: " + packet.getClass().getName()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearBundle.java ---------------------------------------------------------------------- diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearBundle.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearBundle.java index b760e27..e9e9136 100644 --- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearBundle.java +++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/HornetQAeroGearBundle.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.integration.aerogear; -import org.apache.activemq.api.core.HornetQIllegalStateException; +import org.apache.activemq.api.core.ActiveMQIllegalStateException; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; import org.jboss.logging.Messages; @@ -33,14 +33,14 @@ public interface HornetQAeroGearBundle HornetQAeroGearBundle BUNDLE = Messages.getBundle(HornetQAeroGearBundle.class); @Message(id = 239000, value = "endpoint can not be null", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException endpointNull(); + ActiveMQIllegalStateException endpointNull(); @Message(id = 239001, value = "application-id can not be null", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException applicationIdNull(); + ActiveMQIllegalStateException applicationIdNull(); @Message(id = 239002, value = "master-secret can not be null", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException masterSecretNull(); + ActiveMQIllegalStateException masterSecretNull(); @Message(id = 239003, value = "{0}: queue {1} not found", format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException noQueue(String connectorName, String queueName); + ActiveMQIllegalStateException noQueue(String connectorName, String queueName); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java ---------------------------------------------------------------------- diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java index 9f01cf4..0742f67 100644 --- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java +++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/IncomingVertxEventHandler.java @@ -15,7 +15,7 @@ package org.apache.activemq.integration.vertx; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.persistence.StorageManager; import org.apache.activemq.core.postoffice.Binding; @@ -179,7 +179,7 @@ public class IncomingVertxEventHandler implements ConnectorService } } - private void manualEncodeVertxMessageBody(HornetQBuffer bodyBuffer, Object body, int type) + private void manualEncodeVertxMessageBody(ActiveMQBuffer bodyBuffer, Object body, int type) { switch (type) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java ---------------------------------------------------------------------- diff --git a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java index 4092b24..6860304 100644 --- a/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java +++ b/integration/activemq-vertx-integration/src/main/java/org/apache/activemq/integration/vertx/OutgoingVertxEventHandler.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.filter.Filter; import org.apache.activemq.core.persistence.StorageManager; @@ -220,7 +220,7 @@ public class OutgoingVertxEventHandler implements Consumer, ConnectorService private Object extractMessageBody(ServerMessage message, Integer type) throws Exception { Object vertxMsgBody = null; - HornetQBuffer bodyBuffer = message.getBodyBuffer(); + ActiveMQBuffer bodyBuffer = message.getBodyBuffer(); switch (type) { case VertxConstants.TYPE_PING: http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 014063b..8a4ae73 100644 --- a/pom.xml +++ b/pom.xml @@ -72,11 +72,11 @@ Also see: http://youtrack.jetbrains.com/issue/IDEA-125696 --> - <hornetq-surefire-argline>-Djava.util.logging.manager=org.jboss.logmanager.LogManager + <activemq-surefire-argline>-Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file:${hornetq.basedir}/tests/config/logging.properties - -Djava.library.path=${hornetq.basedir}/hornetq-native/bin/ -Djgroups.bind_addr=localhost + -Djava.library.path=${hornetq.basedir}/activemq-native/bin/ -Djgroups.bind_addr=localhost -Djava.net.preferIPv4Stack=true - </hornetq-surefire-argline> + </activemq-surefire-argline> <hornetq.basedir>${project.basedir}</hornetq.basedir> <skipLicenseCheck>false</skipLicenseCheck> <skipStyleCheck>false</skipStyleCheck> @@ -743,7 +743,7 @@ <testFailureIgnore>true</testFailureIgnore> <runOrder>alphabetical</runOrder> <redirectTestOutputToFile>false</redirectTestOutputToFile> - <argLine>${hornetq-surefire-argline}</argLine> + <argLine>${activemq-surefire-argline}</argLine> </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/byteman-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/pom.xml b/tests/byteman-tests/pom.xml index 0d57ce2..221f085 100644 --- a/tests/byteman-tests/pom.xml +++ b/tests/byteman-tests/pom.xml @@ -218,9 +218,9 @@ <debugForkedProcess>true</debugForkedProcess> --> <parallel>false</parallel> - <!--<argLine>${hornetq-surefire-argline} -Dorg.jboss.byteman.verbose -Dorg.jboss.byteman.contrib.bmunit.verbose</argLine>--> + <!--<argLine>${activemq-surefire-argline} -Dorg.jboss.byteman.verbose -Dorg.jboss.byteman.contrib.bmunit.verbose</argLine>--> <!-- '-noverify' is needed here to fix VerifyErrors on ScaleDownFailoverTest and ScaleDownFailureTest (and their subclasses). I got the tip from https://issues.jboss.org/browse/BYTEMAN-248. --> - <argLine>${hornetq-surefire-argline} -noverify</argLine> + <argLine>${activemq-surefire-argline} -noverify</argLine> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BMFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BMFailoverTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BMFailoverTest.java index dd78991..f2c0672 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BMFailoverTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/BMFailoverTest.java @@ -17,9 +17,9 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQTransactionOutcomeUnknownException; -import org.apache.activemq.api.core.HornetQTransactionRolledBackException; -import org.apache.activemq.api.core.HornetQUnBlockedException; +import org.apache.activemq.api.core.ActiveMQTransactionOutcomeUnknownException; +import org.apache.activemq.api.core.ActiveMQTransactionRolledBackException; +import org.apache.activemq.api.core.ActiveMQUnBlockedException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; @@ -77,7 +77,7 @@ public class BMFailoverTest extends FailoverTestBase } private static boolean stopped = false; - public static void stopAndThrow() throws HornetQUnBlockedException + public static void stopAndThrow() throws ActiveMQUnBlockedException { if (!stopped) { @@ -326,7 +326,7 @@ public class BMFailoverTest extends FailoverTestBase session.commit(); fail("should have thrown an exception"); } - catch (HornetQTransactionOutcomeUnknownException e) + catch (ActiveMQTransactionOutcomeUnknownException e) { //pass } @@ -378,11 +378,11 @@ public class BMFailoverTest extends FailoverTestBase session.commit(); fail("should have thrown an exception"); } - catch (HornetQTransactionOutcomeUnknownException e) + catch (ActiveMQTransactionOutcomeUnknownException e) { //pass } - catch (HornetQTransactionRolledBackException e1) + catch (ActiveMQTransactionRolledBackException e1) { //pass } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ClusteredGroupingTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ClusteredGroupingTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ClusteredGroupingTest.java index f5b3b7d..508fcfd 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ClusteredGroupingTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/ClusteredGroupingTest.java @@ -15,7 +15,7 @@ package org.apache.activemq.byteman.tests; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.management.ManagementHelper; @@ -105,7 +105,7 @@ public class ClusteredGroupingTest extends ClusterTestBase { sendWithProperty(0, "queues.testaddress", 1, true, Message.HDR_GROUP_ID, new SimpleString("id1")); } - catch (HornetQNonExistentQueueException e) + catch (ActiveMQNonExistentQueueException e) { fail("did not handle removal of queue"); } @@ -188,7 +188,7 @@ public class ClusteredGroupingTest extends ClusterTestBase { sendWithProperty(1, "queues.testaddress", 1, true, Message.HDR_GROUP_ID, new SimpleString("id1")); } - catch (HornetQNonExistentQueueException e) + catch (ActiveMQNonExistentQueueException e) { fail("did not handle removal of queue"); } @@ -273,7 +273,7 @@ public class ClusteredGroupingTest extends ClusterTestBase { sendWithProperty(0, "queues.testaddress", 1, true, Message.HDR_GROUP_ID, new SimpleString("id1")); } - catch (HornetQNonExistentQueueException e) + catch (ActiveMQNonExistentQueueException e) { fail("did not handle removal of queue"); } @@ -366,7 +366,7 @@ public class ClusteredGroupingTest extends ClusterTestBase { sendWithProperty(0, "queues.testaddress", 1, true, Message.HDR_GROUP_ID, new SimpleString("id1")); } - catch (HornetQNonExistentQueueException e) + catch (ActiveMQNonExistentQueueException e) { fail("did not handle removal of queue"); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/GroupingTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/GroupingTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/GroupingTest.java index f421238..07c7594 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/GroupingTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/GroupingTest.java @@ -21,7 +21,7 @@ import javax.jms.Queue; import javax.jms.Session; import javax.jms.TextMessage; -import org.apache.activemq.api.core.HornetQNotConnectedException; +import org.apache.activemq.api.core.ActiveMQNotConnectedException; import org.apache.activemq.jms.client.HornetQConnectionFactory; import org.apache.activemq.spi.core.protocol.RemotingConnection; import org.apache.activemq.tests.util.JMSTestBase; @@ -151,7 +151,7 @@ public class GroupingTest extends JMSTestBase } pause = true; - rc.fail(new HornetQNotConnectedException()); + rc.fail(new ActiveMQNotConnectedException()); pause = false; for (int j = 0; j < 10000; j++) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/MessageCopyTest.java ---------------------------------------------------------------------- diff --git a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/MessageCopyTest.java b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/MessageCopyTest.java index fc32ddb..ded0be2 100644 --- a/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/MessageCopyTest.java +++ b/tests/byteman-tests/src/test/java/org/apache/activemq/byteman/tests/MessageCopyTest.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.protocol.core.impl.wireformat.SessionSendMessage; import org.apache.activemq.core.server.impl.ServerMessageImpl; @@ -148,7 +148,7 @@ public class MessageCopyTest try { SessionSendMessage ssm = new SessionSendMessage(msg); - HornetQBuffer buf = ssm.encode(null); + ActiveMQBuffer buf = ssm.encode(null); System.out.println("reading at buf = " + buf); simulateRead(buf); } @@ -190,7 +190,7 @@ public class MessageCopyTest Assert.assertEquals(0, errors.get()); } - private void simulateRead(HornetQBuffer buf) + private void simulateRead(ActiveMQBuffer buf) { buf.setIndex(buf.capacity() / 2, buf.capacity() / 2); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/concurrent-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/concurrent-tests/pom.xml b/tests/concurrent-tests/pom.xml index 481876e..44cebc4 100644 --- a/tests/concurrent-tests/pom.xml +++ b/tests/concurrent-tests/pom.xml @@ -88,7 +88,7 @@ <includes> <include>**/*Test.java</include> </includes> - <argLine>${hornetq-surefire-argline}</argLine> + <argLine>${activemq-surefire-argline}</argLine> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml index 10448c2..34f60b5 100644 --- a/tests/integration-tests/pom.xml +++ b/tests/integration-tests/pom.xml @@ -256,7 +256,7 @@ <exclude>**/ReplicatedJMSFailoverTest.java</exclude> <exclude>org.apache.activemq/tests/util/*.java</exclude> </excludes> - <argLine>-Djgroups.bind_addr=::1 ${hornetq-surefire-argline}</argLine> + <argLine>-Djgroups.bind_addr=::1 ${activemq-surefire-argline}</argLine> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java index 7775729..f174a1d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/DuplicateDetectionTest.java @@ -16,8 +16,8 @@ import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.apache.activemq.api.core.HornetQDuplicateIdException; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQDuplicateIdException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; @@ -752,11 +752,11 @@ public class DuplicateDetectionTest extends ServiceTestBase { session.commit(); } - catch (HornetQDuplicateIdException die) + catch (ActiveMQDuplicateIdException die) { session.rollback(); } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -1902,11 +1902,11 @@ public class DuplicateDetectionTest extends ServiceTestBase { session.commit(); } - catch (HornetQDuplicateIdException die) + catch (ActiveMQDuplicateIdException die) { session.rollback(); } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -1922,11 +1922,11 @@ public class DuplicateDetectionTest extends ServiceTestBase { session.commit(); } - catch (HornetQDuplicateIdException die) + catch (ActiveMQDuplicateIdException die) { session.rollback(); } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java index 8f4c826..a573476 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/InterceptorTest.java @@ -12,8 +12,8 @@ */ package org.apache.activemq.tests.integration; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; @@ -72,7 +72,7 @@ public class InterceptorTest extends ServiceTestBase private class MyInterceptor1 implements Interceptor { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (packet.getType() == PacketImpl.SESS_SEND) { @@ -90,7 +90,7 @@ public class InterceptorTest extends ServiceTestBase private class InterceptUserOnCreateQueue implements Interceptor { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (packet.getType() == PacketImpl.CREATE_QUEUE) { @@ -125,7 +125,7 @@ public class InterceptorTest extends ServiceTestBase private class InterceptUserOnCreateConsumer implements Interceptor { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (packet.getType() == PacketImpl.SESS_CREATECONSUMER) { @@ -160,7 +160,7 @@ public class InterceptorTest extends ServiceTestBase private class MyOutgoingInterceptor1 implements Interceptor { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (packet.getType() == PacketImpl.SESS_RECEIVE_MSG) { @@ -178,7 +178,7 @@ public class InterceptorTest extends ServiceTestBase private class MyInterceptor2 implements Interceptor { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (packet.getType() == PacketImpl.SESS_SEND) { @@ -192,7 +192,7 @@ public class InterceptorTest extends ServiceTestBase private class MyOutgoingInterceptor2 implements Interceptor { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (isForceDeliveryResponse(packet)) { @@ -210,7 +210,7 @@ public class InterceptorTest extends ServiceTestBase private class MyInterceptor3 implements Interceptor { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (packet.getType() == PacketImpl.SESS_RECEIVE_MSG) { @@ -228,7 +228,7 @@ public class InterceptorTest extends ServiceTestBase private class MyOutgoingInterceptor3 implements Interceptor { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (packet.getType() == PacketImpl.SESS_SEND) { @@ -246,7 +246,7 @@ public class InterceptorTest extends ServiceTestBase private class MyInterceptor4 implements Interceptor { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (isForceDeliveryResponse(packet)) { @@ -265,7 +265,7 @@ public class InterceptorTest extends ServiceTestBase private class MyOutgoingInterceptor4 implements Interceptor { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (isForceDeliveryResponse(packet)) { @@ -331,7 +331,7 @@ public class InterceptorTest extends ServiceTestBase this.wasCalled = wasCalled; } - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (packet.getType() == PacketImpl.SESS_SEND) { @@ -384,7 +384,7 @@ public class InterceptorTest extends ServiceTestBase this.wasCalled = wasCalled; } - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (isForceDeliveryResponse(packet)) @@ -835,10 +835,10 @@ public class InterceptorTest extends ServiceTestBase producer.send(message); Assert.fail(); } - catch (HornetQException e) + catch (ActiveMQException e) { // expected exception - Assert.assertTrue(e.getType().getCode() == HornetQExceptionType.INTERCEPTOR_REJECTED_PACKET.getCode()); + Assert.assertTrue(e.getType().getCode() == ActiveMQExceptionType.INTERCEPTOR_REJECTED_PACKET.getCode()); } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java index 3725966..c12ee96 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AcknowledgeTest.java @@ -17,9 +17,9 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQPropertyConversionException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQPropertyConversionException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; @@ -159,13 +159,13 @@ public class AcknowledgeTest extends ServiceTestBase { message.acknowledge(); } - catch (HornetQException e) + catch (ActiveMQException e) { try { session.close(); } - catch (HornetQException e1) + catch (ActiveMQException e1) { e1.printStackTrace(); } @@ -302,13 +302,13 @@ public class AcknowledgeTest extends ServiceTestBase { message.acknowledge(); } - catch (HornetQException e) + catch (ActiveMQException e) { try { session.close(); } - catch (HornetQException e1) + catch (ActiveMQException e1) { e1.printStackTrace(); } @@ -341,37 +341,37 @@ public class AcknowledgeTest extends ServiceTestBase } @Override - public ClientMessage receive() throws HornetQException + public ClientMessage receive() throws ActiveMQException { return null; } @Override - public ClientMessage receive(long timeout) throws HornetQException + public ClientMessage receive(long timeout) throws ActiveMQException { return null; } @Override - public ClientMessage receiveImmediate() throws HornetQException + public ClientMessage receiveImmediate() throws ActiveMQException { return null; } @Override - public MessageHandler getMessageHandler() throws HornetQException + public MessageHandler getMessageHandler() throws ActiveMQException { return null; } @Override - public FakeConsumerWithID setMessageHandler(MessageHandler handler) throws HornetQException + public FakeConsumerWithID setMessageHandler(MessageHandler handler) throws ActiveMQException { return this; } @Override - public void close() throws HornetQException + public void close() throws ActiveMQException { } @@ -502,13 +502,13 @@ public class AcknowledgeTest extends ServiceTestBase } @Override - public HornetQBuffer getBodyBuffer() + public ActiveMQBuffer getBodyBuffer() { return null; } @Override - public HornetQBuffer getBodyBufferCopy() + public ActiveMQBuffer getBodyBufferCopy() { return null; } @@ -634,13 +634,13 @@ public class AcknowledgeTest extends ServiceTestBase } @Override - public Message putObjectProperty(SimpleString key, Object value) throws HornetQPropertyConversionException + public Message putObjectProperty(SimpleString key, Object value) throws ActiveMQPropertyConversionException { return null; } @Override - public Message putObjectProperty(String key, Object value) throws HornetQPropertyConversionException + public Message putObjectProperty(String key, Object value) throws ActiveMQPropertyConversionException { return null; } @@ -670,61 +670,61 @@ public class AcknowledgeTest extends ServiceTestBase } @Override - public Boolean getBooleanProperty(SimpleString key) throws HornetQPropertyConversionException + public Boolean getBooleanProperty(SimpleString key) throws ActiveMQPropertyConversionException { return null; } @Override - public Boolean getBooleanProperty(String key) throws HornetQPropertyConversionException + public Boolean getBooleanProperty(String key) throws ActiveMQPropertyConversionException { return null; } @Override - public Byte getByteProperty(SimpleString key) throws HornetQPropertyConversionException + public Byte getByteProperty(SimpleString key) throws ActiveMQPropertyConversionException { return null; } @Override - public Byte getByteProperty(String key) throws HornetQPropertyConversionException + public Byte getByteProperty(String key) throws ActiveMQPropertyConversionException { return null; } @Override - public Double getDoubleProperty(SimpleString key) throws HornetQPropertyConversionException + public Double getDoubleProperty(SimpleString key) throws ActiveMQPropertyConversionException { return null; } @Override - public Double getDoubleProperty(String key) throws HornetQPropertyConversionException + public Double getDoubleProperty(String key) throws ActiveMQPropertyConversionException { return null; } @Override - public Integer getIntProperty(SimpleString key) throws HornetQPropertyConversionException + public Integer getIntProperty(SimpleString key) throws ActiveMQPropertyConversionException { return null; } @Override - public Integer getIntProperty(String key) throws HornetQPropertyConversionException + public Integer getIntProperty(String key) throws ActiveMQPropertyConversionException { return null; } @Override - public Long getLongProperty(SimpleString key) throws HornetQPropertyConversionException + public Long getLongProperty(SimpleString key) throws ActiveMQPropertyConversionException { return null; } @Override - public Long getLongProperty(String key) throws HornetQPropertyConversionException + public Long getLongProperty(String key) throws ActiveMQPropertyConversionException { return null; } @@ -742,61 +742,61 @@ public class AcknowledgeTest extends ServiceTestBase } @Override - public Short getShortProperty(SimpleString key) throws HornetQPropertyConversionException + public Short getShortProperty(SimpleString key) throws ActiveMQPropertyConversionException { return null; } @Override - public Short getShortProperty(String key) throws HornetQPropertyConversionException + public Short getShortProperty(String key) throws ActiveMQPropertyConversionException { return null; } @Override - public Float getFloatProperty(SimpleString key) throws HornetQPropertyConversionException + public Float getFloatProperty(SimpleString key) throws ActiveMQPropertyConversionException { return null; } @Override - public Float getFloatProperty(String key) throws HornetQPropertyConversionException + public Float getFloatProperty(String key) throws ActiveMQPropertyConversionException { return null; } @Override - public String getStringProperty(SimpleString key) throws HornetQPropertyConversionException + public String getStringProperty(SimpleString key) throws ActiveMQPropertyConversionException { return null; } @Override - public String getStringProperty(String key) throws HornetQPropertyConversionException + public String getStringProperty(String key) throws ActiveMQPropertyConversionException { return null; } @Override - public SimpleString getSimpleStringProperty(SimpleString key) throws HornetQPropertyConversionException + public SimpleString getSimpleStringProperty(SimpleString key) throws ActiveMQPropertyConversionException { return null; } @Override - public SimpleString getSimpleStringProperty(String key) throws HornetQPropertyConversionException + public SimpleString getSimpleStringProperty(String key) throws ActiveMQPropertyConversionException { return null; } @Override - public byte[] getBytesProperty(SimpleString key) throws HornetQPropertyConversionException + public byte[] getBytesProperty(SimpleString key) throws ActiveMQPropertyConversionException { return new byte[0]; } @Override - public byte[] getBytesProperty(String key) throws HornetQPropertyConversionException + public byte[] getBytesProperty(String key) throws ActiveMQPropertyConversionException { return new byte[0]; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.java index 001993e..fff8bd6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/AutogroupIdTest.java @@ -14,7 +14,7 @@ package org.apache.activemq.tests.integration.client; import java.util.concurrent.CountDownLatch; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -219,7 +219,7 @@ public class AutogroupIdTest extends ServiceTestBase { message.acknowledge(); } - catch (HornetQException e) + catch (ActiveMQException e) { e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.java index 01ca85b..f75edae 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CommitRollbackTest.java @@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -192,13 +192,13 @@ public class CommitRollbackTest extends ServiceTestBase { message.acknowledge(); } - catch (HornetQException e) + catch (ActiveMQException e) { try { session.close(); } - catch (HornetQException e1) + catch (ActiveMQException e1) { e1.printStackTrace(); } @@ -276,13 +276,13 @@ public class CommitRollbackTest extends ServiceTestBase { message.acknowledge(); } - catch (HornetQException e) + catch (ActiveMQException e) { try { session.close(); } - catch (HornetQException e1) + catch (ActiveMQException e1) { e1.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerCloseTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerCloseTest.java index 948b4bb..49117cf 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerCloseTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerCloseTest.java @@ -15,8 +15,8 @@ package org.apache.activemq.tests.integration.client; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; @@ -71,25 +71,25 @@ public class ConsumerCloseTest extends ServiceTestBase Assert.assertTrue(consumer.isClosed()); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { consumer.receive(); } }); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { consumer.receiveImmediate(); } }); - UnitTestCase.expectHornetQException(HornetQExceptionType.OBJECT_CLOSED, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.OBJECT_CLOSED, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { consumer.setMessageHandler(new MessageHandler() { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerTest.java index 1359954..948bb23 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/ConsumerTest.java @@ -19,8 +19,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQIllegalStateException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQIllegalStateException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; @@ -279,7 +279,7 @@ public class ConsumerTest extends ServiceTestBase final CountDownLatch latch = new CountDownLatch(numMessages); server.getRemotingService().addIncomingInterceptor(new Interceptor() { - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (packet.getType() == PacketImpl.SESS_ACKNOWLEDGE) { @@ -302,7 +302,7 @@ public class ConsumerTest extends ServiceTestBase { message.acknowledge(); } - catch (HornetQException e) + catch (ActiveMQException e) { e.printStackTrace(); } @@ -403,11 +403,11 @@ public class ConsumerTest extends ServiceTestBase consumer.receiveImmediate(); Assert.fail("Should throw exception"); } - catch (HornetQIllegalStateException ise) + catch (ActiveMQIllegalStateException ise) { //ok } - catch (HornetQException me) + catch (ActiveMQException me) { Assert.fail("Wrong exception code"); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CoreClientTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CoreClientTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CoreClientTest.java index 8528c11..865bd94 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CoreClientTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CoreClientTest.java @@ -12,11 +12,11 @@ */ package org.apache.activemq.tests.integration.client; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.junit.Test; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQBuffer; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; @@ -115,7 +115,7 @@ public class CoreClientTest extends ServiceTestBase { ClientMessage message2 = consumer.receive(); - HornetQBuffer buffer = message2.getBodyBuffer(); + ActiveMQBuffer buffer = message2.getBodyBuffer(); Assert.assertEquals("testINVMCoreClient", buffer.readString()); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CreateQueueIdempotentTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CreateQueueIdempotentTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CreateQueueIdempotentTest.java index f90d378..901df4f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CreateQueueIdempotentTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/CreateQueueIdempotentTest.java @@ -14,8 +14,8 @@ package org.apache.activemq.tests.integration.client; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQQueueExistsException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQQueueExistsException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientSession; @@ -66,11 +66,11 @@ public class CreateQueueIdempotentTest extends ServiceTestBase session.createQueue(QUEUE, QUEUE, null, true); fail("Expected exception, queue already exists"); } - catch (HornetQQueueExistsException qee) + catch (ActiveMQQueueExistsException qee) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -150,7 +150,7 @@ public class CreateQueueIdempotentTest extends ServiceTestBase session.createQueue(QUEUE, QUEUE, null, true); queuesCreated.incrementAndGet(); } - catch (HornetQQueueExistsException qne) + catch (ActiveMQQueueExistsException qne) { failedAttempts.incrementAndGet(); } @@ -170,7 +170,7 @@ public class CreateQueueIdempotentTest extends ServiceTestBase { session.close(); } - catch (HornetQException e) + catch (ActiveMQException e) { e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeadLetterAddressTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeadLetterAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeadLetterAddressTest.java index c8c0efe..a51f2f1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeadLetterAddressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeadLetterAddressTest.java @@ -11,6 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.client; +import org.apache.activemq.api.core.ActiveMQException; import org.junit.Before; import org.junit.Test; @@ -22,7 +23,6 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; @@ -206,7 +206,7 @@ public class DeadLetterAddressTest extends ServiceTestBase { clientSession.rollback(true); } - catch (HornetQException e) + catch (ActiveMQException e) { e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeliveryOrderTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeliveryOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeliveryOrderTest.java index 05169a5..52a7203 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeliveryOrderTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/DeliveryOrderTest.java @@ -16,7 +16,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -178,7 +178,7 @@ public class DeliveryOrderTest extends ServiceTestBase { message.acknowledge(); } - catch (HornetQException e) + catch (ActiveMQException e) { e.printStackTrace(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FailureDeadlockTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FailureDeadlockTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FailureDeadlockTest.java index 134ac2a..c804a56 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FailureDeadlockTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/FailureDeadlockTest.java @@ -11,6 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.client; +import org.apache.activemq.api.core.ActiveMQNotConnectedException; import org.junit.Before; import org.junit.After; @@ -21,7 +22,6 @@ import javax.jms.ExceptionListener; import javax.jms.JMSException; import javax.jms.Session; -import org.apache.activemq.api.core.HornetQNotConnectedException; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.jms.HornetQJMSClient; import org.apache.activemq.api.jms.JMSFactoryType; @@ -162,7 +162,7 @@ public class FailureDeadlockTest extends ServiceTestBase @Override public void run() { - conn.fail(new HornetQNotConnectedException("blah")); + conn.fail(new ActiveMQNotConnectedException("blah")); } } @@ -179,7 +179,7 @@ public class FailureDeadlockTest extends ServiceTestBase Session sess1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE); RemotingConnection rc1 = ((ClientSessionInternal)((HornetQSession)sess1).getCoreSession()).getConnection(); - rc1.fail(new HornetQNotConnectedException( "blah")); + rc1.fail(new ActiveMQNotConnectedException( "blah")); try { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HangConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HangConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HangConsumerTest.java index 52b811f..1efff81 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HangConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HangConsumerTest.java @@ -11,6 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.client; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.server.MessageReference; import org.apache.activemq.core.server.ServerConsumer; import org.junit.Before; @@ -29,7 +30,6 @@ import java.util.concurrent.TimeUnit; import javax.management.MBeanServer; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; @@ -441,7 +441,7 @@ public class HangConsumerTest extends ServiceTestBase Assert.assertTrue(hangInt.reusableLatch.await(10, TimeUnit.SECONDS)); - hangInt.pendingException = new HornetQException(); + hangInt.pendingException = new ActiveMQException(); hangInt.open(); @@ -676,7 +676,7 @@ public class HangConsumerTest extends ServiceTestBase ReusableLatch reusableLatch = new ReusableLatch(1); - volatile HornetQException pendingException = null; + volatile ActiveMQException pendingException = null; public void close() throws Exception { @@ -689,7 +689,7 @@ public class HangConsumerTest extends ServiceTestBase } @Override - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { if (packet instanceof SessionReceiveMessage) { @@ -709,7 +709,7 @@ public class HangConsumerTest extends ServiceTestBase if (pendingException != null) { - HornetQException exToThrow = pendingException; + ActiveMQException exToThrow = pendingException; pendingException = null; throw exToThrow; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HornetQCrashTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HornetQCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HornetQCrashTest.java index beb8746..3738ede 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HornetQCrashTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/HornetQCrashTest.java @@ -11,13 +11,13 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.client; +import org.apache.activemq.api.core.ActiveMQException; import org.junit.Before; import org.junit.Test; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.TransportConfiguration; @@ -109,7 +109,7 @@ public class HornetQCrashTest extends UnitTestCase this.server = server; } - public boolean intercept(final Packet packet, final RemotingConnection connection) throws HornetQException + public boolean intercept(final Packet packet, final RemotingConnection connection) throws ActiveMQException { HornetQCrashTest.log.info("AckInterceptor.intercept " + packet); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/IncompatibleVersionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/IncompatibleVersionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/IncompatibleVersionTest.java index d078813..c8ea157 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/IncompatibleVersionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/IncompatibleVersionTest.java @@ -16,8 +16,8 @@ import java.io.FileOutputStream; import java.io.InputStream; import java.util.Properties; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQIncompatibleClientServerException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQIncompatibleClientServerException; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.ClientSessionFactory; @@ -178,11 +178,11 @@ public class IncompatibleVersionTest extends ServiceTestBase channel1.sendBlocking(request, PacketImpl.CREATESESSION_RESP); fail(); } - catch (HornetQIncompatibleClientServerException icsv) + catch (ActiveMQIncompatibleClientServerException icsv) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InterruptedLargeMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InterruptedLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InterruptedLargeMessageTest.java index 61d6dd9..4ae348a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InterruptedLargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/InterruptedLargeMessageTest.java @@ -22,7 +22,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Interceptor; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; @@ -192,7 +192,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase msg.checkCompletion(); } - catch (HornetQException e) + catch (ActiveMQException e) { e.printStackTrace(); expectedErrors.incrementAndGet(); @@ -754,7 +754,7 @@ public class InterruptedLargeMessageTest extends LargeMessageTestBase private static CountDownLatch latch = new CountDownLatch(1); @Override - public boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException + public boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException { if (packet instanceof SessionContinuationMessage) { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.java index 8e2737a..5ef31a0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/LargeMessageTest.java @@ -22,7 +22,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; @@ -343,7 +343,7 @@ public class LargeMessageTest extends LargeMessageTestBase { message = session.createMessage(true); - HornetQBuffer bodyLocal = message.getBodyBuffer(); + ActiveMQBuffer bodyLocal = message.getBodyBuffer(); bodyLocal.writeBytes(body); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java index 6baf461..844543a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageDurabilityTest.java @@ -12,9 +12,9 @@ */ package org.apache.activemq.tests.integration.client; -import org.apache.activemq.api.core.HornetQException; -import org.apache.activemq.api.core.HornetQExceptionType; -import org.apache.activemq.api.core.HornetQNonExistentQueueException; +import org.apache.activemq.api.core.ActiveMQException; +import org.apache.activemq.api.core.ActiveMQExceptionType; +import org.apache.activemq.api.core.ActiveMQNonExistentQueueException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientProducer; @@ -75,11 +75,11 @@ public class MessageDurabilityTest extends ServiceTestBase { session.createConsumer(queue); } - catch (HornetQNonExistentQueueException neqe) + catch (ActiveMQNonExistentQueueException neqe) { //ok } - catch (HornetQException e) + catch (ActiveMQException e) { fail("Invalid Exception type:" + e.getType()); } @@ -151,9 +151,9 @@ public class MessageDurabilityTest extends ServiceTestBase session.start(); - UnitTestCase.expectHornetQException(HornetQExceptionType.QUEUE_DOES_NOT_EXIST, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { session.createConsumer(queue); } @@ -179,9 +179,9 @@ public class MessageDurabilityTest extends ServiceTestBase restart(); session.start(); - UnitTestCase.expectHornetQException(HornetQExceptionType.QUEUE_DOES_NOT_EXIST, new HornetQAction() + UnitTestCase.expectHornetQException(ActiveMQExceptionType.QUEUE_DOES_NOT_EXIST, new HornetQAction() { - public void run() throws HornetQException + public void run() throws ActiveMQException { session.createConsumer(queue); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java index b44539b..99c4dae 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingConnectionFactoryTest.java @@ -11,6 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.client; +import org.apache.activemq.api.core.ActiveMQException; import org.junit.Before; import org.junit.Test; @@ -21,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; @@ -165,7 +165,7 @@ public class MessageGroupingConnectionFactoryTest extends UnitTestCase { message.acknowledge(); } - catch (HornetQException e) + catch (ActiveMQException e) { // ignore } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java index 7a43637..07f22a2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MessageGroupingTest.java @@ -11,6 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.client; +import org.apache.activemq.api.core.ActiveMQException; import org.junit.Assume; import org.junit.Before; @@ -25,7 +26,6 @@ import javax.transaction.xa.Xid; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; @@ -651,7 +651,7 @@ public class MessageGroupingTest extends UnitTestCase { message.acknowledge(); } - catch (HornetQException e) + catch (ActiveMQException e) { // ignore } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.java index 3faec6c..9864ae8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/MultipleThreadFilterOneTest.java @@ -12,12 +12,12 @@ */ package org.apache.activemq.tests.integration.client; +import org.apache.activemq.api.core.ActiveMQException; import org.junit.Test; import java.util.HashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -107,9 +107,9 @@ public class MultipleThreadFilterOneTest extends ServiceTestBase } /** - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - private void sendMessages(int msgs) throws HornetQException + private void sendMessages(int msgs) throws ActiveMQException { ClientProducer producer = prodSession.createProducer(ADDRESS); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java index d9604e2..927a61a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/NewDeadLetterAddressTest.java @@ -11,6 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.client; +import org.apache.activemq.api.core.ActiveMQException; import org.junit.Before; import org.junit.After; @@ -18,7 +19,6 @@ import org.junit.Test; import org.junit.Assert; -import org.apache.activemq.api.core.HornetQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; @@ -101,7 +101,7 @@ public class NewDeadLetterAddressTest extends UnitTestCase { clientSession.close(); } - catch (HornetQException e1) + catch (ActiveMQException e1) { // }
