Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835143 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 0 insertions, 843 deletions

diff --git a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/AsyncGroovyInvoker.java b/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/AsyncGroovyInvoker.java
deleted file mode 100644
index f761122847..0000000000
--- a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/AsyncGroovyInvoker.java
+++ /dev/null
@@ -1,92 +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.groovy;
-
-import org.apache.tuscany.spi.component.TargetException;
-import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.InvocationRuntimeException;
-import org.apache.tuscany.spi.wire.Message;
-
-/**
- * Responsible for performing a non-blocking dispatch on a Groovy component implementation instance
- *
- * @version $Rev$ $Date$
- */
-public class AsyncGroovyInvoker extends GroovyInvoker {
-
-    private InboundWire wire;
-    private AsyncMonitor monitor;
-    private WorkContext workContext;
-    private Object target;
-
-    /**
-     * Creates a new invoker
-     *
-     * @param operation   the operation the invoker is associated with
-     * @param wire
-     * @param component   the target component
-     * @param monitor     the monitor to pass events to
-     * @param workContext
-     */
-    public AsyncGroovyInvoker(String operation,
-                              InboundWire wire,
-                              GroovyAtomicComponent component,
-                              AsyncMonitor monitor,
-                              WorkContext workContext) {
-        super(operation, component);
-        this.wire = wire;
-        this.monitor = monitor;
-        this.workContext = workContext;
-    }
-
-    public Message invoke(Message msg) throws InvocationRuntimeException {
-        try {
-            Object messageId = msg.getMessageId();
-            wire.addMapping(messageId, msg.getFromAddress());
-            workContext.setCurrentMessageId(null);
-            workContext.setCurrentCorrelationId(messageId);
-            invokeTarget(msg.getBody());
-            // async so no return value
-            return null;
-        } catch (Throwable e) {
-            // FIXME need to log exceptions
-            monitor.executionError(e);
-            return null;
-        }
-    }
-
-    public AsyncGroovyInvoker clone() throws CloneNotSupportedException {
-        return (AsyncGroovyInvoker) super.clone();
-    }
-
-    /**
-     * Resolves the target service instance or returns a cached one
-     */
-    protected Object getInstance() throws TargetException {
-        if (!cacheable) {
-            return component.getTargetInstance();
-        } else {
-            if (target == null) {
-                target = component.getTargetInstance();
-            }
-            return target;
-        }
-    }
-}
diff --git a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/AsyncMonitor.java b/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/AsyncMonitor.java
deleted file mode 100644
index 4da5538990..0000000000
--- a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/AsyncMonitor.java
+++ /dev/null
@@ -1,34 +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.groovy;
-
-/**
- * A monitor used to log events during non-blocking invocations
- * <p/>
- *
- * @version $$Rev$$ $$Date$$
- */
-public interface AsyncMonitor {
-
-    /**
-     * Logs an exception thrown during an invocation
-     */
-    void executionError(Throwable e);
-
-}
diff --git a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java b/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
deleted file mode 100644
index b0ed18382f..0000000000
--- a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyAtomicComponent.java
+++ /dev/null
@@ -1,120 +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.groovy;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.spi.ObjectCreationException;
-import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.component.TargetException;
-import org.apache.tuscany.spi.extension.AtomicComponentExtension;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.OutboundWire;
-import org.apache.tuscany.spi.wire.TargetInvoker;
-
-import groovy.lang.GroovyObject;
-
-/**
- * The Groovy atomic component implementation. Groovy implementations may be "scripts" or classes.
- */
-public class GroovyAtomicComponent extends AtomicComponentExtension {
-    private final Class<? extends GroovyObject> groovyClass;
-    private final List<Class<?>> services;
-    //FIXME properties should move up to AtomicComponentExtension
-    private final Map<String, ObjectFactory> properties;
-    private AsyncMonitor monitor;
-
-    public GroovyAtomicComponent(GroovyConfiguration configuration, AsyncMonitor monitor) {
-        super(configuration.getName(),
-            configuration.getParent(),
-            configuration.getScopeContainer(),
-            configuration.getWireService(),
-            configuration.getWorkContext(),
-            null, configuration.getInitLevel());
-
-        this.groovyClass = configuration.getGroovyClass();
-        this.services = Collections.unmodifiableList(configuration.getServices());
-        this.properties = new HashMap<String, ObjectFactory>();
-        assert groovyClass != null;
-        this.monitor = monitor;
-    }
-
-    public List<Class<?>> getServiceInterfaces() {
-        return services;
-    }
-
-    public TargetInvoker createTargetInvoker(String targetName, Operation operation) {
-        return new GroovyInvoker(operation.getName(), this);
-    }
-
-    public TargetInvoker createAsyncTargetInvoker(InboundWire wire, Operation operation) {
-        return new AsyncGroovyInvoker(operation.getName(), wire, this, monitor, workContext);
-    }
-
-    public Object createInstance() throws ObjectCreationException {
-        GroovyObject instance;
-        try {
-            instance = groovyClass.newInstance();
-        } catch (IllegalAccessException e) {
-            throw new ObjectCreationException(e);
-        } catch (InstantiationException e) {
-            throw new ObjectCreationException(e);
-        }
-
-        // inject properties
-        for (Map.Entry<String, ObjectFactory> property : properties.entrySet()) {
-            instance.setProperty(property.getKey(), property.getValue().getInstance());
-        }
-
-        // inject references
-        for (List<OutboundWire> referenceWires : getOutboundWires().values()) {
-            for (OutboundWire wire : referenceWires) {
-                instance.setProperty(wire.getReferenceName(), wireService.createProxy(wire));
-            }
-        }
-        return instance;
-    }
-
-    public GroovyObject getTargetInstance() throws TargetException {
-        return (GroovyObject) scopeContainer.getInstance(this);
-    }
-
-    public Object getServiceInstance() throws TargetException {
-        //TODO this should return a default service from a wire
-        return scopeContainer.getInstance(this);
-    }
-
-    public Object getServiceInstance(String service) throws TargetException {
-        InboundWire wire = getInboundWire(service);
-        if (wire == null) {
-            TargetException e = new TargetException("ServiceDefinition not found"); // TODO better error message
-            e.setIdentifier(service);
-            throw e;
-        }
-        return wireService.createProxy(wire);
-    }
-
-    public void addPropertyFactory(String name, ObjectFactory<?> factory) {
-        properties.put(name, factory);
-    }
-}
diff --git a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java b/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
deleted file mode 100644
index 4e99b888da..0000000000
--- a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentBuilder.java
+++ /dev/null
@@ -1,119 +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.groovy;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.spi.ObjectFactory;
-import org.apache.tuscany.spi.builder.BuilderConfigException;
-import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.deployer.DeploymentContext;
-import org.apache.tuscany.spi.extension.ComponentBuilderExtension;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.Property;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.ServiceDefinition;
-
-import groovy.lang.GroovyClassLoader;
-import groovy.lang.GroovyObject;
-import org.codehaus.groovy.control.CompilationFailedException;
-
-/**
- * Extension point for creating {@link GroovyAtomicComponent}s from an assembly configuration
- *
- * @version $$Rev$$ $$Date$$
- */
-public class GroovyComponentBuilder extends ComponentBuilderExtension<GroovyImplementation> {
-
-    protected Class<GroovyImplementation> getImplementationType() {
-        return GroovyImplementation.class;
-    }
-
-    public Component build(CompositeComponent parent,
-                              ComponentDefinition<GroovyImplementation> componentDefinition,
-                              DeploymentContext deploymentContext)
-        throws BuilderConfigException {
-
-        String name = componentDefinition.getName();
-        GroovyImplementation implementation = componentDefinition.getImplementation();
-        GroovyComponentType componentType = implementation.getComponentType();
-
-        int initLevel = componentType.getInitLevel();
-
-        // get list of services provided by this component
-        Collection<ServiceDefinition> collection = componentType.getServices().values();
-        List<Class<?>> services = new ArrayList<Class<?>>(collection.size());
-        for (ServiceDefinition serviceDefinition : collection) {
-            services.add(serviceDefinition.getServiceContract().getInterfaceClass());
-        }
-
-        // get the Groovy classloader for this deployment component
-        GroovyClassLoader groovyClassLoader = (GroovyClassLoader) deploymentContext.getExtension("groovy.classloader");
-        if (groovyClassLoader == null) {
-            groovyClassLoader = new GroovyClassLoader(deploymentContext.getClassLoader());
-            deploymentContext.putExtension("groovy.classloader", groovyClassLoader);
-        }
-
-        // create the implementation class for the script
-        Class<? extends GroovyObject> groovyClass;
-        try {
-            String script = implementation.getScript();
-            // REVIEW JFM can we cache the class?
-            groovyClass = groovyClassLoader.parseClass(script);
-        } catch (CompilationFailedException e) {
-            BuilderConfigException bce = new BuilderConfigException(e);
-            bce.setIdentifier(name);
-            throw bce;
-        }
-        // TODO deal with init and destroy
-
-        GroovyConfiguration configuration = new GroovyConfiguration();
-        configuration.setName(name);
-        configuration.setGroovyClass(groovyClass);
-        configuration.setParent(parent);
-        // get the scope container for this component's scope
-        Scope scope = componentType.getLifecycleScope();
-        if (Scope.MODULE == scope) {
-            configuration.setScopeContainer(deploymentContext.getModuleScope());
-        } else {
-            configuration.setScopeContainer(scopeRegistry.getScopeContainer(scope));
-        }
-
-
-        configuration.setWireService(wireService);
-        configuration.setWorkContext(workContext);
-        configuration.setInitLevel(initLevel);
-        configuration.setServices(services);
-        GroovyAtomicComponent component = new GroovyAtomicComponent(configuration, null);
-
-        // handle properties
-        for (Property<?> property : componentType.getProperties().values()) {
-            ObjectFactory<?> factory = property.getDefaultValueFactory();
-            if (factory != null) {
-                component.addPropertyFactory(property.getName(), factory);
-            }
-        }
-        return component;
-    }
-
-
-}
diff --git a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentType.java b/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentType.java
deleted file mode 100644
index bd54371fd7..0000000000
--- a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentType.java
+++ /dev/null
@@ -1,43 +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.groovy;
-
-import org.apache.tuscany.spi.model.ComponentType;
-import org.apache.tuscany.spi.model.Property;
-import org.apache.tuscany.spi.model.ReferenceDefinition;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.model.ServiceDefinition;
-
-/**
- * Model object representing a Groovy component type
- *
- * @version $$Rev$$ $$Date$$
- */
-public class GroovyComponentType extends ComponentType<ServiceDefinition, ReferenceDefinition, Property<?>> {
-    private Scope lifecycleScope;
-
-    public Scope getLifecycleScope() {
-        return lifecycleScope;
-    }
-
-    public void setLifecycleScope(Scope lifecycleScope) {
-        this.lifecycleScope = lifecycleScope;
-    }
-
-}
diff --git a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoader.java b/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoader.java
deleted file mode 100644
index 6da7840fdb..0000000000
--- a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyComponentTypeLoader.java
+++ /dev/null
@@ -1,43 +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.groovy;
-
-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.loader.LoaderException;
-import org.apache.tuscany.spi.model.Scope;
-
-/**
- * @version $Rev$ $Date$
- */
-public class GroovyComponentTypeLoader extends ComponentTypeLoaderExtension<GroovyImplementation> {
-    protected Class<GroovyImplementation> getImplementationClass() {
-        return GroovyImplementation.class;
-    }
-
-    public void load(CompositeComponent parent, GroovyImplementation implementation, DeploymentContext context)
-        throws LoaderException {
-        GroovyComponentType componentType = new GroovyComponentType();
-        // for now, default to module
-        componentType.setLifecycleScope(Scope.MODULE);
-        implementation.setComponentType(componentType);
-    }
-
-}
diff --git a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyConfiguration.java b/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyConfiguration.java
deleted file mode 100644
index b9ede2d034..0000000000
--- a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyConfiguration.java
+++ /dev/null
@@ -1,150 +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.groovy;
-
-import java.lang.reflect.Member;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.wire.WireService;
-
-import groovy.lang.GroovyObject;
-
-/**
- * Encapsulates confuration for a Groovy-based atomic component
- *
- * @version $Rev$ $Date$
- */
-public class GroovyConfiguration {
-
-    private CompositeComponent parent;
-    private ScopeContainer scopeContainer;
-    private int initLevel;
-    private Map<String, Member> referenceSites = new HashMap<String, Member>();
-    private Map<String, Member> propertySites = new HashMap<String, Member>();
-    private Map<String, Member> callbackSites = new HashMap<String, Member>();
-    private List<Class<?>> serviceInterfaces = new ArrayList<Class<?>>();
-    private WireService wireService;
-    private WorkContext workContext;
-    private String name;
-    private Class<? extends GroovyObject> groovyClass;
-    private List<Class<?>> services;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Class<? extends GroovyObject> getGroovyClass() {
-        return groovyClass;
-    }
-
-    public void setGroovyClass(Class<? extends GroovyObject> groovyClass) {
-        this.groovyClass = groovyClass;
-    }
-
-    public CompositeComponent getParent() {
-        return parent;
-    }
-
-    public void setParent(CompositeComponent parent) {
-        this.parent = parent;
-    }
-
-    public ScopeContainer getScopeContainer() {
-        return scopeContainer;
-    }
-
-    public void setScopeContainer(ScopeContainer scopeContainer) {
-        this.scopeContainer = scopeContainer;
-    }
-
-    public List<Class<?>> getServiceInterfaces() {
-        return serviceInterfaces;
-    }
-
-    public void addServiceInterface(Class<?> serviceInterface) {
-        serviceInterfaces.add(serviceInterface);
-    }
-
-    public int getInitLevel() {
-        return initLevel;
-    }
-
-    public void setInitLevel(int initLevel) {
-        this.initLevel = initLevel;
-    }
-
-    public List<Class<?>> getServices() {
-        return services;
-    }
-
-    public void setServices(List<Class<?>> services) {
-        this.services = services;
-    }
-
-    public Map<String, Member> getReferenceSite() {
-        return referenceSites;
-    }
-
-    public void addReferenceSite(String name, Member member) {
-        referenceSites.put(name, member);
-    }
-
-    public Map<String, Member> getCallbackSite() {
-        return callbackSites;
-    }
-
-    public void addCallbackSite(String name, Member member) {
-        callbackSites.put(name, member);
-    }
-
-    public Map<String, Member> getPropertySites() {
-        return propertySites;
-    }
-
-    public void addPropertySite(String name, Member member) {
-        propertySites.put(name, member);
-    }
-
-    public WireService getWireService() {
-        return wireService;
-    }
-
-    public void setWireService(WireService wireService) {
-        this.wireService = wireService;
-    }
-
-    public WorkContext getWorkContext() {
-        return workContext;
-    }
-
-    public void setWorkContext(WorkContext workContext) {
-        this.workContext = workContext;
-    }
-
-}
diff --git a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyImplementation.java b/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyImplementation.java
deleted file mode 100644
index 96b4a3bc2d..0000000000
--- a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyImplementation.java
+++ /dev/null
@@ -1,45 +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.groovy;
-
-import org.apache.tuscany.spi.model.AtomicImplementation;
-
-/**
- * Model object for a Groovy implementation.
- */
-public class GroovyImplementation extends AtomicImplementation<GroovyComponentType> {
-
-    //the Groovy source to be executed
-    private String script;
-
-    /**
-     * Returns the Groovy source to be executed.
-     */
-    public String getScript() {
-        return script;
-    }
-
-    /**
-     * Sets the Groovy source to be executed.
-     */
-    public void setScript(String script) {
-        this.script = script;
-    }
-
-}
diff --git a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInvoker.java b/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInvoker.java
deleted file mode 100644
index b6fdbbb0b6..0000000000
--- a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/GroovyInvoker.java
+++ /dev/null
@@ -1,87 +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.groovy;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.apache.tuscany.spi.wire.InvocationRuntimeException;
-import org.apache.tuscany.spi.wire.Message;
-import org.apache.tuscany.spi.wire.TargetInvoker;
-
-import groovy.lang.GroovyObject;
-
-/**
- * Dispatches to a Groovy implementation instance
- *
- * @version $$Rev$$ $$Date$$
- */
-public class GroovyInvoker implements TargetInvoker, Cloneable {
-
-    protected GroovyAtomicComponent component;
-    protected String operation;
-    protected boolean cacheable;
-
-    public GroovyInvoker(String operation, GroovyAtomicComponent context) {
-        this.component = context;
-        this.operation = operation;
-    }
-
-    public boolean isCacheable() {
-        return cacheable;
-    }
-
-    public void setCacheable(boolean cacheable) {
-        this.cacheable = cacheable;
-    }
-
-    public boolean isOptimizable() {
-        return false;
-    }
-
-    /**
-     * Dispatches to the the target.
-     */
-    public Object invokeTarget(final Object payload) throws InvocationTargetException {
-        GroovyObject target = component.getTargetInstance();
-        Object[] args = (Object[]) payload;
-        try {
-            return target.invokeMethod(operation, args);
-        } catch (Exception ex) {
-            throw new InvocationTargetException(ex);
-        }
-    }
-
-    public Message invoke(Message msg) throws InvocationRuntimeException {
-        try {
-            Object resp = invokeTarget(msg.getBody());
-            msg.setBody(resp);
-        } catch (InvocationTargetException e) {
-            msg.setBodyWithFault(e.getCause());
-        } catch (Throwable e) {
-            msg.setBodyWithFault(e);
-        }
-        return msg;
-    }
-
-    public GroovyInvoker clone() throws CloneNotSupportedException {
-        return (GroovyInvoker) super.clone();
-    }
-
-
-}
diff --git a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/ImplementationLoader.java b/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/ImplementationLoader.java
deleted file mode 100644
index da93abbd9d..0000000000
--- a/branches/sca-java-M2/sca/services/containers/container.groovy/src/main/java/org/apache/tuscany/container/groovy/ImplementationLoader.java
+++ /dev/null
@@ -1,110 +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.groovy;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-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.LoaderExtension;
-import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.loader.LoaderRegistry;
-import org.apache.tuscany.spi.loader.LoaderUtil;
-import org.apache.tuscany.spi.loader.MissingResourceException;
-
-/**
- * Loader for handling <groovy:implementation> elements.
- *
- * @version $Rev$ $Date$
- */
-public class ImplementationLoader extends LoaderExtension<GroovyImplementation> {
-    private static final QName IMPLEMENTATION_GROOVY =
-        new QName("http://incubator.apache.org/tuscany/xmlns/container/groovy/1.0-incubator-M2", "implementation.groovy");
-
-    public ImplementationLoader(@Autowire LoaderRegistry registry) {
-        super(registry);
-    }
-
-    public QName getXMLType() {
-        return IMPLEMENTATION_GROOVY;
-    }
-
-    public GroovyImplementation load(CompositeComponent parent,
-                                     XMLStreamReader reader,
-                                     DeploymentContext deploymentContext)
-        throws XMLStreamException, LoaderException {
-
-        String script = reader.getAttributeValue(null, "script");
-        if (script == null) {
-            throw new MissingResourceException("No script supplied");
-        }
-        String source = loadSource(deploymentContext.getClassLoader(), script);
-
-        LoaderUtil.skipToEndElement(reader);
-
-        GroovyImplementation implementation = new GroovyImplementation();
-        implementation.setScript(source);
-        // no component type support
-        //registry.loadComponentType(parent, implementation, deploymentContext);
-        return implementation;
-    }
-
-    protected String loadSource(ClassLoader cl, String resource) throws LoaderException {
-        URL url = cl.getResource(resource);
-        if (url == null) {
-            throw new MissingResourceException(resource);
-        }
-        InputStream is;
-        try {
-            is = url.openStream();
-        } catch (IOException e) {
-            MissingResourceException mre = new MissingResourceException(resource, e);
-            mre.setIdentifier(resource);
-            throw mre;
-        }
-        try {
-            Reader reader = new InputStreamReader(is, "UTF-8");
-            char[] buffer = new char[1024];
-            StringBuilder source = new StringBuilder();
-            int count;
-            while ((count = reader.read(buffer)) > 0) {
-                source.append(buffer, 0, count);
-            }
-            return source.toString();
-        } catch (IOException e) {
-            LoaderException le = new LoaderException(e);
-            le.setIdentifier(resource);
-            throw le;
-        } finally {
-            try {
-                is.close();
-            } catch (IOException e) {
-                // ignore
-            }
-        }
-    }
-}