Moving 1.x branches

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

13 files changed, 0 insertions, 615 deletions

diff --git a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java b/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java
deleted file mode 100644
index 7ed660a54f..0000000000
--- a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java
+++ /dev/null
@@ -1,38 +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.sca.binding.http;
-
-import java.net.URL;
-
-/**
- * The service interface of resource implementations.
- * 
- * @version $Rev$ $Date$
- */
-public interface HTTPResource {
-    
-    /**
-     * Returns the resource location URL.
-     * 
-     * @return
-     */
-    public URL getLocationURL();
-
-}
diff --git a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java b/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java
deleted file mode 100644
index be9483b3c0..0000000000
--- a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java
+++ /dev/null
@@ -1,29 +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.sca.binding.http;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-
-/**
- * HTTP resource binding model.
- */
-public interface HTTPResourceBinding extends Binding {
-}
diff --git a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java b/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java
deleted file mode 100644
index cf59e07782..0000000000
--- a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java
+++ /dev/null
@@ -1,35 +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.sca.binding.http;
-
-/**
- * Factory for the HTTP resource binding model.
- *
- * @version $Rev$ $Date$
- */
-public interface HTTPResourceBindingFactory {
-    
-    /**
-     * Creates a new HTTP resource binding.
-     * @return a new HTTP resource binding
-     */
-    HTTPResourceBinding createHTTPResourceBinding();
-
-}
diff --git a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java b/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java
deleted file mode 100644
index 9620c2bc04..0000000000
--- a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java
+++ /dev/null
@@ -1,36 +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.sca.binding.http.impl;
-
-import org.apache.tuscany.sca.binding.http.HTTPResourceBinding;
-import org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory;
-
-/**
- * Factory for the HTTP resource binding model.
- *
- * @version $Rev$ $Date$
- */
-public class HTTPResourceBindingFactoryImpl implements HTTPResourceBindingFactory {
-
-    public HTTPResourceBinding createHTTPResourceBinding() {
-        return new HTTPResourceBindingImpl();
-    }
-
-}
diff --git a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java b/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java
deleted file mode 100644
index da75eb43ee..0000000000
--- a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java
+++ /dev/null
@@ -1,62 +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.sca.binding.http.impl;
-
-import org.apache.tuscany.sca.binding.http.HTTPResourceBinding;
-
-
-/**
- * Implementation of the HTTP resource binding model.
- */
-class HTTPResourceBindingImpl implements HTTPResourceBinding {
-    
-    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 boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // The sample binding is always resolved
-    }
-    
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }     
-
-}
diff --git a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java b/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java
deleted file mode 100644
index 2cb7b1d530..0000000000
--- a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java
+++ /dev/null
@@ -1,62 +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.sca.binding.http.provider;
-
-import org.apache.tuscany.sca.binding.http.HTTPResourceBinding;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-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;
-
-
-/**
- * Implementation of the Echo binding model.
- */
-public class HTTPResourceBindingProviderFactory implements BindingProviderFactory<HTTPResourceBinding> {
-
-    private MessageFactory messageFactory;
-    private ServletHost servletHost;
-    
-    public HTTPResourceBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class);
-        this.servletHost = servletHosts.getServletHosts().get(0);
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        messageFactory = modelFactories.getFactory(MessageFactory.class);
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, RuntimeComponentReference reference, HTTPResourceBinding binding) {
-        return null;
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, RuntimeComponentService service, HTTPResourceBinding binding) {
-        return new HTTPResourceServiceBindingProvider(component, service, binding, messageFactory, servletHost);
-    }
-    
-    public Class<HTTPResourceBinding> getModelType() {
-        return HTTPResourceBinding.class;
-    }
-}
diff --git a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java b/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java
deleted file mode 100644
index ca7a73bf58..0000000000
--- a/branches/sca-java-1.1/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java
+++ /dev/null
@@ -1,127 +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.sca.binding.http.provider;
-
-import java.io.File;
-import java.net.URL;
-
-import org.apache.tuscany.sca.binding.http.HTTPResourceBinding;
-import org.apache.tuscany.sca.host.http.DefaultResourceServlet;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-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;
-
-/**
- * Implementation of the Echo binding provider.
- */
-public class HTTPResourceServiceBindingProvider implements ServiceBindingProvider {
-    
-    private RuntimeComponentService service;  
-    private HTTPResourceBinding binding;
-    private MessageFactory messageFactory;
-    private ServletHost servletHost;
-    private String servletMapping;
-    
-    public HTTPResourceServiceBindingProvider(RuntimeComponent component,
-                                              RuntimeComponentService service,
-                                              HTTPResourceBinding binding,
-                                              MessageFactory messageFactory,
-                                              ServletHost servletHost) {
-        this.service = service;
-        this.binding = binding;
-        this.messageFactory = messageFactory;
-        this.servletHost = servletHost;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return service.getInterfaceContract();
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-
-        // Get the target component implementation, for now we are assuming
-        // that it's an implementation.resource
-        RuntimeComponentService componentService = (RuntimeComponentService) service;
-        RuntimeWire wire = componentService.getRuntimeWire(binding);
-        
-        // Get the getLocationURL invoker
-        Invoker getLocationInvoker = null;
-        for (InvocationChain invocationChain : wire.getInvocationChains()) {
-            String operationName = invocationChain.getSourceOperation().getName();
-            if (operationName.equals("getLocationURL")) {
-                getLocationInvoker = invocationChain.getHeadInvoker();
-            }
-        }
-        if (getLocationInvoker == null) {
-            throw new IllegalStateException("No getLocationURL operation found on target component");
-        }
-
-        // Get the location URL
-        Message message = messageFactory.createMessage();
-        message = getLocationInvoker.invoke(message);
-        URL locationURL = message.getBody();
-        
-        // If resource is a file, register the parent dir
-        try {
-            if( locationURL.getProtocol().equals("file")) {
-                File fileLocation = new File(locationURL.toURI());
-                if (fileLocation.isFile()) {
-                    File parent = new File(fileLocation.getParent());
-                    locationURL = parent.toURL();
-                }                
-            }
-        }catch(Exception e) {
-            throw new IllegalStateException("Invalid getLocationURL, could not retrieve parent folder");
-        }
-        
-        // Register the default resource servlet with the servlet host
-        DefaultResourceServlet resourceServlet = new DefaultResourceServlet(locationURL.toString());
-
-        servletMapping = binding.getURI();
-        if (!servletMapping.endsWith("/")) {
-            servletMapping += "/";
-        }
-        if (!servletMapping.endsWith("*")) {
-            servletMapping += "*";
-        }
-        servletHost.addServletMapping(servletMapping, resourceServlet);
-        
-        // Save the actual binding URI in the binding
-        binding.setURI(servletHost.getURLMapping(binding.getURI()).toString());
-    }
-
-    public void stop() {
-        
-        // Unregister from the hosting server
-        servletHost.removeServletMapping(servletMapping);
-    }
-
-}
diff --git a/branches/sca-java-1.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory b/branches/sca-java-1.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory
deleted file mode 100644
index ae416c25f0..0000000000
--- a/branches/sca-java-1.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for model factory
-org.apache.tuscany.sca.binding.http.impl.HTTPResourceBindingFactoryImpl
diff --git a/branches/sca-java-1.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-1.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index bdccbd7314..0000000000
--- a/branches/sca-java-1.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,19 +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. 
-
-# Implementation class for the artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.0#binding.http,model=org.apache.tuscany.sca.binding.http.HTTPResourceBinding,factory=org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory
diff --git a/branches/sca-java-1.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/branches/sca-java-1.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 1351707239..0000000000
--- a/branches/sca-java-1.1/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.http.provider.HTTPResourceBindingProviderFactory;model=org.apache.tuscany.sca.binding.http.HTTPResourceBinding

diff --git a/branches/sca-java-1.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java b/branches/sca-java-1.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java
deleted file mode 100644
index 72eb537a8b..0000000000
--- a/branches/sca-java-1.1/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java
+++ /dev/null
@@ -1,107 +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.sca.binding.http;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class HTTPResourceBindingTestCase extends TestCase {
-
-//    private static final String REQUEST1_HEADER =
-//        "GET /ResourceServiceComponent/test.html HTTP/1.0\n" + "Host: localhost\n"
-//            + "Content-Type: text/xml\n"
-//            + "Connection: close\n"
-//            + "Content-Length: ";
-//    private static final String REQUEST1_CONTENT = "";
-//    private static final String REQUEST1 =
-//        REQUEST1_HEADER + REQUEST1_CONTENT.getBytes().length + "\n\n" + REQUEST1_CONTENT;
-
-    private static final String REQUEST2_HEADER =
-        "GET /webcontent/test.html HTTP/1.0\n" + "Host: localhost\n"
-            + "Content-Type: text/xml\n"
-            + "Connection: close\n"
-            + "Content-Length: ";
-    private static final String REQUEST2_CONTENT = "";
-    private static final String REQUEST2 =
-        REQUEST2_HEADER + REQUEST2_CONTENT.getBytes().length + "\n\n" + REQUEST2_CONTENT;
-
-    private static final int HTTP_PORT = 8085;
-
-    private SCADomain scaDomain;
-    
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("resource.composite");
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    // This works with port 8080 but we can't use that port on the build
-    // machine as it's already in use
-//    public void testResourceImplementation() throws Exception {
-//        Socket client = new Socket("127.0.0.1", HTTP_PORT);
-//        OutputStream os = client.getOutputStream();
-//        os.write(REQUEST1.getBytes());
-//        os.flush();
-//        
-//        String document = read(client);
-//        assertTrue(document.indexOf("<body><p>hello</body>") != -1);
-//    }
-
-    public void testResourceImplementationWithBindingURI() throws Exception {
-        Socket client = new Socket("127.0.0.1", HTTP_PORT);
-        OutputStream os = client.getOutputStream();
-        os.write(REQUEST2.getBytes());
-        os.flush();
-        
-        String document = read(client);
-        assertTrue(document.indexOf("<body><p>hello</body>") != -1);
-    }
-
-    private static String read(Socket socket) throws IOException {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
-            StringBuffer sb = new StringBuffer();
-            String str;
-            while ((str = reader.readLine()) != null) {
-                sb.append(str);
-            }
-            return sb.toString();
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
-    }
-
-}
diff --git a/branches/sca-java-1.1/modules/binding-http/src/test/resources/content/test.html b/branches/sca-java-1.1/modules/binding-http/src/test/resources/content/test.html
deleted file mode 100644
index f4b79d7f01..0000000000
--- a/branches/sca-java-1.1/modules/binding-http/src/test/resources/content/test.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<!--
-    * 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.    
--->
-<body><p>hello</body>
-</html>
\ No newline at end of file
diff --git a/branches/sca-java-1.1/modules/binding-http/src/test/resources/resource.composite b/branches/sca-java-1.1/modules/binding-http/src/test/resources/resource.composite
deleted file mode 100644
index 1f672e2c66..0000000000
--- a/branches/sca-java-1.1/modules/binding-http/src/test/resources/resource.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-<?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://sample/resource"
-	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
-	xmlns:sr="http://sample/resource"
-	name="resource">
-
-	<!--  This works with port 8080 but we can't test this on the build machine
-	as 8080 is already in use -->
-	<!--
-    <component name="ResourceServiceComponent">
-        <implementation.resource location="content"/>
-    </component>
-    -->
-
-    <component name="ResourceServiceComponent2">
-        <tuscany:implementation.resource location="content"/>
-    	<service name="Resource">
-    		<tuscany:binding.http uri="http://localhost:8085/webcontent"/>
-    	</service>
-    </component>
-
-</composite>