tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r496253 - in /incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript: JavaScriptComponentType.java JavaScriptComponentTypeLoader.java
Date Mon, 15 Jan 2007 09:20:34 GMT
Author: antelder
Date: Mon Jan 15 01:20:33 2007
New Revision: 496253

URL: http://svn.apache.org/viewvc?view=rev&rev=496253
Log:
TUSCANY-1054, patch from Lee Zhenghui - update JavaScript container componentType code

Modified:
    incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentType.java
    incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentTypeLoader.java

Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentType.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentType.java?view=diff&rev=496253&r1=496252&r2=496253
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentType.java
(original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentType.java
Mon Jan 15 01:20:33 2007
@@ -30,20 +30,4 @@
         implementationScope = Scope.COMPOSITE;
     }
 
-    @SuppressWarnings("unchecked")
-    public JavaScriptComponentType(ComponentType ct) {
-        // TODO: A bit hacky but this is so the non-JavaScript .componentType side file can
be used for now
-        setInitLevel(ct.getInitLevel());
-        for (Object property : ct.getProperties().values()) {
-            add((Property) property);
-        }
-        for (Object reference : ct.getReferences().values()) {
-            add((ReferenceDefinition) reference);
-        }
-        for (Object service : ct.getServices().values()) {
-            add((ServiceDefinition) service);
-        }
-        implementationScope = Scope.COMPOSITE;
-    }
-
 }

Modified: incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentTypeLoader.java?view=diff&rev=496253&r1=496252&r2=496253
==============================================================================
--- incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentTypeLoader.java
(original)
+++ incubator/tuscany/java/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentTypeLoader.java
Mon Jan 15 01:20:33 2007
@@ -96,9 +96,8 @@
 
     protected JavaScriptComponentType loadFromSidefile(URL url, DeploymentContext deploymentContext)
         throws LoaderException {
-        ComponentType ct = loaderRegistry.load(null,null, url, ComponentType.class, deploymentContext);
-        JavaScriptComponentType jsct = new JavaScriptComponentType(ct);
-        return jsct;
+        JavaScriptComponentType jsct = new JavaScriptComponentType();
+        return (JavaScriptComponentType) loaderRegistry.load(null,jsct, url, ComponentType.class,
deploymentContext);
     }
 
     private String getSideFileName(JavaScriptImplementation implementation) {



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message