You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/02/24 21:29:24 UTC
svn commit: r511336 - in
/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src:
main/java/org/apache/tuscany/container/script/
test/java/org/apache/tuscany/container/script/
Author: antelder
Date: Sat Feb 24 12:29:23 2007
New Revision: 511336
URL: http://svn.apache.org/viewvc?view=rev&rev=511336
Log:
Simplify ScriptInstance interface/impl to just impl
Added:
incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceTestCase.java
- copied, changed from r511259, incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceImplTestCase.java
Removed:
incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstanceImpl.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceImplTestCase.java
Modified:
incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java
incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceFactoryTestCase.java
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java?view=diff&rev=511336&r1=511335&r2=511336
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstance.java Sat Feb 24 12:29:23 2007
@@ -20,12 +20,29 @@
import java.lang.reflect.InvocationTargetException;
+import org.apache.bsf.BSFEngine;
+
/**
* An invokable instance of a script
*
* Basically just a wrapper around a BSF engine with an optional script class object.
*/
-public interface ScriptInstance {
+public class ScriptInstance {
+
+ protected BSFEngine bsfEngine;
+ protected Object clazz;
- Object invokeTarget(String operationName, Object[] args) throws InvocationTargetException;
+ public ScriptInstance(BSFEngine bsfEngine, Object clazz) {
+ this.bsfEngine = bsfEngine;
+ this.clazz = clazz;
+ }
+
+ public Object invokeTarget(String operationName, Object[] args) throws InvocationTargetException {
+ try {
+ return bsfEngine.call(clazz, operationName, args);
+ } catch (Exception e) {
+ throw new InvocationTargetException(e);
+ }
+ }
}
+
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java?view=diff&rev=511336&r1=511335&r2=511336
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/main/java/org/apache/tuscany/container/script/ScriptInstanceFactory.java Sat Feb 24 12:29:23 2007
@@ -98,7 +98,7 @@
}
}
- return new ScriptInstanceImpl(bsfEngine, clazz);
+ return new ScriptInstance(bsfEngine, clazz);
} catch (BSFException e) {
if (e.getTargetException() != null) {
Modified: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceFactoryTestCase.java?view=diff&rev=511336&r1=511335&r2=511336
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceFactoryTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceFactoryTestCase.java Sat Feb 24 12:29:23 2007
@@ -36,7 +36,7 @@
ScriptInstanceFactory factory =
new ScriptInstanceFactory("foo.mock", "bar", "baz", getClass().getClassLoader());
factory.addContextObjectFactory("foo", String.class, new SingletonObjectFactory("bar"));
- ScriptInstanceImpl instance = (ScriptInstanceImpl) factory.getInstance();
+ ScriptInstance instance = (ScriptInstance) factory.getInstance();
assertNotNull(instance);
assertNotNull(instance.bsfEngine);
}
@@ -46,7 +46,7 @@
ScriptInstanceFactory factory =
new ScriptInstanceFactory("foo.mock", null, "baz", getClass().getClassLoader());
factory.addContextObjectFactory("foo", String.class, new SingletonObjectFactory("bar"));
- ScriptInstanceImpl instance = (ScriptInstanceImpl) factory.getInstance();
+ ScriptInstance instance = (ScriptInstance) factory.getInstance();
assertNotNull(instance);
assertNotNull(instance.bsfEngine);
}
@@ -56,7 +56,7 @@
ScriptInstanceFactory factory =
new ScriptInstanceFactory("foo.mock", "bar", "baz", getClass().getClassLoader());
factory.addContextObjectFactory("foo", String.class, new SingletonObjectFactory("bar"));
- ScriptInstanceImpl instance = (ScriptInstanceImpl) factory.getInstance();
+ ScriptInstance instance = (ScriptInstance) factory.getInstance();
assertNotNull(instance);
assertNotNull(instance.bsfEngine);
}
Copied: incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceTestCase.java (from r511259, incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceImplTestCase.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceTestCase.java?view=diff&rev=511336&p1=incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceImplTestCase.java&r1=511259&p2=incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceTestCase.java&r2=511336
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceImplTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/extensions/script/container.bsf/src/test/java/org/apache/tuscany/container/script/ScriptInstanceTestCase.java Sat Feb 24 12:29:23 2007
@@ -23,8 +23,8 @@
import junit.framework.TestCase;
import org.apache.tuscany.container.script.mock.MockBSFEngine;
-public class ScriptInstanceImplTestCase extends TestCase {
- private ScriptInstanceImpl instance;
+public class ScriptInstanceTestCase extends TestCase {
+ private ScriptInstance instance;
public void testInvokeTarget() throws InvocationTargetException {
assertEquals("hello:", instance.invokeTarget("hello", null));
@@ -41,6 +41,6 @@
protected void setUp() throws Exception {
super.setUp();
- this.instance = new ScriptInstanceImpl(new MockBSFEngine(), null);
+ this.instance = new ScriptInstance(new MockBSFEngine(), null);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org