INT-1263, more MessageHistory related changes

spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java

@@ -50,6 +50,7 @@ public class ChannelPublishingJmsMessageListener extends MessagingGatewaySupport
 		implements SessionAwareMessageListener<javax.jms.Message>, InitializingBean {
 	
 	private volatile boolean expectReply;
+	private volatile String componentType = "jms:inbound-gateway";
 
 	private volatile MessageConverter messageConverter = new SimpleMessageConverter();
 
@@ -72,9 +73,11 @@ public class ChannelPublishingJmsMessageListener extends MessagingGatewaySupport
 	private volatile JmsHeaderMapper headerMapper = new DefaultJmsHeaderMapper();
 	
 	public String getComponentType(){
-		return "jms:inbound-gateway";
+		return componentType;
+	}
+	void setComponentType(String componentType){
+		this.componentType = componentType;
 	}
-
 	/**
 	 * Specify whether a JMS reply Message is expected.
 	 */

spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsMessageDrivenEndpoint.java

@@ -54,6 +54,7 @@ public class JmsMessageDrivenEndpoint extends AbstractEndpoint implements Dispos
 			this.listenerContainer.afterPropertiesSet();
 		}
 		listener.setComponentName(this.getComponentName());
+		listener.setComponentType("jms:message-driven-channel-adapter");
 	}
 
 	@Override
@@ -74,5 +75,9 @@ public class JmsMessageDrivenEndpoint extends AbstractEndpoint implements Dispos
 		}
 		this.listenerContainer.destroy();
 	}
+	
+	public String getComponetType(){
+		return "jms:message-driven-channel-adapter";
+	}
 
 }