You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sv...@apache.org on 2007/06/15 19:02:51 UTC
svn commit: r547743 - in
/incubator/tuscany/java/sca/modules/implementation-script/src:
main/java/org/apache/tuscany/sca/implementation/script/
test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/
test/resources/org/apache/tuscany/sca...
Author: svkrish
Date: Fri Jun 15 10:02:50 2007
New Revision: 547743
URL: http://svn.apache.org/viewvc?view=rev&rev=547743
Log:
simple property support for scripts without componentType
Modified:
incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java?view=diff&rev=547743&r1=547742&r2=547743
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java Fri Jun 15 10:02:50 2007
@@ -71,7 +71,7 @@
scriptEngine.put(reference.getName(), createReferenceProxy(reference.getName(), rc));
}
- for (Property property : implementation.getProperties()) {
+ for (Property property : rc.getProperties()) {
ObjectFactory<?> propertyValueFactory = propertyFactory.createValueFactory(property);
if ( propertyValueFactory != null) {
scriptEngine.put(property.getName(), propertyValueFactory.getInstance());
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java?view=diff&rev=547743&r1=547742&r2=547743
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/AbstractHelloWorldTestCase.java Fri Jun 15 10:02:50 2007
@@ -23,7 +23,7 @@
public abstract class AbstractHelloWorldTestCase extends AbstractSCATestCase<HelloWorld> {
- public void testCalculator() throws Exception {
+ public void testHello() throws Exception {
assertEquals("Hello petra", service.sayHello("petra"));
}
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java?view=diff&rev=547743&r1=547742&r2=547743
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/HelloWorld.java Fri Jun 15 10:02:50 2007
@@ -22,5 +22,6 @@
public interface HelloWorld {
public String sayHello(String s);
+ public String sayHelloFrom(String s);
}
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java?view=diff&rev=547743&r1=547742&r2=547743
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/test/java/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorldTestCase.java Fri Jun 15 10:02:50 2007
@@ -22,4 +22,9 @@
public class JavaScriptHelloWorldTestCase extends AbstractHelloWorldTestCase {
// super class does it all getting composite based on this class name
+
+ public void testHelloFrom() throws Exception {
+ System.out.println(service.sayHelloFrom("Venkat"));
+ assertEquals("Hello petra from Tuscany", service.sayHelloFrom("petra"));
+ }
}
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite?view=diff&rev=547743&r1=547742&r2=547743
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/JavaScriptHelloWorld.composite Fri Jun 15 10:02:50 2007
@@ -18,10 +18,12 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
name="JavaScriptHelloWorld">
<component name="ClientComponent">
<implementation.script script="org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js"/>
+ <property name="greeter" type="xsd:string">Tuscany</property>
</component>
</composite>
Modified: incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js?view=diff&rev=547743&r1=547742&r2=547743
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js (original)
+++ incubator/tuscany/java/sca/modules/implementation-script/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/dynamic/helloworld.js Fri Jun 15 10:02:50 2007
@@ -19,4 +19,8 @@
function sayHello(s) {
return "Hello " + s;
+}
+
+function sayHelloFrom(s) {
+ return "Hello " + s + " from " + greeter;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org