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/08/01 18:44:56 UTC
svn commit: r427644 - in
/incubator/tuscany/java/sca/containers/container.javascript/src:
main/java/org/apache/tuscany/container/javascript/
main/java/org/apache/tuscany/container/javascript/rhino/
test/java/helloworld/ test/java/org/apache/tuscany/con...
Author: antelder
Date: Tue Aug 1 09:44:55 2006
New Revision: 427644
URL: http://svn.apache.org/viewvc?rev=427644&view=rev
Log:
Just formatted all the javaScript container code, no code changes
Modified:
incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java
incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java
incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementation.java
incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoader.java
incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoFunctionInvoker.java
incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoScript.java
incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoScriptInstance.java
incubator/tuscany/java/sca/containers/container.javascript/src/test/java/helloworld/HelloWorldService.java
incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoaderTestCase.java
incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java
incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/function/HelloWorldTestCase.java
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java?rev=427644&r1=427643&r2=427644&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponent.java Tue Aug 1 09:44:55 2006
@@ -108,12 +108,12 @@
return target.invokeFunction(method.getName(), args);
}
};
-
+
Class<?>[] ifaces = new Class<?>[getServiceInterfaces().size()];
- for (int i=0; i<getServiceInterfaces().size(); i++) {
+ for (int i = 0; i < getServiceInterfaces().size(); i++) {
ifaces[i] = getServiceInterfaces().get(i);
}
- T proxy = (T) Proxy.newProxyInstance(cl, ifaces , ih);
+ T proxy = (T) Proxy.newProxyInstance(cl, ifaces, ih);
return proxy;
}
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java?rev=427644&r1=427643&r2=427644&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentBuilder.java Tue Aug 1 09:44:55 2006
@@ -43,12 +43,12 @@
RhinoScript rhinoScript = implementation.getRhinoScript();
- //TODO properties
+ // TODO properties
Map<String, Object> properties = new HashMap<String, Object>();
// TODO scopes
// ScopeContainer scopeContainer = scopeRegistry.getScopeContainer(componentType.getLifecycleScope());
- ScopeContainer scopeContainer = deploymentContext.getModuleScope();
+ ScopeContainer scopeContainer = deploymentContext.getModuleScope();
return new JavaScriptComponent(name, rhinoScript, services, properties, parent, scopeContainer, wireService);
}
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementation.java?rev=427644&r1=427643&r2=427644&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementation.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementation.java Tue Aug 1 09:44:55 2006
@@ -26,7 +26,9 @@
public class JavaScriptImplementation extends AtomicImplementation<ComponentType> {
private RhinoScript rhinoScript;
+
private ClassLoader cl;
+
private ComponentType componentType;
public ComponentType getComponentType() {
@@ -34,7 +36,7 @@
}
public void setComponentType(ComponentType componentType) {
- this.componentType = componentType;
+ this.componentType = componentType;
}
public ClassLoader getClassLoader() {
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoader.java?rev=427644&r1=427643&r2=427644&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoader.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoader.java Tue Aug 1 09:44:55 2006
@@ -58,7 +58,7 @@
if (script == null) {
throw new MissingResourceException("No script supplied");
}
-
+
ClassLoader cl = deploymentContext.getClassLoader();
String source = loadSource(cl, script);
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoFunctionInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoFunctionInvoker.java?rev=427644&r1=427643&r2=427644&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoFunctionInvoker.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoFunctionInvoker.java Tue Aug 1 09:44:55 2006
@@ -49,7 +49,7 @@
} else {
jsArgs = new Object[arg.length];
for (int i = 0; i < jsArgs.length; i++) {
- jsArgs[i] = Context.toObject(arg[i], scope);
+ jsArgs[i] = Context.toObject(arg[i], scope);
}
}
return jsArgs;
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoScript.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoScript.java?rev=427644&r1=427643&r2=427644&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoScript.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoScript.java Tue Aug 1 09:44:55 2006
@@ -41,7 +41,7 @@
/*
* Enable dynamic scopes so a script can be used concurrently with a global shared scope and individual execution scopes. See
- * http://www.mozilla.org/rhino/scopes.html
+ * http://www.mozilla.org/rhino/scopes.html
*/
private static class MyFactory extends ContextFactory {
protected boolean hasFeature(Context cx, int featureIndex) {
@@ -181,11 +181,9 @@
}
/**
- * Set the Java type of a response value. JavaScript is dynamically typed so Rhino
- * cannot always work out what the intended Java type of a response should be, for
- * example should the statement "return 42" be a Java int, or Integer or Double etc.
- * When Rhino can't determine the type it will default to returning a String, using
- * this method enables overriding the Rhino default to use a specific Java type.
+ * Set the Java type of a response value. JavaScript is dynamically typed so Rhino cannot always work out what the intended Java type of a
+ * response should be, for example should the statement "return 42" be a Java int, or Integer or Double etc. When Rhino can't determine the type
+ * it will default to returning a String, using this method enables overriding the Rhino default to use a specific Java type.
*/
public void setResponseClass(String functionName, Class responseClasses) {
this.responseClasses.put(functionName, responseClasses);
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoScriptInstance.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoScriptInstance.java?rev=427644&r1=427643&r2=427644&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoScriptInstance.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/rhino/RhinoScriptInstance.java Tue Aug 1 09:44:55 2006
@@ -69,7 +69,7 @@
Object handleObj = scriptScope.get(functionName, instanceScope);
if (UniqueTag.NOT_FOUND.equals(handleObj)) {
- // Bit of a hack so E4X scripts don't need to define a function for every operation
+ // Bit of a hack so E4X scripts don't need to define a function for every operation
handleObj = scriptScope.get("process", instanceScope);
}
if (!(handleObj instanceof Function)) {
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/test/java/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/test/java/helloworld/HelloWorldService.java?rev=427644&r1=427643&r2=427644&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/test/java/helloworld/HelloWorldService.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/test/java/helloworld/HelloWorldService.java Tue Aug 1 09:44:55 2006
@@ -2,6 +2,6 @@
public interface HelloWorldService {
- String sayHello(String s);
+ String sayHello(String s);
}
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoaderTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoaderTestCase.java?rev=427644&r1=427643&r2=427644&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoaderTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/JavaScriptImplementationLoaderTestCase.java Tue Aug 1 09:44:55 2006
@@ -33,7 +33,7 @@
import org.apache.tuscany.spi.loader.MissingResourceException;
/**
- * Tests for JavaScriptImplementationLoader
+ * Tests for JavaScriptImplementationLoader
*/
public class JavaScriptImplementationLoaderTestCase extends TestCase {
private CompositeComponent parent;
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java?rev=427644&r1=427643&r2=427644&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/PropertyTestCase.java Tue Aug 1 09:44:55 2006
@@ -14,7 +14,7 @@
import org.apache.tuscany.test.ArtifactFactory;
/**
- * Tests for component properties
+ * Tests for component properties
*/
public class PropertyTestCase extends TestCase {
Modified: incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/function/HelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/function/HelloWorldTestCase.java?rev=427644&r1=427643&r2=427644&view=diff
==============================================================================
--- incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/function/HelloWorldTestCase.java (original)
+++ incubator/tuscany/java/sca/containers/container.javascript/src/test/java/org/apache/tuscany/container/javascript/function/HelloWorldTestCase.java Tue Aug 1 09:44:55 2006
@@ -28,6 +28,7 @@
public class HelloWorldTestCase extends SCATestCase {
private HelloWorldService helloWorldService;
+
private HelloWorldService introspectableService;
protected void setUp() throws Exception {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org