Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55 from dturanski/scripting-name-changes

Browse Source 
* scripting-name-changes:
  Removed Jsr223 from classnames
This commit is contained in:
Mark Fisher
2011-09-02 12:18:53 -04:00
parent 4556a870f3 3d683b6134
commit 10efd1c844
8 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/fork/ForkUtil.java
View File

@@ -102,9 +102,17 @@ public class ForkUtil {
return proc.getOutputStream();
}
public static OutputStream cacheServer() {
String className = "org.springframework.integration.gemfire.fork.CacheServerProcess";
return startCacheServer("org.springframework.integration.gemfire.fork.CacheServerProcess");
}
public static OutputStream cacheServer(String className) {
return startCacheServer(className);
}
private static OutputStream startCacheServer(String className) {
if (controlFileExists(className)) {
deleteControlFile(className);
}

4
spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/jsr223/Jsr223NamespaceHandler.java → spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/jsr223/ScriptNamespaceHandler.java
View File

@@ -22,10 +22,10 @@ import org.springframework.integration.config.xml.AbstractIntegrationNamespaceHa
* @author David Turanski
* @since 2.1
*/
public class Jsr223NamespaceHandler extends AbstractIntegrationNamespaceHandler {
public class ScriptNamespaceHandler extends AbstractIntegrationNamespaceHandler {
public void init() {
this.registerBeanDefinitionParser("script", new Jsr223ScriptParser());
this.registerBeanDefinitionParser("script", new ScriptParser());
}
}

8
spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/jsr223/Jsr223ScriptParser.java → spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/jsr223/ScriptParser.java
View File

@@ -19,7 +19,7 @@ package org.springframework.integration.scripting.config.jsr223;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.integration.config.xml.AbstractScriptParser;
import org.springframework.integration.scripting.jsr223.Jsr223ScriptExecutor;
import org.springframework.integration.scripting.jsr223.DefaultScriptExecutor;
import org.springframework.util.Assert;
import org.w3c.dom.Element;
@@ -27,13 +27,13 @@ import org.w3c.dom.Element;
* @author David Turanski
* @since 2.1
*/
public class Jsr223ScriptParser extends AbstractScriptParser {
public class ScriptParser extends AbstractScriptParser {
private static final String LANGUAGE_ATTRIBUTE = "lang";
@Override
protected String getBeanClassName(Element element) {
return "org.springframework.integration.scripting.jsr223.Jsr223ScriptExecutingMessageProcessor";
return "org.springframework.integration.scripting.jsr223.ScriptExecutingMessageProcessor";
}
/* (non-Javadoc)
@@ -47,7 +47,7 @@ public class Jsr223ScriptParser extends AbstractScriptParser {
protected void postProcess(BeanDefinitionBuilder builder, Element element, ParserContext parserContext){
String language = element.getAttribute(LANGUAGE_ATTRIBUTE);
Assert.hasLength(language, "Attribute " + LANGUAGE_ATTRIBUTE + " is required");
builder.addConstructorArgValue(new Jsr223ScriptExecutor(language));
builder.addConstructorArgValue(new DefaultScriptExecutor(language));
}

6
spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutor.java → spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/DefaultScriptExecutor.java
View File

@@ -29,15 +29,15 @@ import org.springframework.util.Assert;
* @author David Turanski
* @since 2.1
*/
public class Jsr223ScriptExecutor implements ScriptExecutor {
private static Log log = LogFactory.getLog(Jsr223ScriptExecutor.class);
public class DefaultScriptExecutor implements ScriptExecutor {
private static Log log = LogFactory.getLog(DefaultScriptExecutor.class);
private final ScriptEngine scriptEngine;
/**
* Set the engine name (language)
* @param language
*/
public Jsr223ScriptExecutor(String language) {
public DefaultScriptExecutor(String language) {
ScriptEngineManager manager = new ScriptEngineManager();
if (log.isDebugEnabled()){
for (ScriptEngineFactory factory: manager.getEngineFactories()) {

10
spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutingMessageProcessor.java → spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/ScriptExecutingMessageProcessor.java
View File

@@ -26,9 +26,9 @@ import org.springframework.util.Assert;
* @author David Turanski
* @since 2.1
*/
public class Jsr223ScriptExecutingMessageProcessor extends AbstractScriptExecutingMessageProcessor<Object> {
public class ScriptExecutingMessageProcessor extends AbstractScriptExecutingMessageProcessor<Object> {
private final Jsr223ScriptExecutor scriptExecutor;
private final DefaultScriptExecutor scriptExecutor;
private volatile ScriptSource scriptSource;
@@ -37,7 +37,7 @@ public class Jsr223ScriptExecutingMessageProcessor extends AbstractScriptExecuti
* @param scriptSource
* @param scriptExecutor
*/
public Jsr223ScriptExecutingMessageProcessor(ScriptSource scriptSource, Jsr223ScriptExecutor scriptExecutor) {
public ScriptExecutingMessageProcessor(ScriptSource scriptSource, DefaultScriptExecutor scriptExecutor) {
super();
this.scriptSource = scriptSource;
this.scriptExecutor = scriptExecutor;
@@ -48,7 +48,7 @@ public class Jsr223ScriptExecutingMessageProcessor extends AbstractScriptExecuti
* @param scriptSource
* @param scriptExecutor
*/
public Jsr223ScriptExecutingMessageProcessor(ScriptSource scriptSource, ScriptVariableGenerator scriptVariableGenerator,Jsr223ScriptExecutor scriptExecutor) {
public ScriptExecutingMessageProcessor(ScriptSource scriptSource, ScriptVariableGenerator scriptVariableGenerator,DefaultScriptExecutor scriptExecutor) {
super(scriptVariableGenerator);
this.scriptSource = scriptSource;
this.scriptExecutor = scriptExecutor;
@@ -60,7 +60,7 @@ public class Jsr223ScriptExecutingMessageProcessor extends AbstractScriptExecuti
* @param scriptExecutor
* @param variables
*/
public Jsr223ScriptExecutingMessageProcessor(ScriptSource scriptSource,Jsr223ScriptExecutor scriptExecutor,Map<String,Object> variables ) {
public ScriptExecutingMessageProcessor(ScriptSource scriptSource,DefaultScriptExecutor scriptExecutor,Map<String,Object> variables ) {
super(new DefaultScriptVariableGenerator(variables));
this.scriptSource = scriptSource;
this.scriptExecutor = scriptExecutor;

2
spring-integration-scripting/src/main/resources/META-INF/spring.handlers
View File

@@ -1 +1 @@
http\://www.springframework.org/schema/integration/script=org.springframework.integration.scripting.config.jsr223.Jsr223NamespaceHandler
http\://www.springframework.org/schema/integration/script=org.springframework.integration.scripting.config.jsr223.ScriptNamespaceHandler

12
spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutingMessageProcessorTests.java
View File

@@ -22,8 +22,8 @@ import org.junit.Test;
import org.springframework.core.io.ClassPathResource;
import org.springframework.integration.Message;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.scripting.jsr223.Jsr223ScriptExecutingMessageProcessor;
import org.springframework.integration.scripting.jsr223.Jsr223ScriptExecutor;
import org.springframework.integration.scripting.jsr223.ScriptExecutingMessageProcessor;
import org.springframework.integration.scripting.jsr223.DefaultScriptExecutor;
import org.springframework.scripting.ScriptSource;
import org.springframework.scripting.support.ResourceScriptSource;
@@ -32,10 +32,10 @@ import org.springframework.scripting.support.ResourceScriptSource;
*
*/
public class Jsr223ScriptExecutingMessageProcessorTests {
Jsr223ScriptExecutor executor;
DefaultScriptExecutor executor;
@Before
public void setUp() {
executor = new Jsr223ScriptExecutor("jruby");
executor = new DefaultScriptExecutor("jruby");
}
@Test
public void testExecuteWithVariables(){
@@ -48,7 +48,7 @@ public class Jsr223ScriptExecutingMessageProcessorTests {
ScriptSource scriptSource = new ResourceScriptSource(new ClassPathResource("/org/springframework/integration/scripting/jsr223/print_message.rb"));
Jsr223ScriptExecutingMessageProcessor messageProcessor = new Jsr223ScriptExecutingMessageProcessor(scriptSource,executor,vars);
ScriptExecutingMessageProcessor messageProcessor = new ScriptExecutingMessageProcessor(scriptSource,executor,vars);
Message<?> message = new GenericMessage<String>("hello");
@@ -61,7 +61,7 @@ public class Jsr223ScriptExecutingMessageProcessorTests {
public void testWithNoVars(){
ScriptSource scriptSource = new ResourceScriptSource(new ClassPathResource("/org/springframework/integration/scripting/jsr223/print_message.rb"));
Jsr223ScriptExecutingMessageProcessor messageProcessor = new Jsr223ScriptExecutingMessageProcessor(scriptSource,executor);
ScriptExecutingMessageProcessor messageProcessor = new ScriptExecutingMessageProcessor(scriptSource,executor);
Message<?> message = new GenericMessage<String>("hello");

6
spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutorTests.java
View File

@@ -20,7 +20,7 @@ import java.util.Map;
import org.junit.Test;
import org.springframework.core.io.ClassPathResource;
import org.springframework.integration.scripting.ScriptExecutor;
import org.springframework.integration.scripting.jsr223.Jsr223ScriptExecutor;
import org.springframework.integration.scripting.jsr223.DefaultScriptExecutor;
import org.springframework.scripting.support.ResourceScriptSource;
import org.springframework.scripting.support.StaticScriptSource;
@@ -31,7 +31,7 @@ import org.springframework.scripting.support.StaticScriptSource;
public class Jsr223ScriptExecutorTests {
@Test
public void test(){
ScriptExecutor executor = new Jsr223ScriptExecutor("jruby");
ScriptExecutor executor = new DefaultScriptExecutor("jruby");
executor.executeScript(new StaticScriptSource("puts 'hello, world'"));
executor.executeScript(new StaticScriptSource("puts 'hello, again'"));
@@ -54,7 +54,7 @@ public class Jsr223ScriptExecutorTests {
}
@Test
public void testJs(){
ScriptExecutor executor = new Jsr223ScriptExecutor("js");
ScriptExecutor executor = new DefaultScriptExecutor("js");
Object obj = executor.executeScript(new StaticScriptSource("function js(){ return 'js';} js();"));
assertEquals("js",obj.toString());
}