Moving 1.x branches

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

18 files changed, 903 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/DefaultEchoBindingFactory.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/DefaultEchoBindingFactory.java
new file mode 100644
index 0000000000..b27b936302
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/DefaultEchoBindingFactory.java
@@ -0,0 +1,33 @@
+/*
+ * 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 echo;
+
+import echo.impl.EchoBindingImpl;
+
+/**
+ * A factory for the sample Echo binding model.
+ */
+public class DefaultEchoBindingFactory implements EchoBindingFactory {
+
+    public EchoBinding createEchoBinding() {
+        return new EchoBindingImpl();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBinding.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBinding.java
new file mode 100644
index 0000000000..446f720634
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBinding.java
@@ -0,0 +1,28 @@
+/*
+ * 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 echo;
+
+import org.apache.tuscany.sca.assembly.Binding;
+
+/**
+ * A model for the sample Echo binding.
+ */
+public interface EchoBinding extends Binding {
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBindingFactory.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBindingFactory.java
new file mode 100644
index 0000000000..d893babb18
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/EchoBindingFactory.java
@@ -0,0 +1,33 @@
+/*
+ * 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 echo;
+
+/**
+ * A factory for the sample Echo binding model.
+ */
+public interface EchoBindingFactory {
+    
+    /**
+     * Creates a new Echo binding.
+     * 
+     * @return a new Echi binding
+     */
+    EchoBinding createEchoBinding();
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingImpl.java
new file mode 100644
index 0000000000..ef1629d519
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingImpl.java
@@ -0,0 +1,77 @@
+/*
+ * 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 echo.impl;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicySet;
+
+import echo.EchoBinding;
+
+/**
+ * Implementation of the Echo binding model.
+ */
+public class EchoBindingImpl implements EchoBinding {
+    
+    private String name;
+    private String uri;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getURI() {
+        return uri;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setURI(String uri) {
+        this.uri = uri;
+    }
+
+    public List<PolicySet> getPolicySets() {
+        // The sample binding does not support policies
+        return Collections.emptyList();
+    }
+
+    public List<Intent> getRequiredIntents() {
+        // The sample binding does not support policies
+        return Collections.emptyList();
+    }
+    
+    public List<Object> getExtensions() {
+        // The sample binding does not support extensions
+        return Collections.emptyList();
+    }
+
+    public boolean isUnresolved() {
+        return false;
+    }
+
+    public void setUnresolved(boolean unresolved) {
+        // The sample binding is always resolved
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingProcessor.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingProcessor.java
new file mode 100644
index 0000000000..aba0b14d55
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/impl/EchoBindingProcessor.java
@@ -0,0 +1,73 @@
+/*
+ * 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 echo.impl;
+
+import static org.osoa.sca.Constants.SCA_NS;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.contribution.service.ContributionReadException;
+import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
+import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
+
+import echo.EchoBinding;
+import echo.EchoBindingFactory;
+
+/**
+ * A processor for <binding.echo> elements.
+ */
+public class EchoBindingProcessor implements StAXArtifactProcessor<EchoBinding> {
+
+    private QName BINDING_ECHO = new QName(SCA_NS, "binding.echo");
+    
+    private final EchoBindingFactory factory;
+
+    public EchoBindingProcessor(EchoBindingFactory factory) {
+        this.factory = factory;
+    }
+
+    public QName getArtifactType() {
+        return BINDING_ECHO;
+    }
+
+    public Class<EchoBinding> getModelType() {
+        return EchoBinding.class;
+    }
+
+    public EchoBinding read(XMLStreamReader reader) throws ContributionReadException {
+        String uri = reader.getAttributeValue(null, "uri");
+        EchoBinding echoBinding = factory.createEchoBinding();
+        if (uri != null) {
+            echoBinding.setURI(uri.trim());
+        }
+        return echoBinding;
+    }
+
+    public void write(EchoBinding echoBinding, XMLStreamWriter writer) throws ContributionWriteException {
+    }
+
+    public void resolve(EchoBinding echoBinding, ModelResolver resolver) throws ContributionResolveException {
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/module/EchoModuleActivator.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/module/EchoModuleActivator.java
new file mode 100644
index 0000000000..268b903e54
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/module/EchoModuleActivator.java
@@ -0,0 +1,69 @@
+/*
+ * 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 echo.module;
+
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ModelFactoryExtensionPoint;
+import org.apache.tuscany.sca.core.ModuleActivator;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
+
+import echo.DefaultEchoBindingFactory;
+import echo.EchoBindingFactory;
+import echo.impl.EchoBindingProcessor;
+import echo.provider.EchoBindingProviderFactory;
+import echo.server.EchoServer;
+
+/**
+ * A module activator for the sample Echo binding extension.
+ */
+public class EchoModuleActivator implements ModuleActivator {
+    
+    public Object[] getExtensionPoints() {
+        // No extensionPoints being contributed here
+        return null;
+    }
+
+    public void start(ExtensionPointRegistry registry) {
+        
+        ModelFactoryExtensionPoint factories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class);
+        MessageFactory messageFactory = factories.getFactory(MessageFactory.class);
+        
+        // Create the Echo model factory
+        EchoBindingFactory echoFactory = new DefaultEchoBindingFactory();
+
+        // Add the EchoProcessor extension
+        StAXArtifactProcessorExtensionPoint processors = registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+        EchoBindingProcessor echoBindingProcessor = new EchoBindingProcessor(echoFactory);
+        processors.addArtifactProcessor(echoBindingProcessor);
+        
+        ProviderFactoryExtensionPoint providerFactories = registry.getExtensionPoint(ProviderFactoryExtensionPoint.class);
+        providerFactories.addProviderFactory(new EchoBindingProviderFactory(messageFactory));
+       
+        // Start the Echo server
+        EchoServer.start();
+    }
+
+    public void stop(ExtensionPointRegistry registry) {
+        EchoServer.stop();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingInvoker.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingInvoker.java
new file mode 100644
index 0000000000..e3d52fa703
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingInvoker.java
@@ -0,0 +1,48 @@
+/*
+ * 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 echo.provider;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.invocation.Message;
+
+/**
+ * Interceptor for the sample echo binding.
+ */
+public class EchoBindingInvoker implements Invoker {
+
+    private Object echo(Object[] args) throws InvocationTargetException {
+        // echo back the result, a real binding would invoke some API for flowing the request
+        return args[0];
+    }
+
+    public Message invoke(Message msg) {
+        try {
+            Object resp = echo((Object[])msg.getBody());
+            msg.setBody(resp);
+        } catch (InvocationTargetException e) {
+            msg.setFaultBody(e.getCause());
+        } catch (Throwable e) {
+            msg.setFaultBody(e);
+        }
+        return msg;
+    }  
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingProviderFactory.java
new file mode 100644
index 0000000000..623cb0e16e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoBindingProviderFactory.java
@@ -0,0 +1,55 @@
+/*
+ * 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 echo.provider;
+
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.provider.BindingProviderFactory;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+
+import echo.EchoBinding;
+
+
+/**
+ * Implementation of the Echo binding model.
+ */
+public class EchoBindingProviderFactory implements BindingProviderFactory<EchoBinding> {
+    
+    private MessageFactory messageFactory;
+    
+    public EchoBindingProviderFactory(MessageFactory messageFactory) {
+        this.messageFactory = messageFactory;
+    }
+
+    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, EchoBinding binding) {
+        return new EchoReferenceBindingProvider(component, reference, binding);
+    }
+
+    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, EchoBinding binding) {
+        return new EchoServiceBindingProvider(component, service, binding, messageFactory);
+    }
+    
+    public Class<EchoBinding> getModelType() {
+        return EchoBinding.class;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoReferenceBindingProvider.java
new file mode 100644
index 0000000000..dd1a8f42f8
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoReferenceBindingProvider.java
@@ -0,0 +1,62 @@
+/*
+ * 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 echo.provider;
+
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.interfacedef.Operation;
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
+
+import echo.EchoBinding;
+
+/**
+ * Implementation of the Echo binding provider.
+ */
+public class EchoReferenceBindingProvider implements ReferenceBindingProvider {
+
+    private RuntimeComponentReference reference;
+
+    public EchoReferenceBindingProvider(RuntimeComponent component,
+                                        RuntimeComponentReference reference,
+                                        EchoBinding binding) {
+        this.reference = reference;
+    }
+
+    public Invoker createInvoker(Operation operation, boolean isCallback) {
+        if (isCallback) {
+            throw new UnsupportedOperationException();
+        } else {
+            return new EchoBindingInvoker();
+        }
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        return reference.getInterfaceContract();
+    }
+
+    public void start() {
+    }
+
+    public void stop() {
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoServiceBindingProvider.java
new file mode 100644
index 0000000000..896e40df8d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/provider/EchoServiceBindingProvider.java
@@ -0,0 +1,74 @@
+/*
+ * 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 echo.provider;
+
+import org.apache.tuscany.sca.interfacedef.InterfaceContract;
+import org.apache.tuscany.sca.invocation.InvocationChain;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+import org.apache.tuscany.sca.provider.ServiceBindingProvider;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
+import org.apache.tuscany.sca.runtime.RuntimeComponentService;
+import org.apache.tuscany.sca.runtime.RuntimeWire;
+
+import echo.EchoBinding;
+import echo.server.EchoServer;
+import echo.server.EchoService;
+
+/**
+ * Implementation of the Echo binding provider.
+ */
+public class EchoServiceBindingProvider implements ServiceBindingProvider {
+    
+    private RuntimeComponent component;
+    private RuntimeComponentService service;  
+    private EchoBinding binding;
+    private MessageFactory messageFactory;
+    
+    public EchoServiceBindingProvider(RuntimeComponent component,
+                                      RuntimeComponentService service, EchoBinding binding, MessageFactory messageFactory) {
+        this.component = component;
+        this.service = service;
+        this.binding = binding;
+        this.messageFactory = messageFactory;
+    }
+
+    public InterfaceContract getBindingInterfaceContract() {
+        return service.getInterfaceContract();
+    }
+
+    public void start() {
+
+        RuntimeComponentService componentService = (RuntimeComponentService) service;
+        RuntimeWire wire = componentService.getRuntimeWire(binding);
+        InvocationChain chain = wire.getInvocationChains().get(0);
+        
+        // Register with the hosting server
+        String uri = component.getURI() + "/" + binding.getName();
+        EchoServer.getServer().register(uri, new EchoService(chain.getHeadInvoker(), messageFactory));
+    }
+
+    public void stop() {
+        
+        // Unregister from the hosting server
+        String uri = component.getURI() + "/" + binding.getName();
+        EchoServer.getServer().unregister(uri);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoServer.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoServer.java
new file mode 100644
index 0000000000..e1c88c38f9
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoServer.java
@@ -0,0 +1,72 @@
+/*
+ * 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 echo.server;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A sample Echo server, showing how to integrate service bindings. 
+ */
+public class EchoServer {
+
+    public static EchoServer server;
+
+    private Map<String, EchoService> services = new HashMap<String, EchoService>();
+
+    public static void start() {
+        server = new EchoServer();
+    }
+
+    public static void stop() {
+        server = null;
+    }
+
+    public static EchoServer getServer() {
+        return server;
+    }
+
+    /**
+     * Register a service under the given name.
+     * 
+     * @param service
+     * @param name
+     */
+    public void register(String uri, EchoService service) {
+        services.put(uri, service);
+    }
+
+    public void unregister(String uri) {
+        services.remove(uri);
+    }
+
+    /**
+     * Dispatch an incoming interaction to the corresponding service.
+     * 
+     * @param uri
+     * @param input
+     * @return
+     */
+    public String sendReceive(String uri, String input) throws InvocationTargetException {
+        return services.get(uri).sendReceive(input);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoService.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoService.java
new file mode 100644
index 0000000000..79593b2b6c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/java/echo/server/EchoService.java
@@ -0,0 +1,53 @@
+/*
+ * 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 echo.server;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.apache.tuscany.sca.invocation.Invoker;
+import org.apache.tuscany.sca.invocation.Message;
+import org.apache.tuscany.sca.invocation.MessageFactory;
+
+/**
+ * The EchoService
+ */
+public class EchoService {
+    private Invoker invoker;
+    private MessageFactory messageFactory;
+
+    public EchoService(Invoker invoker, MessageFactory messageFactory) {
+        super();
+        this.invoker = invoker;
+        this.messageFactory = messageFactory;
+    }
+
+    public String sendReceive(String input) throws InvocationTargetException {
+
+        Message request = messageFactory.createMessage();
+        request.setBody(new Object[] {input});
+        // dispatch and get the response
+        Message response = invoker.invoke(request);
+        Object body = response.getBody();
+        if (response.isFault()) {
+            throw new InvocationTargetException((Throwable)body);
+        }
+        return (String)body;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
new file mode 100644
index 0000000000..13d0d6f570
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
@@ -0,0 +1,18 @@
+# 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. 

+# Implementation class for the ExtensionActivator

+echo.module.EchoModuleActivator

diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/Echo.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/Echo.java
new file mode 100644
index 0000000000..1d5e973f33
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/Echo.java
@@ -0,0 +1,29 @@
+/*
+ * 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 echo;
+
+/**
+ * Interface of our sample Echo service.
+ * 
+ * @version $Rev$ $Date$
+ */
+public interface Echo {
+    
+    String echo(String msg);
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoComponentImpl.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoComponentImpl.java
new file mode 100644
index 0000000000..ba68dfe908
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoComponentImpl.java
@@ -0,0 +1,44 @@
+/*
+ * 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 echo;
+
+import org.osoa.sca.annotations.Constructor;
+import org.osoa.sca.annotations.Reference;
+
+
+/**
+ * A simple client component that uses a reference with an Echo binding.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class EchoComponentImpl implements Echo {
+
+    private Echo echoReference;
+
+    @Constructor
+    public EchoComponentImpl(@Reference(name = "echoReference", required = true) Echo echoReference) {
+        this.echoReference = echoReference;
+    }
+
+    public String echo(String msg) {
+        String result = echoReference.echo(msg);
+        System.out.println("Returned message: "+ result);
+        return result;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoReferenceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoReferenceTestCase.java
new file mode 100644
index 0000000000..dc6a37c11f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoReferenceTestCase.java
@@ -0,0 +1,48 @@
+/*
+ * 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 echo;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class EchoReferenceTestCase extends TestCase {
+
+    private SCADomain scaDomain;
+    private Echo service;
+
+    protected void setUp() throws Exception {
+        scaDomain = SCADomain.newInstance("EchoBinding.composite");
+        service = scaDomain.getService(Echo.class, "EchoComponent");
+    }
+    
+    protected void tearDown() throws Exception {
+        scaDomain.close();
+    }
+
+    public void testEchoBinding() {
+        String result = service.echo("foo");
+        assertEquals(result, "foo");
+    }
+
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoServiceTestCase.java b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoServiceTestCase.java
new file mode 100644
index 0000000000..fafc112d01
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/java/echo/EchoServiceTestCase.java
@@ -0,0 +1,48 @@
+/*
+ * 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 echo;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+import echo.server.EchoServer;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class EchoServiceTestCase extends TestCase {
+
+    private SCADomain scaDomain;
+
+    protected void setUp() throws Exception {
+        scaDomain = SCADomain.newInstance("EchoBinding.composite");
+    }
+    
+    protected void tearDown() throws Exception {
+        scaDomain.close();
+    }
+
+    public void testEchoBinding() throws Exception {
+        String result = EchoServer.getServer().sendReceive("EchoComponent/EchoService", "foo");
+        assertEquals(result, "foo");
+    }
+
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/resources/EchoBinding.composite b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/resources/EchoBinding.composite
new file mode 100644
index 0000000000..7a792343f9
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.90/samples/binding-echo/src/test/resources/EchoBinding.composite
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	targetNamespace="http://echo"
+	xmlns:echo="http://echo"
+	name="EchoBinding">
+
+    <service name="EchoService" promote="EchoComponent">
+        <interface.java interface="echo.Echo"/>
+        <binding.echo uri="http://tempuri.org" />
+    </service>
+
+    <component name="EchoComponent">
+        <implementation.java class="echo.EchoComponentImpl"/>
+    </component>
+    
+    <reference name="EchoReference" promote="EchoComponent/echoReference">
+        <interface.java interface="echo.Echo"/>
+        <binding.echo uri="http://tempuri.org" />
+    </reference>
+    
+</composite>