http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java index f05809b..7139f85 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ConnectionFactoryProperties.java @@ -24,7 +24,7 @@ public class ConnectionFactoryProperties /** * Trace enabled */ - private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled(); + private static boolean trace = ActiveMQRALogger.LOGGER.isTraceEnabled(); private boolean hasBeenUpdated = false; @@ -180,7 +180,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getConnectionLoadBalancingPolicyClassName()"); + ActiveMQRALogger.LOGGER.trace("getConnectionLoadBalancingPolicyClassName()"); } return connectionLoadBalancingPolicyClassName; } @@ -189,7 +189,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setSessionDefaultType(" + connectionLoadBalancingPolicyClassName + ")"); + ActiveMQRALogger.LOGGER.trace("setSessionDefaultType(" + connectionLoadBalancingPolicyClassName + ")"); } hasBeenUpdated = true; this.connectionLoadBalancingPolicyClassName = connectionLoadBalancingPolicyClassName; @@ -199,7 +199,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getDiscoveryAddress()"); + ActiveMQRALogger.LOGGER.trace("getDiscoveryAddress()"); } return discoveryAddress; } @@ -208,7 +208,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setDiscoveryAddress(" + discoveryAddress + ")"); + ActiveMQRALogger.LOGGER.trace("setDiscoveryAddress(" + discoveryAddress + ")"); } hasBeenUpdated = true; this.discoveryAddress = discoveryAddress; @@ -218,7 +218,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getDiscoveryPort()"); + ActiveMQRALogger.LOGGER.trace("getDiscoveryPort()"); } return discoveryPort; } @@ -227,7 +227,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setDiscoveryLocalBindAddress(" + discoveryLocalBindAddress + ")"); + ActiveMQRALogger.LOGGER.trace("setDiscoveryLocalBindAddress(" + discoveryLocalBindAddress + ")"); } hasBeenUpdated = true; this.discoveryLocalBindAddress = discoveryLocalBindAddress; @@ -237,7 +237,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getDiscoveryLocalBindAddress()"); + ActiveMQRALogger.LOGGER.trace("getDiscoveryLocalBindAddress()"); } return discoveryLocalBindAddress; } @@ -246,7 +246,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setDiscoveryPort(" + discoveryPort + ")"); + ActiveMQRALogger.LOGGER.trace("setDiscoveryPort(" + discoveryPort + ")"); } hasBeenUpdated = true; this.discoveryPort = discoveryPort; @@ -256,7 +256,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getDiscoveryRefreshTimeout()"); + ActiveMQRALogger.LOGGER.trace("getDiscoveryRefreshTimeout()"); } return discoveryRefreshTimeout; } @@ -265,7 +265,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setDiscoveryRefreshTimeout(" + discoveryRefreshTimeout + ")"); + ActiveMQRALogger.LOGGER.trace("setDiscoveryRefreshTimeout(" + discoveryRefreshTimeout + ")"); } hasBeenUpdated = true; this.discoveryRefreshTimeout = discoveryRefreshTimeout; @@ -275,7 +275,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getDiscoveryInitialWaitTimeout()"); + ActiveMQRALogger.LOGGER.trace("getDiscoveryInitialWaitTimeout()"); } return discoveryInitialWaitTimeout; } @@ -284,7 +284,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setDiscoveryInitialWaitTimeout(" + discoveryInitialWaitTimeout + ")"); + ActiveMQRALogger.LOGGER.trace("setDiscoveryInitialWaitTimeout(" + discoveryInitialWaitTimeout + ")"); } hasBeenUpdated = true; this.discoveryInitialWaitTimeout = discoveryInitialWaitTimeout; @@ -294,7 +294,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getClientID()"); + ActiveMQRALogger.LOGGER.trace("getClientID()"); } return clientID; } @@ -303,7 +303,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setClientID(" + clientID + ")"); + ActiveMQRALogger.LOGGER.trace("setClientID(" + clientID + ")"); } hasBeenUpdated = true; this.clientID = clientID; @@ -324,7 +324,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getDupsOKBatchSize()"); + ActiveMQRALogger.LOGGER.trace("getDupsOKBatchSize()"); } return dupsOKBatchSize; } @@ -333,7 +333,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setDupsOKBatchSize(" + dupsOKBatchSize + ")"); + ActiveMQRALogger.LOGGER.trace("setDupsOKBatchSize(" + dupsOKBatchSize + ")"); } hasBeenUpdated = true; this.dupsOKBatchSize = dupsOKBatchSize; @@ -343,7 +343,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getTransactionBatchSize()"); + ActiveMQRALogger.LOGGER.trace("getTransactionBatchSize()"); } return transactionBatchSize; } @@ -352,7 +352,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setTransactionBatchSize(" + transactionBatchSize + ")"); + ActiveMQRALogger.LOGGER.trace("setTransactionBatchSize(" + transactionBatchSize + ")"); } hasBeenUpdated = true; this.transactionBatchSize = transactionBatchSize; @@ -362,7 +362,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getClientFailureCheckPeriod()"); + ActiveMQRALogger.LOGGER.trace("getClientFailureCheckPeriod()"); } return clientFailureCheckPeriod; } @@ -371,7 +371,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setClientFailureCheckPeriod(" + clientFailureCheckPeriod + ")"); + ActiveMQRALogger.LOGGER.trace("setClientFailureCheckPeriod(" + clientFailureCheckPeriod + ")"); } hasBeenUpdated = true; this.clientFailureCheckPeriod = clientFailureCheckPeriod; @@ -381,7 +381,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getConnectionTTL()"); + ActiveMQRALogger.LOGGER.trace("getConnectionTTL()"); } return connectionTTL; } @@ -390,7 +390,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setConnectionTTL(" + connectionTTL + ")"); + ActiveMQRALogger.LOGGER.trace("setConnectionTTL(" + connectionTTL + ")"); } hasBeenUpdated = true; this.connectionTTL = connectionTTL; @@ -400,7 +400,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getCallTimeout()"); + ActiveMQRALogger.LOGGER.trace("getCallTimeout()"); } return callTimeout; } @@ -409,7 +409,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setCallTimeout(" + callTimeout + ")"); + ActiveMQRALogger.LOGGER.trace("setCallTimeout(" + callTimeout + ")"); } hasBeenUpdated = true; this.callTimeout = callTimeout; @@ -419,7 +419,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getCallFailoverTimeout()"); + ActiveMQRALogger.LOGGER.trace("getCallFailoverTimeout()"); } return callFailoverTimeout; } @@ -428,7 +428,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setCallFailoverTimeout(" + callFailoverTimeout + ")"); + ActiveMQRALogger.LOGGER.trace("setCallFailoverTimeout(" + callFailoverTimeout + ")"); } hasBeenUpdated = true; this.callFailoverTimeout = callFailoverTimeout; @@ -438,7 +438,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getConsumerWindowSize()"); + ActiveMQRALogger.LOGGER.trace("getConsumerWindowSize()"); } return consumerWindowSize; } @@ -447,7 +447,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setConsumerWindowSize(" + consumerWindowSize + ")"); + ActiveMQRALogger.LOGGER.trace("setConsumerWindowSize(" + consumerWindowSize + ")"); } hasBeenUpdated = true; this.consumerWindowSize = consumerWindowSize; @@ -457,7 +457,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getConsumerMaxRate()"); + ActiveMQRALogger.LOGGER.trace("getConsumerMaxRate()"); } return consumerMaxRate; } @@ -466,7 +466,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setConsumerMaxRate(" + consumerMaxRate + ")"); + ActiveMQRALogger.LOGGER.trace("setConsumerMaxRate(" + consumerMaxRate + ")"); } hasBeenUpdated = true; this.consumerMaxRate = consumerMaxRate; @@ -476,7 +476,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getConfirmationWindowSize()"); + ActiveMQRALogger.LOGGER.trace("getConfirmationWindowSize()"); } return confirmationWindowSize; } @@ -485,7 +485,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setConfirmationWindowSize(" + confirmationWindowSize + ")"); + ActiveMQRALogger.LOGGER.trace("setConfirmationWindowSize(" + confirmationWindowSize + ")"); } hasBeenUpdated = true; this.confirmationWindowSize = confirmationWindowSize; @@ -506,7 +506,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getProducerMaxRate()"); + ActiveMQRALogger.LOGGER.trace("getProducerMaxRate()"); } return producerMaxRate; } @@ -515,7 +515,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setProducerMaxRate(" + producerMaxRate + ")"); + ActiveMQRALogger.LOGGER.trace("setProducerMaxRate(" + producerMaxRate + ")"); } hasBeenUpdated = true; this.producerMaxRate = producerMaxRate; @@ -525,7 +525,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getProducerWindowSize()"); + ActiveMQRALogger.LOGGER.trace("getProducerWindowSize()"); } return producerWindowSize; } @@ -534,7 +534,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setProducerWindowSize(" + producerWindowSize + ")"); + ActiveMQRALogger.LOGGER.trace("setProducerWindowSize(" + producerWindowSize + ")"); } hasBeenUpdated = true; this.producerWindowSize = producerWindowSize; @@ -544,7 +544,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getMinLargeMessageSize()"); + ActiveMQRALogger.LOGGER.trace("getMinLargeMessageSize()"); } return minLargeMessageSize; } @@ -553,7 +553,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setMinLargeMessageSize(" + minLargeMessageSize + ")"); + ActiveMQRALogger.LOGGER.trace("setMinLargeMessageSize(" + minLargeMessageSize + ")"); } hasBeenUpdated = true; this.minLargeMessageSize = minLargeMessageSize; @@ -563,7 +563,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("isBlockOnAcknowledge()"); + ActiveMQRALogger.LOGGER.trace("isBlockOnAcknowledge()"); } return blockOnAcknowledge; } @@ -572,7 +572,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setBlockOnAcknowledge(" + blockOnAcknowledge + ")"); + ActiveMQRALogger.LOGGER.trace("setBlockOnAcknowledge(" + blockOnAcknowledge + ")"); } hasBeenUpdated = true; this.blockOnAcknowledge = blockOnAcknowledge; @@ -582,7 +582,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("isBlockOnNonDurableSend()"); + ActiveMQRALogger.LOGGER.trace("isBlockOnNonDurableSend()"); } return blockOnNonDurableSend; } @@ -591,7 +591,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setBlockOnNonDurableSend(" + blockOnNonDurableSend + ")"); + ActiveMQRALogger.LOGGER.trace("setBlockOnNonDurableSend(" + blockOnNonDurableSend + ")"); } hasBeenUpdated = true; this.blockOnNonDurableSend = blockOnNonDurableSend; @@ -601,7 +601,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("isBlockOnDurableSend()"); + ActiveMQRALogger.LOGGER.trace("isBlockOnDurableSend()"); } return blockOnDurableSend; } @@ -610,7 +610,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setBlockOnDurableSend(" + blockOnDurableSend + ")"); + ActiveMQRALogger.LOGGER.trace("setBlockOnDurableSend(" + blockOnDurableSend + ")"); } hasBeenUpdated = true; this.blockOnDurableSend = blockOnDurableSend; @@ -620,7 +620,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("isAutoGroup()"); + ActiveMQRALogger.LOGGER.trace("isAutoGroup()"); } return autoGroup; } @@ -629,7 +629,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setAutoGroup(" + autoGroup + ")"); + ActiveMQRALogger.LOGGER.trace("setAutoGroup(" + autoGroup + ")"); } hasBeenUpdated = true; this.autoGroup = autoGroup; @@ -639,7 +639,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("isPreAcknowledge()"); + ActiveMQRALogger.LOGGER.trace("isPreAcknowledge()"); } return preAcknowledge; } @@ -648,7 +648,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setPreAcknowledge(" + preAcknowledge + ")"); + ActiveMQRALogger.LOGGER.trace("setPreAcknowledge(" + preAcknowledge + ")"); } hasBeenUpdated = true; this.preAcknowledge = preAcknowledge; @@ -658,7 +658,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getRetryInterval()"); + ActiveMQRALogger.LOGGER.trace("getRetryInterval()"); } return retryInterval; } @@ -667,7 +667,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setRetryInterval(" + retryInterval + ")"); + ActiveMQRALogger.LOGGER.trace("setRetryInterval(" + retryInterval + ")"); } hasBeenUpdated = true; this.retryInterval = retryInterval; @@ -677,7 +677,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getRetryIntervalMultiplier()"); + ActiveMQRALogger.LOGGER.trace("getRetryIntervalMultiplier()"); } return retryIntervalMultiplier; } @@ -686,7 +686,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setRetryIntervalMultiplier(" + retryIntervalMultiplier + ")"); + ActiveMQRALogger.LOGGER.trace("setRetryIntervalMultiplier(" + retryIntervalMultiplier + ")"); } hasBeenUpdated = true; this.retryIntervalMultiplier = retryIntervalMultiplier; @@ -707,7 +707,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getReconnectAttempts()"); + ActiveMQRALogger.LOGGER.trace("getReconnectAttempts()"); } return reconnectAttempts; } @@ -716,7 +716,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setReconnectAttempts(" + reconnectAttempts + ")"); + ActiveMQRALogger.LOGGER.trace("setReconnectAttempts(" + reconnectAttempts + ")"); } hasBeenUpdated = true; this.reconnectAttempts = reconnectAttempts; @@ -726,7 +726,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("isUseGlobalPools()"); + ActiveMQRALogger.LOGGER.trace("isUseGlobalPools()"); } return useGlobalPools; } @@ -735,7 +735,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setUseGlobalPools(" + useGlobalPools + ")"); + ActiveMQRALogger.LOGGER.trace("setUseGlobalPools(" + useGlobalPools + ")"); } hasBeenUpdated = true; this.useGlobalPools = useGlobalPools; @@ -745,7 +745,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getScheduledThreadPoolMaxSize()"); + ActiveMQRALogger.LOGGER.trace("getScheduledThreadPoolMaxSize()"); } return scheduledThreadPoolMaxSize; } @@ -754,7 +754,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setScheduledThreadPoolMaxSize(" + scheduledThreadPoolMaxSize + ")"); + ActiveMQRALogger.LOGGER.trace("setScheduledThreadPoolMaxSize(" + scheduledThreadPoolMaxSize + ")"); } hasBeenUpdated = true; this.scheduledThreadPoolMaxSize = scheduledThreadPoolMaxSize; @@ -764,7 +764,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("getThreadPoolMaxSize()"); + ActiveMQRALogger.LOGGER.trace("getThreadPoolMaxSize()"); } return threadPoolMaxSize; } @@ -773,7 +773,7 @@ public class ConnectionFactoryProperties { if (ConnectionFactoryProperties.trace) { - HornetQRALogger.LOGGER.trace("setThreadPoolMaxSize(" + threadPoolMaxSize + ")"); + ActiveMQRALogger.LOGGER.trace("setThreadPoolMaxSize(" + threadPoolMaxSize + ")"); } hasBeenUpdated = true; this.threadPoolMaxSize = threadPoolMaxSize;
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABundle.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABundle.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABundle.java deleted file mode 100644 index 79979b7..0000000 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABundle.java +++ /dev/null @@ -1,70 +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.ra; - - -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; -import org.jboss.logging.Messages; - -import javax.jms.JMSException; -import javax.jms.JMSRuntimeException; -import javax.resource.NotSupportedException; - -/** - * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> - * 3/12/12 - * - * Logger Code 15 - * - * each message id must be 6 digits long starting with 15, the 3rd digit should be 9 - * - * so 159000 to 159999 - */ -@MessageBundle(projectCode = "HQ") -public interface HornetQRABundle -{ - /** Error message for strict behaviour */ - String ISE = "This method is not applicable inside the application server. See the JEE spec, e.g. JEE 7 Section 6.7"; - - HornetQRABundle BUNDLE = Messages.getBundle(HornetQRABundle.class); - - @Message(id = 159000, value = "Error decoding password using codec instance", format = Message.Format.MESSAGE_FORMAT) - ActiveMQIllegalStateException errorDecodingPassword(@Cause Exception e); - - @Message(id = 159001, value = "MDB cannot be deployed as it has no Activation Spec. Please provide an Activation!", format = Message.Format.MESSAGE_FORMAT) - NotSupportedException noActivationSpec(); - - @Message(id = 159002, value = "Please provide a destination for the MDB", format = Message.Format.MESSAGE_FORMAT) - IllegalArgumentException noDestinationName(); - - @Message(id = 159003, value = ISE, format = Message.Format.MESSAGE_FORMAT) - JMSRuntimeException illegalJEEMethod(); - - @Message(id = 159004, value = "Invalid Session Mode SESSION_TRANSACTED", format = Message.Format.MESSAGE_FORMAT) - JMSRuntimeException invalidSessionTransactedModeRuntime(); - - @Message(id = 159005, value = "Invalid Session Mode CLIENT_ACKNOWLEDGE", format = Message.Format.MESSAGE_FORMAT) - JMSRuntimeException invalidClientAcknowledgeModeRuntime(); - - @Message(id = 159006, value = "Invalid Session Mode {0}", format = Message.Format.MESSAGE_FORMAT) - JMSRuntimeException invalidAcknowledgeMode(int sessionMode); - - @Message(id = 159007, value = "Invalid Session Mode SESSION_TRANSACTED", format = Message.Format.MESSAGE_FORMAT) - JMSException invalidSessionTransactedMode(); - - @Message(id = 159008, value = "Invalid Session Mode CLIENT_ACKNOWLEDGE", format = Message.Format.MESSAGE_FORMAT) - JMSException invalidClientAcknowledgeMode(); -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABytesMessage.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABytesMessage.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABytesMessage.java deleted file mode 100644 index a7de0d0..0000000 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRABytesMessage.java +++ /dev/null @@ -1,455 +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.ra; - -import java.util.Arrays; - -import javax.jms.BytesMessage; -import javax.jms.JMSException; - - -/** - * A wrapper for a message - * - * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a> - * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a> - */ -public class HornetQRABytesMessage extends HornetQRAMessage implements BytesMessage -{ - /** Whether trace is enabled */ - private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled(); - - /** - * Create a new wrapper - * @param message the message - * @param session the session - */ - public HornetQRABytesMessage(final BytesMessage message, final HornetQRASession session) - { - super(message, session); - - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("constructor(" + message + ", " + session + ")"); - } - } - - /** - * Get body length - * @return The value - * @exception JMSException Thrown if an error occurs - */ - public long getBodyLength() throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("getBodyLength()"); - } - - return ((BytesMessage)message).getBodyLength(); - } - - /** - * Read - * @return The value - * @exception JMSException Thrown if an error occurs - */ - public boolean readBoolean() throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("readBoolean()"); - } - - return ((BytesMessage)message).readBoolean(); - } - - /** - * Read - * @return The value - * @exception JMSException Thrown if an error occurs - */ - public byte readByte() throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("readByte()"); - } - - return ((BytesMessage)message).readByte(); - } - - /** - * Read - * @param value The value - * @param length The length - * @return The result - * @exception JMSException Thrown if an error occurs - */ - public int readBytes(final byte[] value, final int length) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("readBytes(" + Arrays.toString(value) + ", " + length + ")"); - } - - return ((BytesMessage)message).readBytes(value, length); - } - - /** - * Read - * @param value The value - * @return The result - * @exception JMSException Thrown if an error occurs - */ - public int readBytes(final byte[] value) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("readBytes(" + Arrays.toString(value) + ")"); - } - - return ((BytesMessage)message).readBytes(value); - } - - /** - * Read - * @return The value - * @exception JMSException Thrown if an error occurs - */ - public char readChar() throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("readChar()"); - } - - return ((BytesMessage)message).readChar(); - } - - /** - * Read - * @return The value - * @exception JMSException Thrown if an error occurs - */ - public double readDouble() throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("readDouble()"); - } - - return ((BytesMessage)message).readDouble(); - } - - /** - * Read - * @return The value - * @exception JMSException Thrown if an error occurs - */ - public float readFloat() throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("readFloat()"); - } - - return ((BytesMessage)message).readFloat(); - } - - /** - * Read - * @return The value - * @exception JMSException Thrown if an error occurs - */ - public int readInt() throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("readInt()"); - } - - return ((BytesMessage)message).readInt(); - } - - /** - * Read - * @return The value - * @exception JMSException Thrown if an error occurs - */ - public long readLong() throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("readLong()"); - } - - return ((BytesMessage)message).readLong(); - } - - /** - * Read - * @return The value - * @exception JMSException Thrown if an error occurs - */ - public short readShort() throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("readShort()"); - } - - return ((BytesMessage)message).readShort(); - } - - /** - * Read - * @return The value - * @exception JMSException Thrown if an error occurs - */ - public int readUnsignedByte() throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("readUnsignedByte()"); - } - - return ((BytesMessage)message).readUnsignedByte(); - } - - /** - * Read - * @return The value - * @exception JMSException Thrown if an error occurs - */ - public int readUnsignedShort() throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("readUnsignedShort()"); - } - - return ((BytesMessage)message).readUnsignedShort(); - } - - /** - * Read - * @return The value - * @exception JMSException Thrown if an error occurs - */ - public String readUTF() throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("readUTF()"); - } - - return ((BytesMessage)message).readUTF(); - } - - /** - * Reset - * @exception JMSException Thrown if an error occurs - */ - public void reset() throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("reset()"); - } - - ((BytesMessage)message).reset(); - } - - /** - * Write - * @param value The value - * @exception JMSException Thrown if an error occurs - */ - public void writeBoolean(final boolean value) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("writeBoolean(" + value + ")"); - } - - ((BytesMessage)message).writeBoolean(value); - } - - /** - * Write - * @param value The value - * @exception JMSException Thrown if an error occurs - */ - public void writeByte(final byte value) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("writeByte(" + value + ")"); - } - - ((BytesMessage)message).writeByte(value); - } - - /** - * Write - * @param value The value - * @param offset The offset - * @param length The length - * @exception JMSException Thrown if an error occurs - */ - public void writeBytes(final byte[] value, final int offset, final int length) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("writeBytes(" + Arrays.toString(value) + ", " + offset + ", " + length + ")"); - } - - ((BytesMessage)message).writeBytes(value, offset, length); - } - - /** - * Write - * @param value The value - * @exception JMSException Thrown if an error occurs - */ - public void writeBytes(final byte[] value) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("writeBytes(" + Arrays.toString(value) + ")"); - } - - ((BytesMessage)message).writeBytes(value); - } - - /** - * Write - * @param value The value - * @exception JMSException Thrown if an error occurs - */ - public void writeChar(final char value) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("writeChar(" + value + ")"); - } - - ((BytesMessage)message).writeChar(value); - } - - /** - * Write - * @param value The value - * @exception JMSException Thrown if an error occurs - */ - public void writeDouble(final double value) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("writeDouble(" + value + ")"); - } - - ((BytesMessage)message).writeDouble(value); - } - - /** - * Write - * @param value The value - * @exception JMSException Thrown if an error occurs - */ - public void writeFloat(final float value) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("writeFloat(" + value + ")"); - } - - ((BytesMessage)message).writeFloat(value); - } - - /** - * Write - * @param value The value - * @exception JMSException Thrown if an error occurs - */ - public void writeInt(final int value) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("writeInt(" + value + ")"); - } - - ((BytesMessage)message).writeInt(value); - } - - /** - * Write - * @param value The value - * @exception JMSException Thrown if an error occurs - */ - public void writeLong(final long value) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("writeLong(" + value + ")"); - } - - ((BytesMessage)message).writeLong(value); - } - - /** - * Write - * @param value The value - * @exception JMSException Thrown if an error occurs - */ - public void writeObject(final Object value) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("writeObject(" + value + ")"); - } - - ((BytesMessage)message).writeObject(value); - } - - /** - * Write - * @param value The value - * @exception JMSException Thrown if an error occurs - */ - public void writeShort(final short value) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("writeShort(" + value + ")"); - } - - ((BytesMessage)message).writeShort(value); - } - - /** - * Write - * @param value The value - * @exception JMSException Thrown if an error occurs - */ - public void writeUTF(final String value) throws JMSException - { - if (HornetQRABytesMessage.trace) - { - HornetQRALogger.LOGGER.trace("writeUTF(" + value + ")"); - } - - ((BytesMessage)message).writeUTF(value); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactory.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactory.java deleted file mode 100644 index 662506b..0000000 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactory.java +++ /dev/null @@ -1,65 +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.ra; - -import javax.jms.XAQueueConnectionFactory; -import javax.jms.XATopicConnectionFactory; -import javax.resource.Referenceable; -import javax.resource.ResourceException; -import java.io.Serializable; - -import org.apache.activemq.jms.client.HornetQConnectionFactory; - -/** - * An aggregate interface for the JMS connection factories - * - * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a> - * @author <a href="mailto:jesper.peder...@jboss.com";>Jesper Pedersen</a> - */ -public interface HornetQRAConnectionFactory extends XAQueueConnectionFactory, - XATopicConnectionFactory, Serializable, Referenceable -{ - /** - * Connection factory capable of handling connections - */ - int CONNECTION = 0; - - /** - * Connection factory capable of handling queues - */ - int QUEUE_CONNECTION = 1; - - /** - * Connection factory capable of handling topics - */ - int TOPIC_CONNECTION = 2; - - /** - * Connection factory capable of handling XA connections - */ - int XA_CONNECTION = 3; - - /** - * Connection factory capable of handling XA queues - */ - int XA_QUEUE_CONNECTION = 4; - - /** - * Connection factory capable of handling XA topics - */ - int XA_TOPIC_CONNECTION = 5; - - HornetQConnectionFactory getDefaultFactory() throws ResourceException; - - HornetQResourceAdapter getResourceAdapter(); -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactoryImpl.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactoryImpl.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactoryImpl.java deleted file mode 100644 index f4d7327..0000000 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionFactoryImpl.java +++ /dev/null @@ -1,570 +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.ra; - -import javax.jms.Connection; -import javax.jms.JMSContext; -import javax.jms.JMSException; -import javax.jms.JMSRuntimeException; -import javax.jms.JMSSecurityException; -import javax.jms.JMSSecurityRuntimeException; -import javax.jms.QueueConnection; -import javax.jms.Session; -import javax.jms.TopicConnection; -import javax.jms.XAConnection; -import javax.jms.XAJMSContext; -import javax.jms.XAQueueConnection; -import javax.jms.XATopicConnection; -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.resource.ResourceException; -import javax.resource.spi.ConnectionManager; - -import org.apache.activemq.jms.client.HornetQConnectionFactory; -import org.apache.activemq.jms.referenceable.ConnectionFactoryObjectFactory; -import org.apache.activemq.jms.referenceable.SerializableObjectRefAddr; - -/** - * The connection factory - * - * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a> - * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a> - */ -public class HornetQRAConnectionFactoryImpl implements HornetQRAConnectionFactory -{ - /** - * Serial version UID - */ - static final long serialVersionUID = 7981708919479859360L; - private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled(); - - /** - * The managed connection factory - */ - private final HornetQRAManagedConnectionFactory mcf; - - /** - * The connection manager - */ - private ConnectionManager cm; - - /** - * Naming reference - */ - private Reference reference; - - /** - * Constructor - * - * @param mcf The managed connection factory - * @param cm The connection manager - */ - public HornetQRAConnectionFactoryImpl(final HornetQRAManagedConnectionFactory mcf, final ConnectionManager cm) - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("constructor(" + mcf + ", " + cm + ")"); - } - - this.mcf = mcf; - - if (cm == null) - { - // This is standalone usage, no appserver - this.cm = new HornetQRAConnectionManager(); - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Created new ConnectionManager=" + this.cm); - } - } - else - { - this.cm = cm; - } - - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Using ManagedConnectionFactory=" + mcf + ", ConnectionManager=" + cm); - } - } - - /** - * Set the reference - * - * @param reference The reference - */ - public void setReference(final Reference reference) - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("setReference(" + reference + ")"); - } - - this.reference = reference; - } - - /** - * Get the reference - * - * @return The reference - */ - public Reference getReference() - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("getReference()"); - } - if (reference == null) - { - try - { - reference = new Reference(this.getClass().getCanonicalName(), - new SerializableObjectRefAddr("HornetQ-CF", this), - ConnectionFactoryObjectFactory.class.getCanonicalName(), - null); - } - catch (NamingException e) - { - HornetQRALogger.LOGGER.errorCreatingReference(e); - } - } - - return reference; - - } - - /** - * Create a queue connection - * - * @return The connection - * @throws JMSException Thrown if the operation fails - */ - public QueueConnection createQueueConnection() throws JMSException - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("createQueueConnection()"); - } - - HornetQRASessionFactoryImpl s = new HornetQRASessionFactoryImpl(mcf, - cm, - getResourceAdapter().getTM(), - HornetQRAConnectionFactory.QUEUE_CONNECTION); - - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Created queue connection: " + s); - } - - return s; - } - - /** - * Create a queue connection - * - * @param userName The user name - * @param password The password - * @return The connection - * @throws JMSException Thrown if the operation fails - */ - public QueueConnection createQueueConnection(final String userName, final String password) throws JMSException - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("createQueueConnection(" + userName + ", ****)"); - } - - HornetQRASessionFactoryImpl s = new HornetQRASessionFactoryImpl(mcf, - cm, - getResourceAdapter().getTM(), - HornetQRAConnectionFactory.QUEUE_CONNECTION); - s.setUserName(userName); - s.setPassword(password); - - validateUser(s); - - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Created queue connection: " + s); - } - - return s; - } - - /** - * Create a topic connection - * - * @return The connection - * @throws JMSException Thrown if the operation fails - */ - public TopicConnection createTopicConnection() throws JMSException - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("createTopicConnection()"); - } - - HornetQRASessionFactoryImpl s = new HornetQRASessionFactoryImpl(mcf, - cm, - getResourceAdapter().getTM(), - HornetQRAConnectionFactory.TOPIC_CONNECTION); - - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Created topic connection: " + s); - } - - return s; - } - - /** - * Create a topic connection - * - * @param userName The user name - * @param password The password - * @return The connection - * @throws JMSException Thrown if the operation fails - */ - public TopicConnection createTopicConnection(final String userName, final String password) throws JMSException - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("createTopicConnection(" + userName + ", ****)"); - } - - HornetQRASessionFactoryImpl s = new HornetQRASessionFactoryImpl(mcf, - cm, - getResourceAdapter().getTM(), - HornetQRAConnectionFactory.TOPIC_CONNECTION); - s.setUserName(userName); - s.setPassword(password); - validateUser(s); - - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Created topic connection: " + s); - } - - return s; - } - - /** - * Create a connection - * - * @return The connection - * @throws JMSException Thrown if the operation fails - */ - public Connection createConnection() throws JMSException - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("createConnection()"); - } - - HornetQRASessionFactoryImpl s = new HornetQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), HornetQRAConnectionFactory.CONNECTION); - - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Created connection: " + s); - } - - return s; - } - - /** - * Create a connection - * - * @param userName The user name - * @param password The password - * @return The connection - * @throws JMSException Thrown if the operation fails - */ - public Connection createConnection(final String userName, final String password) throws JMSException - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("createConnection(" + userName + ", ****)"); - } - - HornetQRASessionFactoryImpl s = new HornetQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), HornetQRAConnectionFactory.CONNECTION); - s.setUserName(userName); - s.setPassword(password); - - validateUser(s); - - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Created connection: " + s); - } - - return s; - } - - /** - * Create a XA queue connection - * - * @return The connection - * @throws JMSException Thrown if the operation fails - */ - public XAQueueConnection createXAQueueConnection() throws JMSException - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("createXAQueueConnection()"); - } - - HornetQRASessionFactoryImpl s = new HornetQRASessionFactoryImpl(mcf, - cm, - getResourceAdapter().getTM(), - HornetQRAConnectionFactory.XA_QUEUE_CONNECTION); - - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Created queue connection: " + s); - } - - return s; - } - - /** - * Create a XA queue connection - * - * @param userName The user name - * @param password The password - * @return The connection - * @throws JMSException Thrown if the operation fails - */ - public XAQueueConnection createXAQueueConnection(final String userName, final String password) throws JMSException - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("createXAQueueConnection(" + userName + ", ****)"); - } - - HornetQRASessionFactoryImpl s = new HornetQRASessionFactoryImpl(mcf, - cm, - getResourceAdapter().getTM(), - HornetQRAConnectionFactory.XA_QUEUE_CONNECTION); - s.setUserName(userName); - s.setPassword(password); - validateUser(s); - - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Created queue connection: " + s); - } - - return s; - } - - /** - * Create a XA topic connection - * - * @return The connection - * @throws JMSException Thrown if the operation fails - */ - public XATopicConnection createXATopicConnection() throws JMSException - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("createXATopicConnection()"); - } - - HornetQRASessionFactoryImpl s = new HornetQRASessionFactoryImpl(mcf, - cm, - getResourceAdapter().getTM(), - HornetQRAConnectionFactory.XA_TOPIC_CONNECTION); - - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Created topic connection: " + s); - } - - return s; - } - - /** - * Create a XA topic connection - * - * @param userName The user name - * @param password The password - * @return The connection - * @throws JMSException Thrown if the operation fails - */ - public XATopicConnection createXATopicConnection(final String userName, final String password) throws JMSException - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("createXATopicConnection(" + userName + ", ****)"); - } - - HornetQRASessionFactoryImpl s = new HornetQRASessionFactoryImpl(mcf, - cm, - getResourceAdapter().getTM(), - HornetQRAConnectionFactory.XA_TOPIC_CONNECTION); - s.setUserName(userName); - s.setPassword(password); - validateUser(s); - - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Created topic connection: " + s); - } - - return s; - } - - /** - * Create a XA connection - * - * @return The connection - * @throws JMSException Thrown if the operation fails - */ - public XAConnection createXAConnection() throws JMSException - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("createXAConnection()"); - } - - HornetQRASessionFactoryImpl s = new HornetQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), HornetQRAConnectionFactory.XA_CONNECTION); - - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Created connection: " + s); - } - - return s; - } - - /** - * Create a XA connection - * - * @param userName The user name - * @param password The password - * @return The connection - * @throws JMSException Thrown if the operation fails - */ - public XAConnection createXAConnection(final String userName, final String password) throws JMSException - { - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("createXAConnection(" + userName + ", ****)"); - } - - HornetQRASessionFactoryImpl s = new HornetQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), HornetQRAConnectionFactory.XA_CONNECTION); - s.setUserName(userName); - s.setPassword(password); - validateUser(s); - - if (HornetQRAConnectionFactoryImpl.trace) - { - HornetQRALogger.LOGGER.trace("Created connection: " + s); - } - - return s; - } - - @Override - public JMSContext createContext() - { - return createContext(null, null); - } - - @Override - public JMSContext createContext(String userName, String password) - { - return createContext(userName, password, Session.AUTO_ACKNOWLEDGE); - } - - @Override - public JMSContext createContext(String userName, String password, int sessionMode) - { - @SuppressWarnings("resource") - HornetQRASessionFactoryImpl conn = new HornetQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), HornetQRAConnectionFactory.CONNECTION); - conn.setUserName(userName); - conn.setPassword(password); - try - { - validateUser(conn); - } - catch (JMSSecurityException e) - { - JMSSecurityRuntimeException e2 = new JMSSecurityRuntimeException(e.getMessage()); - e2.initCause(e); - throw e2; - } - catch (JMSException e) - { - JMSRuntimeException e2 = new JMSRuntimeException(e.getMessage()); - e2.initCause(e); - throw e2; - } - return conn.createContext(sessionMode); - } - - @Override - public JMSContext createContext(int sessionMode) - { - return createContext(null, null, sessionMode); - } - - @Override - public XAJMSContext createXAContext() - { - return createXAContext(null, null); - } - - @Override - public XAJMSContext createXAContext(String userName, String password) - { - HornetQRASessionFactoryImpl conn = new HornetQRASessionFactoryImpl(mcf, cm, getResourceAdapter().getTM(), HornetQRAConnectionFactory.XA_CONNECTION); - conn.setUserName(userName); - conn.setPassword(password); - try - { - validateUser(conn); - } - catch (JMSSecurityException e) - { - JMSSecurityRuntimeException e2 = new JMSSecurityRuntimeException(e.getMessage()); - e2.initCause(e); - throw e2; - } - catch (JMSException e) - { - JMSRuntimeException e2 = new JMSRuntimeException(e.getMessage()); - e2.initCause(e); - throw e2; - } - return conn.createXAContext(); - } - - private void validateUser(HornetQRASessionFactoryImpl s) throws JMSException - { - Session session = s.createSession(); - session.close(); - } - - @Override - public HornetQConnectionFactory getDefaultFactory() throws ResourceException - { - return ((HornetQResourceAdapter) mcf.getResourceAdapter()).getDefaultHornetQConnectionFactory(); - } - - @Override - public HornetQResourceAdapter getResourceAdapter() - { - return (HornetQResourceAdapter) mcf.getResourceAdapter(); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionManager.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionManager.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionManager.java deleted file mode 100644 index ee1defe..0000000 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionManager.java +++ /dev/null @@ -1,90 +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.ra; - -import javax.resource.ResourceException; -import javax.resource.spi.ConnectionManager; -import javax.resource.spi.ConnectionRequestInfo; -import javax.resource.spi.ManagedConnection; -import javax.resource.spi.ManagedConnectionFactory; - -import org.apache.activemq.utils.ConcurrentHashSet; - - -/** - * The connection manager used in non-managed environments. - * - * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a> - * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a> - */ -public class HornetQRAConnectionManager implements ConnectionManager -{ - /** Serial version UID */ - static final long serialVersionUID = 4409118162975011014L; - /** Trace enabled */ - private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled(); - - /** - * Constructor - */ - public HornetQRAConnectionManager() - { - if (HornetQRAConnectionManager.trace) - { - HornetQRALogger.LOGGER.trace("constructor()"); - } - } - - ConcurrentHashSet<ManagedConnection> connections = new ConcurrentHashSet<>(); - - /** - * Allocates a connection - * @param mcf The managed connection factory - * @param cxRequestInfo The connection request information - * @return The connection - * @exception ResourceException Thrown if there is a problem obtaining the connection - */ - public Object allocateConnection(final ManagedConnectionFactory mcf, final ConnectionRequestInfo cxRequestInfo) throws ResourceException - { - if (HornetQRAConnectionManager.trace) - { - HornetQRALogger.LOGGER.trace("allocateConnection(" + mcf + ", " + cxRequestInfo + ")"); - } - - ManagedConnection mc = mcf.createManagedConnection(null, cxRequestInfo); - Object c = mc.getConnection(null, cxRequestInfo); - - if (HornetQRAConnectionManager.trace) - { - HornetQRALogger.LOGGER.trace("Allocated connection: " + c + ", with managed connection: " + mc); - } - - connections.add(mc); - return c; - } - - public void stop() - { - for (ManagedConnection conn : connections) - { - try - { - conn.destroy(); - } - catch (Throwable e) - { - - } - } - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionMetaData.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionMetaData.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionMetaData.java deleted file mode 100644 index a34db36..0000000 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionMetaData.java +++ /dev/null @@ -1,153 +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.ra; - -import java.util.Enumeration; -import java.util.Vector; - -import javax.jms.ConnectionMetaData; - - -/** - * This class implements javax.jms.ConnectionMetaData - * - * @author <a href="mailto:adr...@jboss.org";>Adrian Brock</a> - * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a> - */ -public class HornetQRAConnectionMetaData implements ConnectionMetaData -{ - /** Trace enabled */ - private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled(); - - /** - * Constructor - */ - public HornetQRAConnectionMetaData() - { - if (HornetQRAConnectionMetaData.trace) - { - HornetQRALogger.LOGGER.trace("constructor()"); - } - } - - /** - * Get the JMS version - * @return The version - */ - public String getJMSVersion() - { - if (HornetQRAConnectionMetaData.trace) - { - HornetQRALogger.LOGGER.trace("getJMSVersion()"); - } - - return "2.0"; - } - - /** - * Get the JMS major version - * @return The major version - */ - public int getJMSMajorVersion() - { - if (HornetQRAConnectionMetaData.trace) - { - HornetQRALogger.LOGGER.trace("getJMSMajorVersion()"); - } - - return 2; - } - - /** - * Get the JMS minor version - * @return The minor version - */ - public int getJMSMinorVersion() - { - if (HornetQRAConnectionMetaData.trace) - { - HornetQRALogger.LOGGER.trace("getJMSMinorVersion()"); - } - - return 0; - } - - /** - * Get the JMS provider name - * @return The name - */ - public String getJMSProviderName() - { - if (HornetQRAConnectionMetaData.trace) - { - HornetQRALogger.LOGGER.trace("getJMSProviderName()"); - } - - return "HornetQ"; - } - - /** - * Get the provider version - * @return The version - */ - public String getProviderVersion() - { - if (HornetQRAConnectionMetaData.trace) - { - HornetQRALogger.LOGGER.trace("getJMSProviderName()"); - } - - return "2.4"; - } - - /** - * Get the provider major version - * @return The version - */ - public int getProviderMajorVersion() - { - if (HornetQRAConnectionMetaData.trace) - { - HornetQRALogger.LOGGER.trace("getProviderMajorVersion()"); - } - - return 2; - } - - /** - * Get the provider minor version - * @return The version - */ - public int getProviderMinorVersion() - { - if (HornetQRAConnectionMetaData.trace) - { - HornetQRALogger.LOGGER.trace("getProviderMinorVersion()"); - } - - return 4; - } - - /** - * Get the JMS XPropertyNames - * @return The names - */ - public Enumeration<Object> getJMSXPropertyNames() - { - Vector<Object> v = new Vector<Object>(); - v.add("JMSXGroupID"); - v.add("JMSXGroupSeq"); - v.add("JMSXDeliveryCount"); - return v.elements(); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionRequestInfo.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionRequestInfo.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionRequestInfo.java deleted file mode 100644 index 96eea48..0000000 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAConnectionRequestInfo.java +++ /dev/null @@ -1,306 +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.ra; - -import javax.jms.Session; -import javax.resource.spi.ConnectionRequestInfo; - - -/** - * Connection request information - * - * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a> - * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a> - * @author <a href="mailto:andy.tay...@jboss.org";>Andy Taylor</a> - */ -public class HornetQRAConnectionRequestInfo implements ConnectionRequestInfo -{ - /** Trace enabled */ - private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled(); - - /** The user name */ - private String userName; - - /** The password */ - private String password; - - /** The client id */ - private String clientID; - - /** The type */ - private final int type; - - /** Use transactions */ - private final boolean transacted; - - /** The acknowledge mode */ - private final int acknowledgeMode; - - /** - * Constructor - * @param prop The resource adapter properties - * @param type The connection type - */ - public HornetQRAConnectionRequestInfo(final HornetQRAProperties prop, final int type) - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("constructor(" + prop + ")"); - } - - userName = prop.getUserName(); - password = prop.getPassword(); - clientID = prop.getClientID(); - this.type = type; - transacted = true; - acknowledgeMode = Session.AUTO_ACKNOWLEDGE; - } - - /** - * Constructor - * @param transacted Use transactions - * @param acknowledgeMode The acknowledge mode - * @param type The connection type - */ - public HornetQRAConnectionRequestInfo(final boolean transacted, final int acknowledgeMode, final int type) - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("constructor(" + transacted + - ", " + - acknowledgeMode + - ", " + - type + - ")"); - } - - this.transacted = transacted; - this.acknowledgeMode = acknowledgeMode; - this.type = type; - } - - /** - * Fill in default values if they are missing - * @param prop The resource adapter properties - */ - public void setDefaults(final HornetQRAProperties prop) - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("setDefaults(" + prop + ")"); - } - - if (userName == null) - { - userName = prop.getUserName(); - } - if (password == null) - { - password = prop.getPassword(); - } - if (clientID == null) - { - clientID = prop.getClientID(); - } - } - - /** - * Get the user name - * @return The value - */ - public String getUserName() - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("getUserName()"); - } - - return userName; - } - - /** - * Set the user name - * @param userName The value - */ - public void setUserName(final String userName) - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("setUserName(" + userName + ")"); - } - - this.userName = userName; - } - - /** - * Get the password - * @return The value - */ - public String getPassword() - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("getPassword()"); - } - - return password; - } - - /** - * Set the password - * @param password The value - */ - public void setPassword(final String password) - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("setPassword(****)"); - } - - this.password = password; - } - - /** - * Get the client id - * @return The value - */ - public String getClientID() - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("getClientID()"); - } - - return clientID; - } - - /** - * Set the client id - * @param clientID The value - */ - public void setClientID(final String clientID) - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("setClientID(" + clientID + ")"); - } - - this.clientID = clientID; - } - - /** - * Get the connection type - * @return The type - */ - public int getType() - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("getType()"); - } - - return type; - } - - /** - * Use transactions - * @return True if transacted; otherwise false - */ - public boolean isTransacted() - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("isTransacted() " + transacted); - } - - return transacted; - } - - /** - * Get the acknowledge mode - * @return The mode - */ - public int getAcknowledgeMode() - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("getAcknowledgeMode()"); - } - - return acknowledgeMode; - } - - /** - * Indicates whether some other object is "equal to" this one. - * @param obj Object with which to compare - * @return True if this object is the same as the obj argument; false otherwise. - */ - @Override - public boolean equals(final Object obj) - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("equals(" + obj + ")"); - } - - if (obj == null) - { - return false; - } - - if (obj instanceof HornetQRAConnectionRequestInfo) - { - HornetQRAConnectionRequestInfo you = (HornetQRAConnectionRequestInfo)obj; - return HornetQRaUtils.compare(userName, you.getUserName()) && HornetQRaUtils.compare(password, you.getPassword()) && - HornetQRaUtils.compare(clientID, you.getClientID()) && - type == you.getType() && - transacted == you.isTransacted() && - acknowledgeMode == you.getAcknowledgeMode(); - } - else - { - return false; - } - } - - /** - * Return the hash code for the object - * @return The hash code - */ - @Override - public int hashCode() - { - if (HornetQRAConnectionRequestInfo.trace) - { - HornetQRALogger.LOGGER.trace("hashCode()"); - } - - int hash = 7; - - hash += 31 * hash + (userName != null ? userName.hashCode() : 0); - hash += 31 * hash + (password != null ? password.hashCode() : 0); - hash += 31 * hash + Integer.valueOf(type).hashCode(); - hash += 31 * hash + (transacted ? 1 : 0); - hash += 31 * hash + Integer.valueOf(acknowledgeMode).hashCode(); - - return hash; - } - - @Override - public String toString() - { - return "HornetQRAConnectionRequestInfo[type=" + type + - ", transacted=" + transacted + ", acknowledgeMode=" + acknowledgeMode + - ", clientID=" + clientID + ", userName=" + userName + ", password=****]"; - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRACredential.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRACredential.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRACredential.java deleted file mode 100644 index e67055c..0000000 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRACredential.java +++ /dev/null @@ -1,241 +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.ra; - -import java.io.Serializable; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.Set; - -import javax.resource.spi.ConnectionRequestInfo; -import javax.resource.spi.ManagedConnectionFactory; -import javax.resource.spi.SecurityException; -import javax.resource.spi.security.PasswordCredential; -import javax.security.auth.Subject; - - -/** - * Credential information - * - * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a> - * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a> - * @version $Revision: 71554 $ - */ -public class HornetQRACredential implements Serializable -{ - /** Serial version UID */ - static final long serialVersionUID = 210476602237497193L; - - private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled(); - - /** The user name */ - private String userName; - - /** The password */ - private String password; - - /** - * Private constructor - */ - private HornetQRACredential() - { - if (HornetQRACredential.trace) - { - HornetQRALogger.LOGGER.trace("constructor()"); - } - } - - /** - * Get the user name - * @return The value - */ - public String getUserName() - { - if (HornetQRACredential.trace) - { - HornetQRALogger.LOGGER.trace("getUserName()"); - } - - return userName; - } - - /** - * Set the user name - * @param userName The value - */ - private void setUserName(final String userName) - { - if (HornetQRACredential.trace) - { - HornetQRALogger.LOGGER.trace("setUserName(" + userName + ")"); - } - - this.userName = userName; - } - - /** - * Get the password - * @return The value - */ - public String getPassword() - { - if (HornetQRACredential.trace) - { - HornetQRALogger.LOGGER.trace("getPassword()"); - } - - return password; - } - - /** - * Set the password - * @param password The value - */ - private void setPassword(final String password) - { - if (HornetQRACredential.trace) - { - HornetQRALogger.LOGGER.trace("setPassword(****)"); - } - - this.password = password; - } - - /** - * Get credentials - * @param mcf The managed connection factory - * @param subject The subject - * @param info The connection request info - * @return The credentials - * @exception SecurityException Thrown if the credentials can't be retrieved - */ - public static HornetQRACredential getCredential(final ManagedConnectionFactory mcf, - final Subject subject, - final ConnectionRequestInfo info) throws SecurityException - { - if (HornetQRACredential.trace) - { - HornetQRALogger.LOGGER.trace("getCredential(" + mcf + ", " + subject + ", " + info + ")"); - } - - HornetQRACredential jc = new HornetQRACredential(); - if (subject == null && info != null) - { - jc.setUserName(((HornetQRAConnectionRequestInfo)info).getUserName()); - jc.setPassword(((HornetQRAConnectionRequestInfo)info).getPassword()); - } - else if (subject != null) - { - PasswordCredential pwdc = GetCredentialAction.getCredential(subject, mcf); - - if (pwdc == null) - { - throw new SecurityException("No password credentials found"); - } - - jc.setUserName(pwdc.getUserName()); - jc.setPassword(new String(pwdc.getPassword())); - } - else - { - throw new SecurityException("No Subject or ConnectionRequestInfo set, could not get credentials"); - } - - return jc; - } - - /** - * String representation - * @return The representation - */ - @Override - public String toString() - { - if (HornetQRACredential.trace) - { - HornetQRALogger.LOGGER.trace("toString()"); - } - - return super.toString() + "{ username=" + userName + ", password=**** }"; - } - - /** - * Privileged class to get credentials - */ - private static class GetCredentialAction implements PrivilegedAction<PasswordCredential> - { - /** The subject */ - private final Subject subject; - - /** The managed connection factory */ - private final ManagedConnectionFactory mcf; - - /** - * Constructor - * @param subject The subject - * @param mcf The managed connection factory - */ - GetCredentialAction(final Subject subject, final ManagedConnectionFactory mcf) - { - if (HornetQRACredential.trace) - { - HornetQRALogger.LOGGER.trace("constructor(" + subject + ", " + mcf + ")"); - } - - this.subject = subject; - this.mcf = mcf; - } - - /** - * Run - * @return The credential - */ - public PasswordCredential run() - { - if (HornetQRACredential.trace) - { - HornetQRALogger.LOGGER.trace("run()"); - } - - Set<PasswordCredential> creds = subject.getPrivateCredentials(PasswordCredential.class); - PasswordCredential pwdc = null; - - for (PasswordCredential curCred : creds) - { - if (curCred.getManagedConnectionFactory().equals(mcf)) - { - pwdc = curCred; - break; - } - } - return pwdc; - } - - /** - * Get credentials - * @param subject The subject - * @param mcf The managed connection factory - * @return The credential - */ - static PasswordCredential getCredential(final Subject subject, final ManagedConnectionFactory mcf) - { - if (HornetQRACredential.trace) - { - HornetQRALogger.LOGGER.trace("getCredential(" + subject + ", " + mcf + ")"); - } - - GetCredentialAction action = new GetCredentialAction(subject, mcf); - return AccessController.doPrivileged(action); - } - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAJMSContext.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAJMSContext.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAJMSContext.java deleted file mode 100644 index 9185ac3..0000000 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRAJMSContext.java +++ /dev/null @@ -1,57 +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.ra; - -import org.apache.activemq.jms.client.HornetQConnectionForContext; -import org.apache.activemq.jms.client.HornetQJMSContext; -import org.apache.activemq.jms.client.ThreadAwareContext; - -import javax.jms.ExceptionListener; -import javax.jms.JMSContext; - -public class HornetQRAJMSContext extends HornetQJMSContext -{ - public HornetQRAJMSContext(HornetQConnectionForContext connection, int ackMode, ThreadAwareContext threadAwareContext) - { - super(connection, ackMode, threadAwareContext); - } - - public HornetQRAJMSContext(HornetQConnectionForContext connection, ThreadAwareContext threadAwareContext) - { - super(connection, threadAwareContext); - } - - @Override - public JMSContext createContext(int sessionMode) - { - throw HornetQRABundle.BUNDLE.illegalJEEMethod(); - } - - @Override - public void stop() - { - throw HornetQRABundle.BUNDLE.illegalJEEMethod(); - } - - @Override - public void setClientID(String clientID) - { - throw HornetQRABundle.BUNDLE.illegalJEEMethod(); - } - - @Override - public void setExceptionListener(ExceptionListener listener) - { - throw HornetQRABundle.BUNDLE.illegalJEEMethod(); - } -} http://git-wip-us.apache.org/repos/asf/activemq-6/blob/034adfbf/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALocalTransaction.java ---------------------------------------------------------------------- diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALocalTransaction.java b/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALocalTransaction.java deleted file mode 100644 index bb67f34..0000000 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/HornetQRALocalTransaction.java +++ /dev/null @@ -1,121 +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.ra; - -import javax.jms.JMSException; -import javax.resource.ResourceException; -import javax.resource.spi.LocalTransaction; - - -/** - * JMS Local transaction - * - * @author <a href="mailto:adr...@jboss.com";>Adrian Brock</a> - * @author <a href="mailto:jesper.peder...@jboss.org";>Jesper Pedersen</a> - */ -public class HornetQRALocalTransaction implements LocalTransaction -{ - /** Trace enabled */ - private static boolean trace = HornetQRALogger.LOGGER.isTraceEnabled(); - - /** The managed connection */ - private final HornetQRAManagedConnection mc; - - /** - * Constructor - * @param mc The managed connection - */ - public HornetQRALocalTransaction(final HornetQRAManagedConnection mc) - { - if (HornetQRALocalTransaction.trace) - { - HornetQRALogger.LOGGER.trace("constructor(" + mc + ")"); - } - - this.mc = mc; - } - - /** - * Begin - * @exception ResourceException Thrown if the operation fails - */ - public void begin() throws ResourceException - { - if (HornetQRALocalTransaction.trace) - { - HornetQRALogger.LOGGER.trace("begin()"); - } - - // mc.setInManagedTx(true); - } - - /** - * Commit - * @exception ResourceException Thrown if the operation fails - */ - public void commit() throws ResourceException - { - if (HornetQRALocalTransaction.trace) - { - HornetQRALogger.LOGGER.trace("commit()"); - } - - mc.lock(); - try - { - if (mc.getSession().getTransacted()) - { - mc.getSession().commit(); - } - } - catch (JMSException e) - { - throw new ResourceException("Could not commit LocalTransaction", e); - } - finally - { - //mc.setInManagedTx(false); - mc.unlock(); - } - } - - /** - * Rollback - * @exception ResourceException Thrown if the operation fails - */ - public void rollback() throws ResourceException - { - if (HornetQRALocalTransaction.trace) - { - HornetQRALogger.LOGGER.trace("rollback()"); - } - - mc.lock(); - try - { - if (mc.getSession().getTransacted()) - { - mc.getSession().rollback(); - } - } - catch (JMSException ex) - { - throw new ResourceException("Could not rollback LocalTransaction", ex); - } - finally - { - //mc.setInManagedTx(false); - mc.unlock(); - } - } -}
