ARTEMIS-4093 Changes to expose properties and support resource adapter in J2EE environments: fixing logging concatenation
This commit is contained in:
parent
3e50014e0d
commit
d5ecfa26df
|
@ -389,6 +389,10 @@ public class ActiveMQDestination extends JNDIStorable implements Destination, Se
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setSimpleAddress(String address) {
|
||||||
|
setSimpleAddress(new SimpleString(address));
|
||||||
|
}
|
||||||
|
|
||||||
public void delete() throws JMSException {
|
public void delete() throws JMSException {
|
||||||
if (session != null) {
|
if (session != null) {
|
||||||
boolean openedHere = false;
|
boolean openedHere = false;
|
||||||
|
@ -451,6 +455,10 @@ public class ActiveMQDestination extends JNDIStorable implements Destination, Se
|
||||||
return temporary;
|
return temporary;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean getCreated() {
|
||||||
|
return created;
|
||||||
|
}
|
||||||
|
|
||||||
public boolean isCreated() {
|
public boolean isCreated() {
|
||||||
return created;
|
return created;
|
||||||
}
|
}
|
||||||
|
@ -459,6 +467,10 @@ public class ActiveMQDestination extends JNDIStorable implements Destination, Se
|
||||||
this.created = created;
|
this.created = created;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setCreated(String created) {
|
||||||
|
this.created = Boolean.parseBoolean(created);
|
||||||
|
}
|
||||||
|
|
||||||
public TYPE getType() {
|
public TYPE getType() {
|
||||||
if (thetype == null) {
|
if (thetype == null) {
|
||||||
if (temporary) {
|
if (temporary) {
|
||||||
|
|
|
@ -821,6 +821,10 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable {
|
||||||
raProperties.setUseTopologyForLoadBalancing(useTopologyForLoadBalancing);
|
raProperties.setUseTopologyForLoadBalancing(useTopologyForLoadBalancing);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Boolean getUseTopologyForLoadBalancing() {
|
||||||
|
return raProperties.isUseTopologyForLoadBalancing();
|
||||||
|
}
|
||||||
|
|
||||||
public Boolean isUseTopologyForLoadBalancing() {
|
public Boolean isUseTopologyForLoadBalancing() {
|
||||||
return raProperties.isUseTopologyForLoadBalancing();
|
return raProperties.isUseTopologyForLoadBalancing();
|
||||||
}
|
}
|
||||||
|
|
|
@ -793,6 +793,9 @@ public class ActiveMQActivation {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void nodeUP(TopologyMember member, boolean last) {
|
public void nodeUP(TopologyMember member, boolean last) {
|
||||||
|
if (logger.isTraceEnabled()) {
|
||||||
|
logger.trace("nodeUp: {}", member.toURI());
|
||||||
|
}
|
||||||
boolean newNode = false;
|
boolean newNode = false;
|
||||||
|
|
||||||
String id = member.getNodeId();
|
String id = member.getNodeId();
|
||||||
|
@ -813,6 +816,9 @@ public class ActiveMQActivation {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void nodeDown(long eventUID, String nodeID) {
|
public void nodeDown(long eventUID, String nodeID) {
|
||||||
|
if (logger.isTraceEnabled()) {
|
||||||
|
logger.trace("nodeDown: {}", nodeID);
|
||||||
|
}
|
||||||
if (nodes.remove(nodeID)) {
|
if (nodes.remove(nodeID)) {
|
||||||
removedNodes.put(nodeID, eventUID);
|
removedNodes.put(nodeID, eventUID);
|
||||||
ActiveMQRALogger.LOGGER.rebalancingConnections("nodeDown " + nodeID);
|
ActiveMQRALogger.LOGGER.rebalancingConnections("nodeDown " + nodeID);
|
||||||
|
|
|
@ -499,6 +499,36 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
|
||||||
user = value;
|
user = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the userName
|
||||||
|
*
|
||||||
|
* @return The value
|
||||||
|
*/
|
||||||
|
public String getUserName() {
|
||||||
|
if (logger.isTraceEnabled()) {
|
||||||
|
logger.trace("getUserName()");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (user == null) {
|
||||||
|
return ra.getUserName();
|
||||||
|
} else {
|
||||||
|
return user;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set the user
|
||||||
|
*
|
||||||
|
* @param value The value
|
||||||
|
*/
|
||||||
|
public void setUserName(final String value) {
|
||||||
|
if (logger.isTraceEnabled()) {
|
||||||
|
logger.trace("setUserName(" + value + ")");
|
||||||
|
}
|
||||||
|
|
||||||
|
user = value;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the password
|
* Get the password
|
||||||
*
|
*
|
||||||
|
@ -619,6 +649,10 @@ public class ActiveMQActivationSpec extends ConnectionFactoryProperties implemen
|
||||||
this.localTx = localTx;
|
this.localTx = localTx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Boolean getRebalanceConnections() {
|
||||||
|
return rebalanceConnections;
|
||||||
|
}
|
||||||
|
|
||||||
public Boolean isRebalanceConnections() {
|
public Boolean isRebalanceConnections() {
|
||||||
return rebalanceConnections;
|
return rebalanceConnections;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue