svn commit: r389132 - /incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java

[an...@apache.org]

Author: antelder
Date: Mon Mar 27 05:05:05 2006
New Revision: 389132

URL: http://svn.apache.org/viewcvs?rev=389132&view=rev
Log:
Fix for TUSCANY-140 and a readme for sample2

Modified:
    incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java

Modified: incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java?rev=389132&r1=389131&r2=389132&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java (original)
+++ incubator/tuscany/java/sca/container.js/src/main/java/org/apache/tuscany/container/js/builder/JavaScriptContextFactoryBuilder.java Mon Mar 27 05:05:05 2006
@@ -123,18 +123,18 @@
     }
 
 	private void buildJavaScriptComponent(SimpleComponent component, JavaScriptImplementation impl) {
-		Scope scope = impl.getComponentType().getServices().get(0).getServiceContract().getScope();
-		Map<String, Class> services = new HashMap<String, Class>();
+
+        Scope scope = impl.getComponentType().getServices().get(0).getServiceContract().getScope();
+
+        Map<String, Class> services = new HashMap<String, Class>();
 		for (Service service : impl.getComponentType().getServices()) {
 		    services.put(service.getName(), service.getServiceContract().getInterface());
 		}
-		Map<String, Object> properties = new HashMap<String, Object>();
-		List<ConfiguredProperty> configuredProperties = component.getConfiguredProperties();
-		if (configuredProperties != null) {
-		    for (ConfiguredProperty property : configuredProperties) {
-		        properties.put(property.getProperty().getName(), property.getValue());
-		    }
-		}
+
+        Map<String, Object> defaultProperties = new HashMap<String, Object>();
+        for (org.apache.tuscany.model.assembly.Property property: impl.getComponentType().getProperties()) {
+            defaultProperties.put(property.getName(), property.getDefaultValue());
+        }
 
         // TODO: avoid casting to JavaScriptImplementationImpl
 		String script;
@@ -145,7 +145,15 @@
 	    }
         ClassLoader cl = ((JavaScriptImplementationImpl) impl).getResourceLoader().getClassLoader();
         
-        RhinoScript invoker = new RhinoScript(component.getName(), script, properties, cl);
+        RhinoScript invoker = new RhinoScript(component.getName(), script, defaultProperties, cl);
+
+        Map<String, Object> properties = new HashMap<String, Object>();
+        List<ConfiguredProperty> configuredProperties = component.getConfiguredProperties();
+        if (configuredProperties != null) {
+            for (ConfiguredProperty property : configuredProperties) {
+                properties.put(property.getProperty().getName(), property.getValue());
+            }
+        }
 
         JavaScriptContextFactory contextFactory = new JavaScriptContextFactory(component.getName(),
 		        scope, services, properties, invoker);