INT-1639 Externalize SpEL Evaluation Context

Allow modification of context property accessors and
functions.

Polishing

- Fix tests to ensure the EvaluationContextFactoryBean is
available when necessary.

Polishing - Use Utility for ALL EvaluationContexts

Add Test Showing Custom Function

See SpelTransformerIntegrationTests-context.xml

Polishing

Polishing -fix Remote Sync

Polishing - Emit WARN if No BeanFactory

Polishing - Do Not Override ConversionService

Kludge to Prevent Warning When No BeanFactory

Expressions for method invoking in the MessagingMethodInvokerHelper
don't need a BeanFactory - suppress the warning.

Polishing - PR Comments - Invert Boolean

spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java

@@ -32,16 +32,15 @@ import javax.xml.transform.stream.StreamSource;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.w3c.dom.Document;
 
-import org.springframework.context.expression.MapAccessor;
 import org.springframework.core.io.Resource;
 import org.springframework.expression.Expression;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageHeaders;
 import org.springframework.integration.MessagingException;
+import org.springframework.integration.expression.ExpressionUtils;
 import org.springframework.integration.transformer.AbstractTransformer;
 import org.springframework.integration.xml.result.DomResultFactory;
 import org.springframework.integration.xml.result.ResultFactory;
@@ -84,7 +83,7 @@ public class XsltPayloadTransformer extends AbstractTransformer {
 
 	private final Templates templates;
 
-	private final StandardEvaluationContext evaluationContext = new StandardEvaluationContext();
+	private volatile StandardEvaluationContext evaluationContext;
 
 	private Map<String, Expression> xslParameterMappings;
 
@@ -120,7 +119,6 @@ public class XsltPayloadTransformer extends AbstractTransformer {
 	public XsltPayloadTransformer(Templates templates, ResultTransformer resultTransformer) throws ParserConfigurationException {
 		this.templates = templates;
 		this.resultTransformer = resultTransformer;
-		this.evaluationContext.addPropertyAccessor(new MapAccessor());
 	}
 
 
@@ -163,10 +161,18 @@ public class XsltPayloadTransformer extends AbstractTransformer {
 		this.xsltParamHeaders = xsltParamHeaders;
 	}
 
+	@Override
 	public String getComponentType() {
 		return "xml:xslt-transformer";
 	}
 
+
+	@Override
+	protected void onInit() throws Exception {
+		super.onInit();
+		this.evaluationContext = ExpressionUtils.createStandardEvaluationContext(this.getBeanFactory());
+	}
+
 	@Override
 	protected Object doTransform(Message<?> message) throws Exception {
 		Transformer transformer = buildTransformer(message);

spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java

@@ -17,6 +17,7 @@
 package org.springframework.integration.xml.config;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import javax.xml.transform.dom.DOMResult;
@@ -24,8 +25,6 @@ import javax.xml.transform.dom.DOMResult;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.springframework.integration.support.MessageBuilder;
-import org.springframework.integration.xml.transformer.CustomTestResultFactory;
 import org.w3c.dom.Document;
 
 import org.springframework.context.ApplicationContext;
@@ -34,7 +33,10 @@ import org.springframework.integration.Message;
 import org.springframework.integration.MessageChannel;
 import org.springframework.integration.core.PollableChannel;
 import org.springframework.integration.message.GenericMessage;
+import org.springframework.integration.support.MessageBuilder;
+import org.springframework.integration.test.util.TestUtils;
 import org.springframework.integration.xml.config.StubResultFactory.StubStringResult;
+import org.springframework.integration.xml.transformer.CustomTestResultFactory;
 import org.springframework.integration.xml.util.XmlTestUtil;
 import org.springframework.xml.transform.StringResult;
 
@@ -45,13 +47,12 @@ import org.springframework.xml.transform.StringResult;
  */
 public class XsltPayloadTransformerParserTests {
 
-    private String doc = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?><order><orderItem>test</orderItem></order>";
+    private final String doc = "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?><order><orderItem>test</orderItem></order>";
 
     private ApplicationContext applicationContext;
 
     private PollableChannel output;
 
-
     @Before
     public void setUp() {
         applicationContext = new ClassPathXmlApplicationContext(getClass().getSimpleName() + "-context.xml", getClass());
@@ -68,6 +69,8 @@ public class XsltPayloadTransformerParserTests {
         assertTrue("Payload was not a DOMResult", result.getPayload() instanceof DOMResult);
         Document doc = (Document) ((DOMResult) result.getPayload()).getNode();
         assertEquals("Wrong payload", "test", doc.getDocumentElement().getTextContent());
+        assertNotNull(TestUtils.getPropertyValue(applicationContext.getBean("xsltTransformerWithResource.handler"),
+        		"transformer.evaluationContext.beanResolver"));
     }
 
     @Test