Moving 1.x branches

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

17 files changed, 0 insertions, 907 deletions

diff --git a/branches/sca-java-0.99/modules/binding-http/DISCLAIMER b/branches/sca-java-0.99/modules/binding-http/DISCLAIMER
deleted file mode 100644
index d68a410903..0000000000
--- a/branches/sca-java-0.99/modules/binding-http/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Tuscany is an effort undergoing incubation at The Apache Software

-Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is

-required of all newly accepted projects until a further review indicates that

-the infrastructure, communications, and decision making process have stabilized

-in a manner consistent with other successful ASF projects. While incubation

-status is not necessarily a reflection of the completeness or stability of the

-code, it does indicate that the project has yet to be fully endorsed by the ASF.

-

diff --git a/branches/sca-java-0.99/modules/binding-http/LICENSE b/branches/sca-java-0.99/modules/binding-http/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-java-0.99/modules/binding-http/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-
-
diff --git a/branches/sca-java-0.99/modules/binding-http/NOTICE b/branches/sca-java-0.99/modules/binding-http/NOTICE
deleted file mode 100644
index 94481d6cfa..0000000000
--- a/branches/sca-java-0.99/modules/binding-http/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2007 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-0.99/modules/binding-http/pom.xml b/branches/sca-java-0.99/modules/binding-http/pom.xml
deleted file mode 100644
index a0b7a3fc7e..0000000000
--- a/branches/sca-java-0.99/modules/binding-http/pom.xml
+++ /dev/null
@@ -1,94 +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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>0.99-incubating-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-http</artifactId>
-    <name>Apache Tuscany HTTP Binding Model</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>0.99-incubating-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-java-xml</artifactId>
-            <version>0.99-incubating-SNAPSHOT</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>0.99-incubating-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>0.99-incubating-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>0.99-incubating-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-http-jetty</artifactId>
-            <version>0.99-incubating-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource</artifactId>
-            <version>0.99-incubating-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResource.java b/branches/sca-java-0.99/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-0.99/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-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBinding.java b/branches/sca-java-0.99/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-0.99/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-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingFactory.java b/branches/sca-java-0.99/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-0.99/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-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingFactoryImpl.java b/branches/sca-java-0.99/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-0.99/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-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java b/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java
deleted file mode 100644
index aab392b2ed..0000000000
--- a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPResourceBindingImpl.java
+++ /dev/null
@@ -1,61 +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 java.util.Collections;
-import java.util.List;
-
-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
-    }
-
-}
diff --git a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceBindingProviderFactory.java b/branches/sca-java-0.99/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-0.99/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-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java b/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.java
deleted file mode 100644
index 32b0c4cc4a..0000000000
--- a/branches/sca-java-0.99/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/provider/HTTPResourceServiceBindingProvider.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.provider;
-
-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 uri; 
-    
-    public HTTPResourceServiceBindingProvider(RuntimeComponent component,
-                                              RuntimeComponentService service,
-                                              HTTPResourceBinding binding,
-                                              MessageFactory messageFactory,
-                                              ServletHost servletHost) {
-        this.service = service;
-        this.binding = binding;
-        this.messageFactory = messageFactory;
-        this.servletHost = servletHost;
-
-        uri = binding.getURI();
-        if (!uri.endsWith("/")) {
-            uri += "/";
-        }
-        if (!uri.endsWith("*")) {
-            uri += "*";
-        }
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return service.getInterfaceContract();
-    }
-
-    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();
-        
-        // Register the default resource servlet with the servlet host
-        DefaultResourceServlet resourceServlet = new DefaultResourceServlet(locationURL.toString());
-        servletHost.addServletMapping(uri, resourceServlet);
-        
-    }
-
-    public void stop() {
-        
-        // Unregister from the hosting server
-        servletHost.removeServletMapping(uri);
-    }
-
-}
diff --git a/branches/sca-java-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPResourceBindingFactory b/branches/sca-java-0.99/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-0.99/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-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-0.99/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-0.99/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-0.99/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/branches/sca-java-0.99/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-0.99/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-0.99/modules/binding-http/src/test/java/org/apache/tuscany/sca/binding/http/HTTPResourceBindingTestCase.java b/branches/sca-java-0.99/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-0.99/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-0.99/modules/binding-http/src/test/resources/content/test.html b/branches/sca-java-0.99/modules/binding-http/src/test/resources/content/test.html
deleted file mode 100644
index f4b79d7f01..0000000000
--- a/branches/sca-java-0.99/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-0.99/modules/binding-http/src/test/resources/resource.composite b/branches/sca-java-0.99/modules/binding-http/src/test/resources/resource.composite
deleted file mode 100644
index 3b57544db5..0000000000
--- a/branches/sca-java-0.99/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">
-    	<service name="Resource">
-    		<tuscany:binding.http uri="http://localhost:8085/webcontent"/>
-    	</service>
-        <tuscany:implementation.resource location="content"/>
-    </component>
-
-</composite>