Removed 'XmlPayload' from the names of 'XmlPayloadUnmarshallingTransformer' and 'XmlPayloadMarshallingTransformer' since the former can now return a Message instance and the latter now accepts a boolean to specify whether only the payload should be passed to the marshaller or the entire Message.

org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/IntegrationXmlNamespaceHandler.java

@@ -24,8 +24,8 @@ import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHa
 public class IntegrationXmlNamespaceHandler extends AbstractIntegrationNamespaceHandler {
 
 	public void init() {
-		registerBeanDefinitionParser("marshalling-transformer", new XmlMarshallingTransformerParser());
-		registerBeanDefinitionParser("unmarshalling-transformer", new XmlUnmarshallingTransformerParser());
+		registerBeanDefinitionParser("marshalling-transformer", new MarshallingTransformerParser());
+		registerBeanDefinitionParser("unmarshalling-transformer", new UnmarshallingTransformerParser());
 		registerBeanDefinitionParser("xslt-transformer", new XsltPayloadTransformerParser());
 		registerBeanDefinitionParser("xpath-router", new XPathRouterParser());
 		registerBeanDefinitionParser("xpath-selector", new XPathSelectorParser());

org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/MarshallingTransformerParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,11 +28,11 @@ import org.springframework.util.StringUtils;
  * @author Jonas Partner
  * @author Mark Fisher
  */
-public class XmlMarshallingTransformerParser extends AbstractTransformerParser {
+public class MarshallingTransformerParser extends AbstractTransformerParser {
 
 	@Override
 	protected String getTransformerClassName() {
-		return "org.springframework.integration.xml.transformer.XmlPayloadMarshallingTransformer";
+		return "org.springframework.integration.xml.transformer.MarshallingTransformer";
 	}
 
 	@Override

org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/config/UnmarshallingTransformerParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,11 +27,11 @@ import org.springframework.util.Assert;
  * @author Jonas Partner
  * @author Mark Fisher
  */
-public class XmlUnmarshallingTransformerParser extends AbstractTransformerParser {
+public class UnmarshallingTransformerParser extends AbstractTransformerParser {
 
 	@Override
 	protected String getTransformerClassName() {
-		return "org.springframework.integration.xml.transformer.XmlPayloadUnmarshallingTransformer";
+		return "org.springframework.integration.xml.transformer.UnmarshallingTransformer";
 	}
 
 	@Override

org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/MarshallingTransformer.java

@@ -35,7 +35,7 @@ import org.springframework.util.Assert;
  * @author Mark Fisher
  * @author Jonas Partner
  */
-public class XmlPayloadMarshallingTransformer extends AbstractTransformer {
+public class MarshallingTransformer extends AbstractTransformer {
 
 	private final Marshaller marshaller;
 
@@ -46,7 +46,7 @@ public class XmlPayloadMarshallingTransformer extends AbstractTransformer {
 	private volatile boolean extractPayload = true;
 
 
-	public XmlPayloadMarshallingTransformer(Marshaller marshaller, ResultTransformer resultTransformer)
+	public MarshallingTransformer(Marshaller marshaller, ResultTransformer resultTransformer)
 			throws ParserConfigurationException {
 		Assert.notNull(marshaller, "a marshaller is required");
 		this.marshaller = marshaller;
@@ -54,7 +54,7 @@ public class XmlPayloadMarshallingTransformer extends AbstractTransformer {
 		this.resultFactory = new DomResultFactory();
 	}
 
-	public XmlPayloadMarshallingTransformer(Marshaller marshaller) throws ParserConfigurationException {
+	public MarshallingTransformer(Marshaller marshaller) throws ParserConfigurationException {
 		this(marshaller, null);
 	}
 

org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java

@@ -47,7 +47,7 @@ import org.springframework.xml.transform.StringSource;
  * 
  * @author Jonas Partner
  */
-public class XmlPayloadUnmarshallingTransformer extends AbstractPayloadTransformer<Object, Object> {
+public class UnmarshallingTransformer extends AbstractPayloadTransformer<Object, Object> {
 
 	private volatile boolean alwaysUseSourceFactory = false;
 
@@ -56,7 +56,7 @@ public class XmlPayloadUnmarshallingTransformer extends AbstractPayloadTransform
 	private volatile SourceFactory sourceFactory = new DomSourceFactory();
 
 
-	public XmlPayloadUnmarshallingTransformer(Unmarshaller unmarshaller) {
+	public UnmarshallingTransformer(Unmarshaller unmarshaller) {
 		this.unmarshaller = unmarshaller;
 	}
 

org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/MarshallingTransformerTests.java

@@ -38,12 +38,12 @@ import org.springframework.xml.transform.StringResult;
 /**
  * @author Mark Fisher
  */
-public class XmlPayloadMarshallingTransformerTests {
+public class MarshallingTransformerTests {
 
 	@Test
 	public void testStringToStringResult() throws Exception {
 		TestMarshaller marshaller = new TestMarshaller();
-		XmlPayloadMarshallingTransformer transformer = new XmlPayloadMarshallingTransformer(marshaller);
+		MarshallingTransformer transformer = new MarshallingTransformer(marshaller);
 		transformer.setResultFactory(new StringResultFactory());
 		Message<?> resultMessage = transformer.transform(new StringMessage("world"));
 		Object resultPayload = resultMessage.getPayload();
@@ -55,7 +55,7 @@ public class XmlPayloadMarshallingTransformerTests {
 	@Test
 	public void testDefaultResultFactory() throws Exception {
 		TestMarshaller marshaller = new TestMarshaller();
-		XmlPayloadMarshallingTransformer transformer = new XmlPayloadMarshallingTransformer(marshaller);
+		MarshallingTransformer transformer = new MarshallingTransformer(marshaller);
 		Message<?> resultMessage = transformer.transform(new StringMessage("world"));
 		Object resultPayload = resultMessage.getPayload();
 		assertEquals(DOMResult.class, resultPayload.getClass());
@@ -65,7 +65,7 @@ public class XmlPayloadMarshallingTransformerTests {
 	@Test
 	public void testMarshallingEntireMessage() throws Exception {
 		TestMarshaller marshaller = new TestMarshaller();
-		XmlPayloadMarshallingTransformer transformer = new XmlPayloadMarshallingTransformer(marshaller);
+		MarshallingTransformer transformer = new MarshallingTransformer(marshaller);
 		transformer.setExtractPayload(false);
 		Message<?> message = new StringMessage("test");
 		transformer.transform(message);

org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java

@@ -36,12 +36,12 @@ import org.springframework.xml.transform.StringSource;
  * @author Jonas Partner
  * @author Mark Fisher
  */
-public class XmlPayloadUnmarshallingTransformerTests {
+public class UnmarshallingTransformerTests {
 
 	@Test
 	public void testStringSourceToString() {
 		Unmarshaller unmarshaller = new TestUnmarshaller(false);
-		XmlPayloadUnmarshallingTransformer transformer = new XmlPayloadUnmarshallingTransformer(unmarshaller);
+		UnmarshallingTransformer transformer = new UnmarshallingTransformer(unmarshaller);
 		Object transformed = transformer.transformPayload(new StringSource("world"));
 		assertEquals(String.class, transformed.getClass());
 		assertEquals("hello world", transformed.toString());
@@ -50,7 +50,7 @@ public class XmlPayloadUnmarshallingTransformerTests {
 	@Test
 	public void testMessageReturnValue() {
 		Unmarshaller unmarshaller = new TestUnmarshaller(true);
-		XmlPayloadUnmarshallingTransformer transformer = new XmlPayloadUnmarshallingTransformer(unmarshaller);
+		UnmarshallingTransformer transformer = new UnmarshallingTransformer(unmarshaller);
 		Object transformed = transformer.transformPayload(new StringSource("foo"));
 		assertEquals(StringMessage.class, transformed.getClass());
 		assertEquals("message: foo", ((StringMessage) transformed).getPayload());
@@ -59,7 +59,7 @@ public class XmlPayloadUnmarshallingTransformerTests {
 	@Test
 	public void testMessageReturnValueFromTopLevel() {
 		Unmarshaller unmarshaller = new TestUnmarshaller(true);
-		XmlPayloadUnmarshallingTransformer transformer = new XmlPayloadUnmarshallingTransformer(unmarshaller);
+		UnmarshallingTransformer transformer = new UnmarshallingTransformer(unmarshaller);
 		Message<?> result = transformer.transform(MessageBuilder.withPayload(new StringSource("bar")).build());
 		assertNotNull(result);
 		assertEquals("message: bar", result.getPayload());