1 files changed, 0 insertions, 113 deletions
diff --git a/branches/sca-java-M2/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentTypeLoader.java b/branches/sca-java-M2/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentTypeLoader.java
deleted file mode 100644
index e28daeceb0..0000000000
--- a/branches/sca-java-M2/sca/services/containers/container.javascript/src/main/java/org/apache/tuscany/container/javascript/JavaScriptComponentTypeLoader.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apache.tuscany.container.javascript;
-
-import java.net.URL;
-
-import org.apache.tuscany.spi.annotation.Autowire;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.extension.ComponentTypeLoaderExtension;
-import org.apache.tuscany.spi.idl.InvalidServiceContractException;
-import org.apache.tuscany.spi.idl.java.JavaInterfaceProcessorRegistry;
-import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.MissingResourceException;
-import org.apache.tuscany.spi.model.ComponentType;
-
-import org.apache.tuscany.container.javascript.rhino.RhinoSCAConfig;
-import org.apache.tuscany.container.javascript.rhino.RhinoScript;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaScriptComponentTypeLoader extends ComponentTypeLoaderExtension<JavaScriptImplementation> {
-
-    private JavaInterfaceProcessorRegistry processorRegistry;
-
-    public JavaScriptComponentTypeLoader(@Autowire JavaInterfaceProcessorRegistry processorRegistry) {
-        this.processorRegistry = processorRegistry;
-    }
-
-    @Override
-    protected Class<JavaScriptImplementation> getImplementationClass() {
-        return JavaScriptImplementation.class;
-    }
-
-    protected JavaScriptComponentType loadByIntrospection(CompositeComponent parent,
-                                                          JavaScriptImplementation implementation,
-                                                          DeploymentContext deploymentContext) throws
-                                                                                               MissingResourceException,
-                                                                                               InvalidServiceContractException {
-
-        RhinoScript rhinoScript = implementation.getRhinoScript();
-        RhinoSCAConfig scaConfig = rhinoScript.getSCAConfig();
-        if (!scaConfig.hasSCAConfig()) {
-            throw new IllegalArgumentException(
-                "must use either .componentType side file or JS SCA varriable definition");
-        }
-
-        // FIXME this should be a system service, not instantiated here
-        JavaScriptComponentType componentType = new JavaScriptIntrospector(null, processorRegistry)
-            .introspectScript(scaConfig, rhinoScript.getClassLoader());
-
-        return componentType;
-    }
-
-    protected String getResourceName(JavaScriptImplementation implementation) {
-        return implementation.getRhinoScript().getScriptName();
-    }
-
-    // TODO: must be possible to move all the following up in to ComponentTypeLoaderExtension 
-
-    public void load(CompositeComponent parent, JavaScriptImplementation implementation,
-                     DeploymentContext deploymentContext)
-        throws LoaderException {
-
-        URL resource = implementation.getRhinoScript().getClassLoader().getResource(getSideFileName(implementation));
-        JavaScriptComponentType componentType;
-        if (resource == null) {
-            try {
-                componentType = loadByIntrospection(parent, implementation, deploymentContext);
-            } catch (InvalidServiceContractException e) {
-                throw new LoaderException("Invalid service contract", e);
-            }
-        } else {
-            componentType = loadFromSidefile(resource, deploymentContext);
-        }
-
-        implementation.setComponentType(componentType);
-    }
-
-    protected JavaScriptComponentType loadFromSidefile(URL url, DeploymentContext deploymentContext)
-        throws LoaderException {
-        ComponentType ct = loaderRegistry.load(null, url, ComponentType.class, deploymentContext);
-        JavaScriptComponentType jsct = new JavaScriptComponentType(ct);
-        return jsct;
-    }
-
-    private String getSideFileName(JavaScriptImplementation implementation) {
-        String baseName = getResourceName(implementation);
-        int lastDot = baseName.lastIndexOf('.');
-        if (lastDot != -1) {
-            baseName = baseName.substring(0, lastDot);
-        }
-        return baseName + ".componentType";
-    }
-
-}