http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNotConnectedException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNotConnectedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNotConnectedException.java deleted file mode 100644 index efd6c49..0000000 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQNotConnectedException.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.apache.activemq.api.core; - -import static org.apache.activemq.api.core.HornetQExceptionType.NOT_CONNECTED; - -/** - * A client is not able to connect to HornetQ server. - * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> 4/30/12 - */ -public final class HornetQNotConnectedException extends HornetQException -{ - private static final long serialVersionUID = -3489189971813613325L; - - public HornetQNotConnectedException(String message) - { - super(NOT_CONNECTED, message); - } - - public HornetQNotConnectedException() - { - super(NOT_CONNECTED); - } -}
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQObjectClosedException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQObjectClosedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQObjectClosedException.java deleted file mode 100644 index 84d9169..0000000 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQObjectClosedException.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.apache.activemq.api.core; - -import static org.apache.activemq.api.core.HornetQExceptionType.OBJECT_CLOSED; - -/** - * A client operation failed because the calling resource (ClientSession, ClientProducer, etc.) is - * closed. - * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> 4/30/12 - */ -public final class HornetQObjectClosedException extends HornetQException -{ - private static final long serialVersionUID = 809024052184914812L; - - public HornetQObjectClosedException() - { - super(OBJECT_CLOSED); - } - - public HornetQObjectClosedException(String msg) - { - super(OBJECT_CLOSED, msg); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQPropertyConversionException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQPropertyConversionException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQPropertyConversionException.java deleted file mode 100644 index 1ba8107..0000000 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQPropertyConversionException.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -package org.apache.activemq.api.core; - -/** - * A PropertyConversionException is thrown by {@code org.apache.activemq.api.core.Message} methods when a - * property can not be converted to the expected type. - * @author <a href="mailto:jmes...@redhat.com";>Jeff Mesnil</a> - * @see org.apache.activemq.api.core.Message - */ -public final class HornetQPropertyConversionException extends RuntimeException -{ - - private static final long serialVersionUID = -3010008708334904332L; - - public HornetQPropertyConversionException(final String message) - { - super(message); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQQueueExistsException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQQueueExistsException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQQueueExistsException.java deleted file mode 100644 index 2c5c65d..0000000 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQQueueExistsException.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.apache.activemq.api.core; - -import static org.apache.activemq.api.core.HornetQExceptionType.QUEUE_EXISTS; - -/** - * An operation failed because a queue exists on the server. - * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> 4/30/12 - */ -public final class HornetQQueueExistsException extends HornetQException -{ - private static final long serialVersionUID = -405552292451883063L; - - public HornetQQueueExistsException() - { - super(QUEUE_EXISTS); - } - - public HornetQQueueExistsException(String msg) - { - super(QUEUE_EXISTS, msg); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSecurityException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSecurityException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSecurityException.java deleted file mode 100644 index 17e3a62..0000000 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSecurityException.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.apache.activemq.api.core; - -import static org.apache.activemq.api.core.HornetQExceptionType.SECURITY_EXCEPTION; - -/** - * A security problem occurred (authentication issues, permission issues,...) - * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> 5/2/12 - */ -public final class HornetQSecurityException extends HornetQException -{ - private static final long serialVersionUID = 3291210307590756881L; - - public HornetQSecurityException() - { - super(SECURITY_EXCEPTION); - } - - public HornetQSecurityException(String msg) - { - super(SECURITY_EXCEPTION, msg); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSessionCreationException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSessionCreationException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSessionCreationException.java deleted file mode 100644 index 15db001..0000000 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQSessionCreationException.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.apache.activemq.api.core; - -import static org.apache.activemq.api.core.HornetQExceptionType.SESSION_CREATION_REJECTED; - -/** - * The creation of a session was rejected by the server (e.g. if the server is starting and has not - * finish to be initialized. - * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> 5/2/12 - */ -public final class HornetQSessionCreationException extends HornetQException -{ - private static final long serialVersionUID = -4486139158452585895L; - - public HornetQSessionCreationException() - { - super(SESSION_CREATION_REJECTED); - } - - public HornetQSessionCreationException(String msg) - { - super(SESSION_CREATION_REJECTED, msg); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionOutcomeUnknownException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionOutcomeUnknownException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionOutcomeUnknownException.java deleted file mode 100644 index 4817afc..0000000 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionOutcomeUnknownException.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.apache.activemq.api.core; - -import static org.apache.activemq.api.core.HornetQExceptionType.TRANSACTION_OUTCOME_UNKNOWN; - -/** - * The outcome of a transaction is unknown. - * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> 5/2/12 - */ -public final class HornetQTransactionOutcomeUnknownException extends HornetQException -{ - private static final long serialVersionUID = 7940794286427650558L; - - public HornetQTransactionOutcomeUnknownException() - { - super(TRANSACTION_OUTCOME_UNKNOWN); - } - - public HornetQTransactionOutcomeUnknownException(String msg) - { - super(TRANSACTION_OUTCOME_UNKNOWN, msg); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionRolledBackException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionRolledBackException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionRolledBackException.java deleted file mode 100644 index 19bd17f..0000000 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQTransactionRolledBackException.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.apache.activemq.api.core; - -import static org.apache.activemq.api.core.HornetQExceptionType.TRANSACTION_ROLLED_BACK; - -/** - * A transaction was rolled back. - * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> 5/2/12 - */ -public final class HornetQTransactionRolledBackException extends HornetQException -{ - private static final long serialVersionUID = 5823412198677126300L; - - public HornetQTransactionRolledBackException() - { - super(TRANSACTION_ROLLED_BACK); - } - - public HornetQTransactionRolledBackException(String msg) - { - super(TRANSACTION_ROLLED_BACK, msg); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnBlockedException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnBlockedException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnBlockedException.java deleted file mode 100644 index 13de034..0000000 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnBlockedException.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.apache.activemq.api.core; - -import static org.apache.activemq.api.core.HornetQExceptionType.UNBLOCKED; - -/** - * A blocking call from a client was unblocked during failover. - * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> 4/30/12 - */ -public final class HornetQUnBlockedException extends HornetQException -{ - private static final long serialVersionUID = -4507889261891160608L; - - public HornetQUnBlockedException() - { - super(UNBLOCKED); - } - - public HornetQUnBlockedException(String msg) - { - super(UNBLOCKED, msg); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnsupportedPacketException.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnsupportedPacketException.java b/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnsupportedPacketException.java deleted file mode 100644 index 38303a1..0000000 --- a/activemq-commons/src/main/java/org/apache/activemq/api/core/HornetQUnsupportedPacketException.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2005-2014 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.apache.activemq.api.core; - -import static org.apache.activemq.api.core.HornetQExceptionType.UNSUPPORTED_PACKET; - -/** - * A packet of unsupported type was received by HornetQ PacketHandler. - * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> 4/30/12 - */ -public final class HornetQUnsupportedPacketException extends HornetQException -{ - private static final long serialVersionUID = -7074681529482463675L; - - public HornetQUnsupportedPacketException() - { - super(UNSUPPORTED_PACKET); - } - - public HornetQUnsupportedPacketException(String msg) - { - super(UNSUPPORTED_PACKET, msg); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java b/activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java index 0837113..c7fbb8e 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java +++ b/activemq-commons/src/main/java/org/apache/activemq/core/buffers/impl/ChannelBufferWrapper.java @@ -17,7 +17,7 @@ import java.nio.ByteBuffer; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -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.utils.DataConstants; import org.apache.activemq.utils.UTF8Util; @@ -27,7 +27,7 @@ import org.apache.activemq.utils.UTF8Util; * * @author Tim Fox */ -public class ChannelBufferWrapper implements HornetQBuffer +public class ChannelBufferWrapper implements ActiveMQBuffer { protected ByteBuf buffer; // NO_UCD (use final) private final boolean releasable; @@ -215,12 +215,12 @@ public class ChannelBufferWrapper implements HornetQBuffer buffer.clear(); } - public HornetQBuffer copy() + public ActiveMQBuffer copy() { return new ChannelBufferWrapper(buffer.copy(), releasable); } - public HornetQBuffer copy(final int index, final int length) + public ActiveMQBuffer copy(final int index, final int length) { return new ChannelBufferWrapper(buffer.copy(index, length), releasable); } @@ -230,7 +230,7 @@ public class ChannelBufferWrapper implements HornetQBuffer buffer.discardReadBytes(); } - public HornetQBuffer duplicate() + public ActiveMQBuffer duplicate() { return new ChannelBufferWrapper(buffer.duplicate(), releasable); } @@ -255,17 +255,17 @@ public class ChannelBufferWrapper implements HornetQBuffer buffer.getBytes(index, dst); } - public void getBytes(final int index, final HornetQBuffer dst, final int dstIndex, final int length) + public void getBytes(final int index, final ActiveMQBuffer dst, final int dstIndex, final int length) { buffer.getBytes(index, dst.byteBuf(), dstIndex, length); } - public void getBytes(final int index, final HornetQBuffer dst, final int length) + public void getBytes(final int index, final ActiveMQBuffer dst, final int length) { buffer.getBytes(index, dst.byteBuf(), length); } - public void getBytes(final int index, final HornetQBuffer dst) + public void getBytes(final int index, final ActiveMQBuffer dst) { buffer.getBytes(index, dst.byteBuf()); } @@ -355,22 +355,22 @@ public class ChannelBufferWrapper implements HornetQBuffer buffer.readBytes(dst); } - public void readBytes(final HornetQBuffer dst, final int dstIndex, final int length) + public void readBytes(final ActiveMQBuffer dst, final int dstIndex, final int length) { buffer.readBytes(dst.byteBuf(), dstIndex, length); } - public void readBytes(final HornetQBuffer dst, final int length) + public void readBytes(final ActiveMQBuffer dst, final int length) { buffer.readBytes(dst.byteBuf(), length); } - public void readBytes(final HornetQBuffer dst) + public void readBytes(final ActiveMQBuffer dst) { buffer.readBytes(dst.byteBuf()); } - public HornetQBuffer readBytes(final int length) + public ActiveMQBuffer readBytes(final int length) { return new ChannelBufferWrapper(buffer.readBytes(length), releasable); } @@ -415,7 +415,7 @@ public class ChannelBufferWrapper implements HornetQBuffer return buffer.readShort(); } - public HornetQBuffer readSlice(final int length) + public ActiveMQBuffer readSlice(final int length) { return new ChannelBufferWrapper(buffer.readSlice(length), releasable); } @@ -465,17 +465,17 @@ public class ChannelBufferWrapper implements HornetQBuffer buffer.setBytes(index, src); } - public void setBytes(final int index, final HornetQBuffer src, final int srcIndex, final int length) + public void setBytes(final int index, final ActiveMQBuffer src, final int srcIndex, final int length) { buffer.setBytes(index, src.byteBuf(), srcIndex, length); } - public void setBytes(final int index, final HornetQBuffer src, final int length) + public void setBytes(final int index, final ActiveMQBuffer src, final int length) { buffer.setBytes(index, src.byteBuf(), length); } - public void setBytes(final int index, final HornetQBuffer src) + public void setBytes(final int index, final ActiveMQBuffer src) { buffer.setBytes(index, src.byteBuf()); } @@ -520,12 +520,12 @@ public class ChannelBufferWrapper implements HornetQBuffer buffer.skipBytes(length); } - public HornetQBuffer slice() + public ActiveMQBuffer slice() { return new ChannelBufferWrapper(buffer.slice(), releasable); } - public HornetQBuffer slice(final int index, final int length) + public ActiveMQBuffer slice(final int index, final int length) { return new ChannelBufferWrapper(buffer.slice(index, length), releasable); } @@ -570,12 +570,12 @@ public class ChannelBufferWrapper implements HornetQBuffer buffer.writeBytes(src); } - public void writeBytes(final HornetQBuffer src, final int srcIndex, final int length) + public void writeBytes(final ActiveMQBuffer src, final int srcIndex, final int length) { buffer.writeBytes(src.byteBuf(), srcIndex, length); } - public void writeBytes(final HornetQBuffer src, final int length) + public void writeBytes(final ActiveMQBuffer src, final int length) { buffer.writeBytes(src.byteBuf(), length); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilBundle.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilBundle.java b/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilBundle.java index 28f89df..6fdd103 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilBundle.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/HornetQUtilBundle.java @@ -13,7 +13,7 @@ package org.apache.activemq.utils; -import org.apache.activemq.api.core.HornetQIllegalStateException; +import org.apache.activemq.api.core.ActiveMQIllegalStateException; import org.jboss.logging.annotations.Cause; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageBundle; @@ -35,7 +35,7 @@ public interface HornetQUtilBundle HornetQUtilBundle BUNDLE = Messages.getBundle(HornetQUtilBundle.class); @Message(id = 209000, value = "invalid property: {0}" , format = Message.Format.MESSAGE_FORMAT) - HornetQIllegalStateException invalidProperty(String part); + ActiveMQIllegalStateException invalidProperty(String part); @Message(id = 209001, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT) IllegalStateException invalidType(Byte type); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java b/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java index 880536b..472d216 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/PasswordMaskingUtil.java @@ -17,8 +17,8 @@ import java.security.PrivilegedAction; import java.util.HashMap; import java.util.Map; -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; /** * A PasswordMarkingUtil @@ -38,7 +38,7 @@ public class PasswordMaskingUtil * * Where only <full qualified class name> is required. key/value pairs are optional */ - public static SensitiveDataCodec<String> getCodec(String codecDesc) throws HornetQException + public static SensitiveDataCodec<String> getCodec(String codecDesc) throws ActiveMQException { SensitiveDataCodec<String> codecInstance = null; @@ -46,7 +46,7 @@ public class PasswordMaskingUtil String[] parts = codecDesc.split(";"); if (parts.length < 1) - throw new HornetQException(HornetQExceptionType.ILLEGAL_STATE, "Invalid PasswordCodec value: " + codecDesc); + throw new ActiveMQException(ActiveMQExceptionType.ILLEGAL_STATE, "Invalid PasswordCodec value: " + codecDesc); final String codecClassName = parts[0]; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java b/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java index 3593b81..8760f5f 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/TypedProperties.java @@ -20,8 +20,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.activemq.api.core.HornetQBuffer; -import org.apache.activemq.api.core.HornetQPropertyConversionException; +import org.apache.activemq.api.core.ActiveMQBuffer; +import org.apache.activemq.api.core.ActiveMQPropertyConversionException; import org.apache.activemq.api.core.SimpleString; import static org.apache.activemq.utils.DataConstants.BOOLEAN; @@ -168,7 +168,7 @@ public final class TypedProperties return doGetProperty(key); } - public Boolean getBooleanProperty(final SimpleString key) throws HornetQPropertyConversionException + public Boolean getBooleanProperty(final SimpleString key) throws ActiveMQPropertyConversionException { Object value = doGetProperty(key); if (value == null) @@ -185,11 +185,11 @@ public final class TypedProperties } else { - throw new HornetQPropertyConversionException("Invalid conversion"); + throw new ActiveMQPropertyConversionException("Invalid conversion"); } } - public Byte getByteProperty(final SimpleString key) throws HornetQPropertyConversionException + public Byte getByteProperty(final SimpleString key) throws ActiveMQPropertyConversionException { Object value = doGetProperty(key); if (value == null) @@ -206,11 +206,11 @@ public final class TypedProperties } else { - throw new HornetQPropertyConversionException("Invalid conversion"); + throw new ActiveMQPropertyConversionException("Invalid conversion"); } } - public Character getCharProperty(final SimpleString key) throws HornetQPropertyConversionException + public Character getCharProperty(final SimpleString key) throws ActiveMQPropertyConversionException { Object value = doGetProperty(key); if (value == null) @@ -224,11 +224,11 @@ public final class TypedProperties } else { - throw new HornetQPropertyConversionException("Invalid conversion"); + throw new ActiveMQPropertyConversionException("Invalid conversion"); } } - public byte[] getBytesProperty(final SimpleString key) throws HornetQPropertyConversionException + public byte[] getBytesProperty(final SimpleString key) throws ActiveMQPropertyConversionException { Object value = doGetProperty(key); if (value == null) @@ -241,11 +241,11 @@ public final class TypedProperties } else { - throw new HornetQPropertyConversionException("Invalid conversion"); + throw new ActiveMQPropertyConversionException("Invalid conversion"); } } - public Double getDoubleProperty(final SimpleString key) throws HornetQPropertyConversionException + public Double getDoubleProperty(final SimpleString key) throws ActiveMQPropertyConversionException { Object value = doGetProperty(key); if (value == null) @@ -266,11 +266,11 @@ public final class TypedProperties } else { - throw new HornetQPropertyConversionException("Invalid conversion"); + throw new ActiveMQPropertyConversionException("Invalid conversion"); } } - public Integer getIntProperty(final SimpleString key) throws HornetQPropertyConversionException + public Integer getIntProperty(final SimpleString key) throws ActiveMQPropertyConversionException { Object value = doGetProperty(key); if (value == null) @@ -295,11 +295,11 @@ public final class TypedProperties } else { - throw new HornetQPropertyConversionException("Invalid conversion"); + throw new ActiveMQPropertyConversionException("Invalid conversion"); } } - public Long getLongProperty(final SimpleString key) throws HornetQPropertyConversionException + public Long getLongProperty(final SimpleString key) throws ActiveMQPropertyConversionException { Object value = doGetProperty(key); if (value == null) @@ -328,11 +328,11 @@ public final class TypedProperties } else { - throw new HornetQPropertyConversionException("Invalid conversion"); + throw new ActiveMQPropertyConversionException("Invalid conversion"); } } - public Short getShortProperty(final SimpleString key) throws HornetQPropertyConversionException + public Short getShortProperty(final SimpleString key) throws ActiveMQPropertyConversionException { Object value = doGetProperty(key); if (value == null) @@ -353,11 +353,11 @@ public final class TypedProperties } else { - throw new HornetQPropertyConversionException("Invalid Conversion."); + throw new ActiveMQPropertyConversionException("Invalid Conversion."); } } - public Float getFloatProperty(final SimpleString key) throws HornetQPropertyConversionException + public Float getFloatProperty(final SimpleString key) throws ActiveMQPropertyConversionException { Object value = doGetProperty(key); if (value == null) @@ -370,10 +370,10 @@ public final class TypedProperties { return Float.parseFloat(((SimpleString) value).toString()); } - throw new HornetQPropertyConversionException("Invalid conversion: " + key); + throw new ActiveMQPropertyConversionException("Invalid conversion: " + key); } - public SimpleString getSimpleStringProperty(final SimpleString key) throws HornetQPropertyConversionException + public SimpleString getSimpleStringProperty(final SimpleString key) throws ActiveMQPropertyConversionException { Object value = doGetProperty(key); @@ -418,7 +418,7 @@ public final class TypedProperties { return new SimpleString(value.toString()); } - throw new HornetQPropertyConversionException("Invalid conversion"); + throw new ActiveMQPropertyConversionException("Invalid conversion"); } public Object removeProperty(final SimpleString key) @@ -451,7 +451,7 @@ public final class TypedProperties } } - public synchronized void decode(final HornetQBuffer buffer) + public synchronized void decode(final ActiveMQBuffer buffer) { byte b = buffer.readByte(); @@ -554,7 +554,7 @@ public final class TypedProperties } } - public synchronized void encode(final HornetQBuffer buffer) + public synchronized void encode(final ActiveMQBuffer buffer) { if (properties == null) { @@ -741,7 +741,7 @@ public final class TypedProperties { abstract Object getValue(); - abstract void write(HornetQBuffer buffer); + abstract void write(ActiveMQBuffer buffer); abstract int encodeSize(); @@ -765,7 +765,7 @@ public final class TypedProperties } @Override - public void write(final HornetQBuffer buffer) + public void write(final ActiveMQBuffer buffer) { buffer.writeByte(DataConstants.NULL); } @@ -787,7 +787,7 @@ public final class TypedProperties this.val = val; } - public BooleanValue(final HornetQBuffer buffer) + public BooleanValue(final ActiveMQBuffer buffer) { val = buffer.readBoolean(); } @@ -799,7 +799,7 @@ public final class TypedProperties } @Override - public void write(final HornetQBuffer buffer) + public void write(final ActiveMQBuffer buffer) { buffer.writeByte(DataConstants.BOOLEAN); buffer.writeBoolean(val); @@ -822,7 +822,7 @@ public final class TypedProperties this.val = val; } - public ByteValue(final HornetQBuffer buffer) + public ByteValue(final ActiveMQBuffer buffer) { val = buffer.readByte(); } @@ -834,7 +834,7 @@ public final class TypedProperties } @Override - public void write(final HornetQBuffer buffer) + public void write(final ActiveMQBuffer buffer) { buffer.writeByte(DataConstants.BYTE); buffer.writeByte(val); @@ -856,7 +856,7 @@ public final class TypedProperties this.val = val; } - public BytesValue(final HornetQBuffer buffer) + public BytesValue(final ActiveMQBuffer buffer) { int len = buffer.readInt(); val = new byte[len]; @@ -870,7 +870,7 @@ public final class TypedProperties } @Override - public void write(final HornetQBuffer buffer) + public void write(final ActiveMQBuffer buffer) { buffer.writeByte(DataConstants.BYTES); buffer.writeInt(val.length); @@ -894,7 +894,7 @@ public final class TypedProperties this.val = val; } - public ShortValue(final HornetQBuffer buffer) + public ShortValue(final ActiveMQBuffer buffer) { val = buffer.readShort(); } @@ -906,7 +906,7 @@ public final class TypedProperties } @Override - public void write(final HornetQBuffer buffer) + public void write(final ActiveMQBuffer buffer) { buffer.writeByte(DataConstants.SHORT); buffer.writeShort(val); @@ -928,7 +928,7 @@ public final class TypedProperties this.val = val; } - public IntValue(final HornetQBuffer buffer) + public IntValue(final ActiveMQBuffer buffer) { val = buffer.readInt(); } @@ -940,7 +940,7 @@ public final class TypedProperties } @Override - public void write(final HornetQBuffer buffer) + public void write(final ActiveMQBuffer buffer) { buffer.writeByte(DataConstants.INT); buffer.writeInt(val); @@ -962,7 +962,7 @@ public final class TypedProperties this.val = val; } - public LongValue(final HornetQBuffer buffer) + public LongValue(final ActiveMQBuffer buffer) { val = buffer.readLong(); } @@ -974,7 +974,7 @@ public final class TypedProperties } @Override - public void write(final HornetQBuffer buffer) + public void write(final ActiveMQBuffer buffer) { buffer.writeByte(DataConstants.LONG); buffer.writeLong(val); @@ -996,7 +996,7 @@ public final class TypedProperties this.val = val; } - public FloatValue(final HornetQBuffer buffer) + public FloatValue(final ActiveMQBuffer buffer) { val = Float.intBitsToFloat(buffer.readInt()); } @@ -1008,7 +1008,7 @@ public final class TypedProperties } @Override - public void write(final HornetQBuffer buffer) + public void write(final ActiveMQBuffer buffer) { buffer.writeByte(DataConstants.FLOAT); buffer.writeInt(Float.floatToIntBits(val)); @@ -1031,7 +1031,7 @@ public final class TypedProperties this.val = val; } - public DoubleValue(final HornetQBuffer buffer) + public DoubleValue(final ActiveMQBuffer buffer) { val = Double.longBitsToDouble(buffer.readLong()); } @@ -1043,7 +1043,7 @@ public final class TypedProperties } @Override - public void write(final HornetQBuffer buffer) + public void write(final ActiveMQBuffer buffer) { buffer.writeByte(DataConstants.DOUBLE); buffer.writeLong(Double.doubleToLongBits(val)); @@ -1065,7 +1065,7 @@ public final class TypedProperties this.val = val; } - public CharValue(final HornetQBuffer buffer) + public CharValue(final ActiveMQBuffer buffer) { val = (char) buffer.readShort(); } @@ -1077,7 +1077,7 @@ public final class TypedProperties } @Override - public void write(final HornetQBuffer buffer) + public void write(final ActiveMQBuffer buffer) { buffer.writeByte(DataConstants.CHAR); buffer.writeShort((short) val); @@ -1099,7 +1099,7 @@ public final class TypedProperties this.val = val; } - public StringValue(final HornetQBuffer buffer) + public StringValue(final ActiveMQBuffer buffer) { val = buffer.readSimpleString(); } @@ -1111,7 +1111,7 @@ public final class TypedProperties } @Override - public void write(final HornetQBuffer buffer) + public void write(final ActiveMQBuffer buffer) { buffer.writeByte(DataConstants.STRING); buffer.writeSimpleString(val); @@ -1206,7 +1206,7 @@ public final class TypedProperties } else { - throw new HornetQPropertyConversionException(value.getClass() + " is not a valid property type"); + throw new ActiveMQPropertyConversionException(value.getClass() + " is not a valid property type"); } } } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java ---------------------------------------------------------------------- diff --git a/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java b/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java index 40f22b0..a11b0c2 100644 --- a/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java +++ b/activemq-commons/src/main/java/org/apache/activemq/utils/UTF8Util.java @@ -14,7 +14,7 @@ package org.apache.activemq.utils; import java.lang.ref.SoftReference; -import org.apache.activemq.api.core.HornetQBuffer; +import org.apache.activemq.api.core.ActiveMQBuffer; /** * @@ -40,7 +40,7 @@ public final class UTF8Util private static final ThreadLocal<SoftReference<StringUtilBuffer>> currenBuffer = new ThreadLocal<SoftReference<StringUtilBuffer>>(); - public static void saveUTF(final HornetQBuffer out, final String str) + public static void saveUTF(final ActiveMQBuffer out, final String str) { StringUtilBuffer buffer = UTF8Util.getThreadLocalBuffer(); @@ -106,7 +106,7 @@ public final class UTF8Util } } - public static String readUTF(final HornetQBuffer input) + public static String readUTF(final ActiveMQBuffer input) { StringUtilBuffer buffer = UTF8Util.getThreadLocalBuffer(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java index 62f6a4d..ca7a72e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/Interceptor.java @@ -34,7 +34,7 @@ public interface Interceptor * @param connection the connection the packet was received on * @return {@code true} to process the next interceptor and handle the packet, * {@code false} to abort processing of the packet - * @throws HornetQException + * @throws ActiveMQException */ - boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException; + boolean intercept(Packet packet, RemotingConnection connection) throws ActiveMQException; } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.java index 29f47ed..cfabd21 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/Message.java @@ -44,7 +44,7 @@ import org.apache.activemq.utils.UUID; * </pre> * <p> * If conversion is not allowed (for example calling {@code getFloatProperty} on a property set a - * {@code boolean}), a {@link HornetQPropertyConversionException} will be thrown. + * {@code boolean}), a {@link ActiveMQPropertyConversionException} will be thrown. * * @author <a href="mailto:tim....@jboss.com";>Tim Fox</a> * @author <a href="mailto:clebert.suco...@jboss.com";>ClebertSuconic</a> @@ -198,7 +198,7 @@ public interface Message /** * Returns the message body as a HornetQBuffer */ - HornetQBuffer getBodyBuffer(); + ActiveMQBuffer getBodyBuffer(); /** * Writes the input byte array to the message body HornetQBuffer @@ -214,7 +214,7 @@ public interface Message * Returns a <em>copy</em> of the message body as a HornetQBuffer. Any modification * of this buffer should not impact the underlying buffer. */ - HornetQBuffer getBodyBufferCopy(); + ActiveMQBuffer getBodyBufferCopy(); // Properties // ----------------------------------------------------------------- @@ -371,15 +371,15 @@ public interface Message * * @param key property name * @param value property value - * @throws HornetQPropertyConversionException if the value is not one of the accepted property + * @throws ActiveMQPropertyConversionException if the value is not one of the accepted property * types. */ - Message putObjectProperty(SimpleString key, Object value) throws HornetQPropertyConversionException; + Message putObjectProperty(SimpleString key, Object value) throws ActiveMQPropertyConversionException; /** * @see #putObjectProperty(SimpleString, Object) */ - Message putObjectProperty(String key, Object value) throws HornetQPropertyConversionException; + Message putObjectProperty(String key, Object value) throws ActiveMQPropertyConversionException; /** * Removes the property corresponding to the specified key. @@ -410,62 +410,62 @@ public interface Message /** * Returns the property corresponding to the specified key as a Boolean. * - * @throws HornetQPropertyConversionException if the value can not be converted to a Boolean + * @throws ActiveMQPropertyConversionException if the value can not be converted to a Boolean */ - Boolean getBooleanProperty(SimpleString key) throws HornetQPropertyConversionException; + Boolean getBooleanProperty(SimpleString key) throws ActiveMQPropertyConversionException; /** * @see #getBooleanProperty(SimpleString) */ - Boolean getBooleanProperty(String key) throws HornetQPropertyConversionException; + Boolean getBooleanProperty(String key) throws ActiveMQPropertyConversionException; /** * Returns the property corresponding to the specified key as a Byte. * - * @throws HornetQPropertyConversionException if the value can not be converted to a Byte + * @throws ActiveMQPropertyConversionException if the value can not be converted to a Byte */ - Byte getByteProperty(SimpleString key) throws HornetQPropertyConversionException; + Byte getByteProperty(SimpleString key) throws ActiveMQPropertyConversionException; /** * @see #getByteProperty(SimpleString) */ - Byte getByteProperty(String key) throws HornetQPropertyConversionException; + Byte getByteProperty(String key) throws ActiveMQPropertyConversionException; /** * Returns the property corresponding to the specified key as a Double. * - * @throws HornetQPropertyConversionException if the value can not be converted to a Double + * @throws ActiveMQPropertyConversionException if the value can not be converted to a Double */ - Double getDoubleProperty(SimpleString key) throws HornetQPropertyConversionException; + Double getDoubleProperty(SimpleString key) throws ActiveMQPropertyConversionException; /** * @see #getDoubleProperty(SimpleString) */ - Double getDoubleProperty(String key) throws HornetQPropertyConversionException; + Double getDoubleProperty(String key) throws ActiveMQPropertyConversionException; /** * Returns the property corresponding to the specified key as an Integer. * - * @throws HornetQPropertyConversionException if the value can not be converted to an Integer + * @throws ActiveMQPropertyConversionException if the value can not be converted to an Integer */ - Integer getIntProperty(SimpleString key) throws HornetQPropertyConversionException; + Integer getIntProperty(SimpleString key) throws ActiveMQPropertyConversionException; /** * @see #getIntProperty(SimpleString) */ - Integer getIntProperty(String key) throws HornetQPropertyConversionException; + Integer getIntProperty(String key) throws ActiveMQPropertyConversionException; /** * Returns the property corresponding to the specified key as a Long. * - * @throws HornetQPropertyConversionException if the value can not be converted to a Long + * @throws ActiveMQPropertyConversionException if the value can not be converted to a Long */ - Long getLongProperty(SimpleString key) throws HornetQPropertyConversionException; + Long getLongProperty(SimpleString key) throws ActiveMQPropertyConversionException; /** * @see #getLongProperty(SimpleString) */ - Long getLongProperty(String key) throws HornetQPropertyConversionException; + Long getLongProperty(String key) throws ActiveMQPropertyConversionException; /** * Returns the property corresponding to the specified key @@ -480,62 +480,62 @@ public interface Message /** * Returns the property corresponding to the specified key as a Short. * - * @throws HornetQPropertyConversionException if the value can not be converted to a Short + * @throws ActiveMQPropertyConversionException if the value can not be converted to a Short */ - Short getShortProperty(SimpleString key) throws HornetQPropertyConversionException; + Short getShortProperty(SimpleString key) throws ActiveMQPropertyConversionException; /** * @see #getShortProperty(SimpleString) */ - Short getShortProperty(String key) throws HornetQPropertyConversionException; + Short getShortProperty(String key) throws ActiveMQPropertyConversionException; /** * Returns the property corresponding to the specified key as a Float. * - * @throws HornetQPropertyConversionException if the value can not be converted to a Float + * @throws ActiveMQPropertyConversionException if the value can not be converted to a Float */ - Float getFloatProperty(SimpleString key) throws HornetQPropertyConversionException; + Float getFloatProperty(SimpleString key) throws ActiveMQPropertyConversionException; /** * @see #getFloatProperty(SimpleString) */ - Float getFloatProperty(String key) throws HornetQPropertyConversionException; + Float getFloatProperty(String key) throws ActiveMQPropertyConversionException; /** * Returns the property corresponding to the specified key as a String. * - * @throws HornetQPropertyConversionException if the value can not be converted to a String + * @throws ActiveMQPropertyConversionException if the value can not be converted to a String */ - String getStringProperty(SimpleString key) throws HornetQPropertyConversionException; + String getStringProperty(SimpleString key) throws ActiveMQPropertyConversionException; /** * @see #getStringProperty(SimpleString) */ - String getStringProperty(String key) throws HornetQPropertyConversionException; + String getStringProperty(String key) throws ActiveMQPropertyConversionException; /** * Returns the property corresponding to the specified key as a SimpleString. * - * @throws HornetQPropertyConversionException if the value can not be converted to a SimpleString + * @throws ActiveMQPropertyConversionException if the value can not be converted to a SimpleString */ - SimpleString getSimpleStringProperty(SimpleString key) throws HornetQPropertyConversionException; + SimpleString getSimpleStringProperty(SimpleString key) throws ActiveMQPropertyConversionException; /** * @see #getSimpleStringProperty(SimpleString) */ - SimpleString getSimpleStringProperty(String key) throws HornetQPropertyConversionException; + SimpleString getSimpleStringProperty(String key) throws ActiveMQPropertyConversionException; /** * Returns the property corresponding to the specified key as a byte[]. * - * @throws HornetQPropertyConversionException if the value can not be converted to a byte[] + * @throws ActiveMQPropertyConversionException if the value can not be converted to a byte[] */ - byte[] getBytesProperty(SimpleString key) throws HornetQPropertyConversionException; + byte[] getBytesProperty(SimpleString key) throws ActiveMQPropertyConversionException; /** * @see #getBytesProperty(SimpleString) */ - byte[] getBytesProperty(String key) throws HornetQPropertyConversionException; + byte[] getBytesProperty(String key) throws ActiveMQPropertyConversionException; /** * Returns all the names of the properties for this message. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java index d43c6c5..812e2d0 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/TransportConfiguration.java @@ -294,7 +294,7 @@ public class TransportConfiguration implements Serializable * * @param buffer the buffer to encode into */ - public void encode(final HornetQBuffer buffer) + public void encode(final ActiveMQBuffer buffer) { buffer.writeString(name); buffer.writeString(factoryClassName); @@ -344,7 +344,7 @@ public class TransportConfiguration implements Serializable * * @param buffer the buffer to decode from */ - public void decode(final HornetQBuffer buffer) + public void decode(final ActiveMQBuffer buffer) { name = buffer.readString(); factoryClassName = buffer.readString(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.java index e7567bd..e652579 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientConsumer.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.api.core.client; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.spi.core.remoting.ConsumerContext; /** @@ -23,7 +23,7 @@ import org.apache.activemq.spi.core.remoting.ConsumerContext; * by setting a {@link MessageHandler}. * <br> * These 2 types of consumption are exclusive: a ClientConsumer with a MessageHandler set will - * throw HornetQException if its <code>receive()</code> methods are called. + * throw ActiveMQException if its <code>receive()</code> methods are called. * * @author <a href="mailto:tim....@jboss.com";>Tim Fox</a> * @author <a href="mailto:clebert.suco...@jboss.org";>Clebert Suconic</a> @@ -46,23 +46,23 @@ public interface ClientConsumer extends AutoCloseable * <p> * This call will block indefinitely until a message is received. * <p> - * Calling this method on a closed consumer will throw a HornetQException. + * Calling this method on a closed consumer will throw a ActiveMQException. * @return a ClientMessage - * @throws HornetQException if an exception occurs while waiting to receive a message + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while waiting to receive a message */ - ClientMessage receive() throws HornetQException; + ClientMessage receive() throws ActiveMQException; /** * Receives a message from a queue. * <p> * This call will block until a message is received or the given timeout expires. * <p> - * Calling this method on a closed consumer will throw a HornetQException. + * Calling this method on a closed consumer will throw a ActiveMQException. * @param timeout time (in milliseconds) to wait to receive a message * @return a message or {@code null} if the time out expired - * @throws HornetQException if an exception occurs while waiting to receive a message + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while waiting to receive a message */ - ClientMessage receive(long timeout) throws HornetQException; + ClientMessage receive(long timeout) throws ActiveMQException; /** * Receives a message from a queue. This call will force a network trip to HornetQ server to @@ -74,38 +74,38 @@ public interface ClientConsumer extends AutoCloseable * Note however that there is a performance cost as an additional network trip to the server may * required to check the queue status. * <p> - * Calling this method on a closed consumer will throw a HornetQException. + * Calling this method on a closed consumer will throw a ActiveMQException. * @return a message or {@code null} if there are no messages in the queue for this consumer - * @throws HornetQException if an exception occurs while waiting to receive a message + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while waiting to receive a message */ - ClientMessage receiveImmediate() throws HornetQException; + ClientMessage receiveImmediate() throws ActiveMQException; /** * Returns the MessageHandler associated to this consumer. * <p> - * Calling this method on a closed consumer will throw a HornetQException. + * Calling this method on a closed consumer will throw a ActiveMQException. * @return the MessageHandler associated to this consumer or {@code null} - * @throws HornetQException if an exception occurs while getting the MessageHandler + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while getting the MessageHandler */ - MessageHandler getMessageHandler() throws HornetQException; + MessageHandler getMessageHandler() throws ActiveMQException; /** * Sets the MessageHandler for this consumer to consume messages asynchronously. * <p> - * Calling this method on a closed consumer will throw a HornetQException. + * Calling this method on a closed consumer will throw a ActiveMQException. * @param handler a MessageHandler - * @throws HornetQException if an exception occurs while setting the MessageHandler + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while setting the MessageHandler */ - ClientConsumer setMessageHandler(MessageHandler handler) throws HornetQException; + ClientConsumer setMessageHandler(MessageHandler handler) throws ActiveMQException; /** * Closes the consumer. * <p> * Once this consumer is closed, it can not receive messages, whether synchronously or * asynchronously. - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - void close() throws HornetQException; + void close() throws ActiveMQException; /** * Returns whether the consumer is closed or not. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.java index 80dfb2f..bdfabd6 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientMessage.java @@ -15,7 +15,7 @@ package org.apache.activemq.api.core.client; import java.io.InputStream; import java.io.OutputStream; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; @@ -49,10 +49,10 @@ public interface ClientMessage extends Message * If the session responsible to acknowledge this message has {@code autoCommitAcks} set to * {@code true}, the transaction will automatically commit the current transaction. Otherwise, * this acknowledgement will not be committed until the client commits the session transaction. - * @throws HornetQException if an error occurred while acknowledging the message. + * @throws org.apache.activemq.api.core.ActiveMQException if an error occurred while acknowledging the message. * @see ClientSession#isAutoCommitAcks() */ - ClientMessage acknowledge() throws HornetQException; + ClientMessage acknowledge() throws ActiveMQException; /** * Acknowledges reception of a single message. @@ -60,10 +60,10 @@ public interface ClientMessage extends Message * If the session responsible to acknowledge this message has {@code autoCommitAcks} set to * {@code true}, the transaction will automatically commit the current transaction. Otherwise, * this acknowledgement will not be committed until the client commits the session transaction. - * @throws HornetQException if an error occurred while acknowledging the message. + * @throws org.apache.activemq.api.core.ActiveMQException if an error occurred while acknowledging the message. * @see ClientSession#isAutoCommitAcks() */ - ClientMessage individualAcknowledge() throws HornetQException; + ClientMessage individualAcknowledge() throws ActiveMQException; /** * This can be optionally used to verify if the entire message has been received. @@ -71,9 +71,9 @@ public interface ClientMessage extends Message * The use case for this is to make sure there won't be an exception while getting the buffer. * Using getBodyBuffer directly would have the same effect but you could get a Runtime non checked Exception * instead - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - void checkCompletion() throws HornetQException; + void checkCompletion() throws ActiveMQException; /** * Returns the size (in bytes) of this message's body @@ -85,19 +85,19 @@ public interface ClientMessage extends Message * <br> * This method is used when consuming large messages * - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException * @return this ClientMessage */ - ClientMessage setOutputStream(OutputStream out) throws HornetQException; + ClientMessage setOutputStream(OutputStream out) throws ActiveMQException; /** * Saves the content of the message to the OutputStream. * It will block until the entire content is transferred to the OutputStream. * <br> * - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - void saveToOutputStream(OutputStream out) throws HornetQException; + void saveToOutputStream(OutputStream out) throws ActiveMQException; /** * Wait the outputStream completion of the message. @@ -106,9 +106,9 @@ public interface ClientMessage extends Message * * @param timeMilliseconds - 0 means wait forever * @return true if it reached the end - * @throws HornetQException + * @throws org.apache.activemq.api.core.ActiveMQException */ - boolean waitOutputStreamCompletion(long timeMilliseconds) throws HornetQException; + boolean waitOutputStreamCompletion(long timeMilliseconds) throws ActiveMQException; /** * Sets the body's IntputStream. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/1bf2e41f/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java ---------------------------------------------------------------------- diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java index 8b50a5b..d7ef752 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/ClientProducer.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.api.core.client; -import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; @@ -57,9 +57,9 @@ public interface ClientProducer extends AutoCloseable * {@link ServerLocator#setBlockOnNonDurableSend(boolean)} are set to <code>true</code> for the * specified message type. * @param message the message to send - * @throws HornetQException if an exception occurs while sending the message + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message */ - void send(Message message) throws HornetQException; + void send(Message message) throws ActiveMQException; /** * Sends a message to the specified address instead of the ClientProducer's address. <br> @@ -69,9 +69,9 @@ public interface ClientProducer extends AutoCloseable * The handler will only get called if {@link ServerLocator#setConfirmationWindowSize(int) -1}. * @param message the message to send * @param handler handler to call after receiving a SEND acknowledgement from the server - * @throws HornetQException if an exception occurs while sending the message + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message */ - void send(Message message, SendAcknowledgementHandler handler) throws HornetQException; + void send(Message message, SendAcknowledgementHandler handler) throws ActiveMQException; /** * Sends a message to the specified address instead of the ClientProducer's address. <br> @@ -82,9 +82,9 @@ public interface ClientProducer extends AutoCloseable * message type. * @param address the address where the message will be sent * @param message the message to send - * @throws HornetQException if an exception occurs while sending the message + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message */ - void send(SimpleString address, Message message) throws HornetQException; + void send(SimpleString address, Message message) throws ActiveMQException; /** * Sends a message to the specified address instead of the ClientProducer's address. <br> @@ -95,9 +95,9 @@ public interface ClientProducer extends AutoCloseable * @param address the address where the message will be sent * @param message the message to send * @param handler handler to call after receiving a SEND acknowledgement from the server - * @throws HornetQException if an exception occurs while sending the message + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message */ - void send(SimpleString address, Message message, SendAcknowledgementHandler handler) throws HornetQException; + void send(SimpleString address, Message message, SendAcknowledgementHandler handler) throws ActiveMQException; /** * Sends a message to the specified address instead of the ClientProducer's address. <br> @@ -108,16 +108,16 @@ public interface ClientProducer extends AutoCloseable * message type. * @param address the address where the message will be sent * @param message the message to send - * @throws HornetQException if an exception occurs while sending the message + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while sending the message */ - void send(String address, Message message) throws HornetQException; + void send(String address, Message message) throws ActiveMQException; /** * Closes the ClientProducer. If already closed nothing is done. * - * @throws HornetQException if an exception occurs while closing the producer + * @throws org.apache.activemq.api.core.ActiveMQException if an exception occurs while closing the producer */ - void close() throws HornetQException; + void close() throws ActiveMQException; /** * Returns whether the producer is closed or not.
