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 2006/10/24 10:03:56 UTC
svn commit: r467268 - in /incubator/tuscany/sandbox/ant/container.script/src:
main/java/org/apache/tuscany/container/script/
test/java/org/apache/tuscany/container/script/
Author: antelder
Date: Tue Oct 24 01:03:55 2006
New Revision: 467268
URL: http://svn.apache.org/viewvc?view=rev&rev=467268
Log:
Update for recent core changes
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/ScriptImplementationLoaderTestCase.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=467268&r1=467267&r2=467268
==============================================================================
--- 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 Tue Oct 24 01:03:55 2006
@@ -33,6 +33,7 @@
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.LoaderUtil;
import org.apache.tuscany.spi.loader.MissingResourceException;
+import org.apache.tuscany.spi.model.ModelObject;
import org.osoa.sca.annotations.Constructor;
/**
@@ -54,8 +55,7 @@
return IMPLEMENTATION_SCRIPT;
}
- @Override
- public EasyImplementation load(CompositeComponent parent, XMLStreamReader reader, DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ public EasyImplementation load(CompositeComponent parent, ModelObject mo, XMLStreamReader reader, DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
String scriptName = reader.getAttributeValue(null, "script");
if (scriptName == null) {
throw new MissingResourceException("implementation element has no 'script' attribute");
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=467268&r1=467267&r2=467268
==============================================================================
--- 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 Tue Oct 24 01:03:55 2006
@@ -84,7 +84,10 @@
return new ScriptInstance(bsfEngine, clazz);
} catch (BSFException e) {
- throw new ObjectCreationException(e);
+ if (e.getTargetException() != null) {
+ throw new ObjectCreationException(e.getTargetException());
+ }
+ throw new ObjectCreationException(e.getTargetException());
}
}
Modified: incubator/tuscany/sandbox/ant/container.script/src/test/java/org/apache/tuscany/container/script/ScriptImplementationLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/ant/container.script/src/test/java/org/apache/tuscany/container/script/ScriptImplementationLoaderTestCase.java?view=diff&rev=467268&r1=467267&r2=467268
==============================================================================
--- incubator/tuscany/sandbox/ant/container.script/src/test/java/org/apache/tuscany/container/script/ScriptImplementationLoaderTestCase.java (original)
+++ incubator/tuscany/sandbox/ant/container.script/src/test/java/org/apache/tuscany/container/script/ScriptImplementationLoaderTestCase.java Tue Oct 24 01:03:55 2006
@@ -58,7 +58,7 @@
replay(deploymentContext);
try {
- loader.load(parent, reader, deploymentContext);
+ loader.load(parent, null, reader, deploymentContext);
fail();
} catch (MissingResourceException e) {
// ok
@@ -83,7 +83,7 @@
return "bar";
}
};
- mockLoader.load(parent, reader, deploymentContext);
+ mockLoader.load(parent, null, reader, deploymentContext);
verify(reader);
verify(deploymentContext);
}
@@ -105,7 +105,7 @@
}
};
try {
- mockLoader.load(parent, reader, deploymentContext);
+ mockLoader.load(parent, null, reader, deploymentContext);
fail();
} catch (MissingResourceException e) {
assertEquals("foo.py", e.getMessage());
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org