Author: antelder
Date: Mon Sep 11 23:50:49 2006
New Revision: 442488
URL: http://svn.apache.org/viewvc?view=rev&rev=442488
Log:
remove references to old script code
Modified:
incubator/tuscany/sandbox/ant/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java
incubator/tuscany/sandbox/ant/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java
incubator/tuscany/sandbox/ant/container.script/src/test/java/org/apache/tuscany/container/script/ScriptInstanceFactoryTestCase.java
Modified:
incubator/tuscany/sandbox/ant/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java?view=diff&rev=442488&r1=442487&r2=442488
==============================================================================
---
incubator/tuscany/sandbox/ant/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java
(original)
+++
incubator/tuscany/sandbox/ant/container.script/src/main/java/org/apache/tuscany/container/script/ScriptImplementationLoader.java
Mon Sep 11 23:50:49 2006
@@ -71,6 +71,7 @@
ScriptInstanceFactory instanceFactory = new
ScriptInstanceFactory(scriptName, className, scriptSource, cl);
EasyImplementation implementation = new EasyImplementation();
+ implementation.setResourceName(scriptName);
implementation.setScriptInstanceFactory(instanceFactory);
registry.loadComponentType(parent, implementation, deploymentContext);
Modified:
incubator/tuscany/sandbox/ant/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java?view=diff&rev=442488&r1=442487&r2=442488
==============================================================================
---
incubator/tuscany/sandbox/ant/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java
(original)
+++
incubator/tuscany/sandbox/ant/container.script/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java
Mon Sep 11 23:50:49 2006
@@ -31,8 +31,14 @@
*/
public class ScriptInstanceFactory extends EasyInstanceFactory<ScriptInstance>{
- public ScriptInstanceFactory(String arg0, String arg1, String arg2,
ClassLoader arg3) {
- super(arg0, arg1, arg2, arg3);
+ private String className;
+
+ private String scriptSource;
+
+ public ScriptInstanceFactory(String resourceName, String className, String
scriptSource, ClassLoader classLoader) {
+ super(resourceName, classLoader);
+ this.className = className;
+ this.scriptSource = scriptSource;
}
/**
@@ -46,18 +52,22 @@
try {
//TODO: this uses a new manager and recompiles the scrip each
time, may be able to optimize
+ // but need to be careful about instance scoping
BSFManager bsfManager = new BSFManager();
- bsfManager.setClassLoader(getClass().getClassLoader());
+ bsfManager.setClassLoader(BSFManager.class.getClassLoader());
+
+ // TODO: hack to get Ruby working with the standalone launcher
+
Thread.currentThread().setContextClassLoader(BSFManager.class.getClassLoader());
// register any context objects (SCA properties and references)
for (String beanName : context.keySet()) {
bsfManager.registerBean(beanName, context.get(beanName));
}
- String scriptLanguage = BSFManager.getLangFromFilename(scriptName);
+ String scriptLanguage =
BSFManager.getLangFromFilename(resourceName);
BSFEngine bsfEngine =
bsfManager.loadScriptingEngine(scriptLanguage);
- bsfEngine.exec(scriptName, 0, 0, scriptSource);
+ bsfEngine.exec(resourceName, 0, 0, scriptSource);
// if there's a className then get the class object
Object clazz = null;
@@ -73,7 +83,7 @@
return new ScriptInstance(bsfEngine, clazz);
} catch (BSFException e) {
- throw new ObjectCreationException();
+ throw new ObjectCreationException(e);
}
}
Modified:
incubator/tuscany/sandbox/ant/container.script/src/test/java/org/apache/tuscany/container/script/ScriptInstanceFactoryTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.script/src/test/java/org/apache/tuscany/container/script/ScriptInstanceFactoryTestCase.java?view=diff&rev=442488&r1=442487&r2=442488
==============================================================================
---
incubator/tuscany/sandbox/ant/container.script/src/test/java/org/apache/tuscany/container/script/ScriptInstanceFactoryTestCase.java
(original)
+++
incubator/tuscany/sandbox/ant/container.script/src/test/java/org/apache/tuscany/container/script/ScriptInstanceFactoryTestCase.java
Mon Sep 11 23:50:49 2006
@@ -57,9 +57,9 @@
public void testGetters() throws InvocationTargetException {
ScriptInstanceFactory factory = new ScriptInstanceFactory("foo",
"bar", "baz", getClass().getClassLoader());
- assertEquals("foo", factory.getScriptName());
- assertEquals("bar", factory.getClassName());
- assertEquals("baz", factory.getScriptSource());
+// assertEquals("foo", factory.getScriptName());
+// assertEquals("bar", factory.getClassName());
+// assertEquals("baz", factory.getScriptSource());
assertEquals(getClass().getClassLoader(), factory.getClassLoader());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
