Moving 1.x branches

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

20 files changed, 0 insertions, 1667 deletions

diff --git a/branches/sca-java-20080910/modules/binding-sca/LICENSE b/branches/sca-java-20080910/modules/binding-sca/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/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-20080910/modules/binding-sca/NOTICE b/branches/sca-java-20080910/modules/binding-sca/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-20080910/modules/binding-sca/pom.xml b/branches/sca-java-20080910/modules/binding-sca/pom.xml
deleted file mode 100644
index c8af2d4628..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/pom.xml
+++ /dev/null
@@ -1,93 +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>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-binding-sca</artifactId>
-    <name>Apache Tuscany SCA Default Binding Model</name>
-
-    <dependencies>
-      
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>  
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency> 
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>       
-        
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-impl</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>    
-        
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <version>2.2</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.binding.sca</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.sca*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java b/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
deleted file mode 100644
index 167c93e86d..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/DistributedSCABinding.java
+++ /dev/null
@@ -1,37 +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.sca;

-

-import org.apache.tuscany.sca.assembly.Binding;

-import org.apache.tuscany.sca.assembly.SCABinding;

-

-

-/**

- * Represents an SCA binding used in the distributed runtime.

- * At the moment just provides us with a sensibly named type 

- * against which the distributed sca binding providers can be registered

- * 

- * @version $Rev: 556322 $ $Date: 2007-07-14 19:53:15 +0100 (Sat, 14 Jul 2007) $

- */

-public interface DistributedSCABinding extends Binding {

-    

-    SCABinding getSCABinding();

-    void setSCABinding(SCABinding scaBinding);

-

-}

diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java b/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
deleted file mode 100644
index bd24d4b14c..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/SCABindingDefinitionsProvider.java
+++ /dev/null
@@ -1,73 +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.sca;
-
-import java.net.URI;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedExceptionAction;
-
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.provider.SCADefinitionsProvider;
-import org.apache.tuscany.sca.provider.SCADefinitionsProviderException;
-
-/**
- * Provider for Policy Intents and PolicySet definitions related to security
- *
- * @version $Rev$ $Date$
- */
-public class SCABindingDefinitionsProvider implements SCADefinitionsProvider {
-    private String definitionsFile = "org/apache/tuscany/sca/binding/sca/definitions.xml";
-    URLArtifactProcessor urlArtifactProcessor = null;
-    
-    public SCABindingDefinitionsProvider(ExtensionPointRegistry registry) {
-        URLArtifactProcessorExtensionPoint documentProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class);
-        urlArtifactProcessor = (URLArtifactProcessor)documentProcessors.getProcessor(SCADefinitions.class);
-    }
-
-    public SCADefinitions getSCADefinition() throws SCADefinitionsProviderException {
-        // Allow privileged access to load resource. Requires RuntimePermssion in security policy.
-        final URL definitionsFileUrl = AccessController.doPrivileged(new PrivilegedAction<URL>() {
-            public URL run() {
-                return getClass().getClassLoader().getResource(definitionsFile);
-            }
-        });
-
-        SCADefinitions scaDefn = null;
-        try {
-            final URI uri = new URI(definitionsFile);
-            // Allow bindings to read properties. Requires PropertyPermission read in security policy. 
-            scaDefn = AccessController.doPrivileged(new PrivilegedExceptionAction<SCADefinitions>() {
-                public SCADefinitions run() throws ContributionReadException {
-                    return (SCADefinitions)urlArtifactProcessor.read(null, uri, definitionsFileUrl);
-                }
-            });
-        } catch (Exception e) {
-            throw new SCADefinitionsProviderException(e);
-        }
-        return scaDefn;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java b/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
deleted file mode 100644
index 43b0cd8f4e..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/DistributedSCABindingImpl.java
+++ /dev/null
@@ -1,116 +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.sca.impl;

-

-import org.apache.tuscany.sca.assembly.SCABinding;

-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;

-

-/**

- * The Distributed SCA binding wrapper for the SCA binding model object. This is currently

- * just used to locate the remote binding extension and pass the SCA binding to the remote

- * extension. It isn't used in the model itself

- * 

- * @version $Rev: 564307 $ $Date: 2007-08-09 18:48:29 +0100 (Thu, 09 Aug 2007) $

- */

-public class DistributedSCABindingImpl implements DistributedSCABinding {

-    

-    private SCABinding scaBinding;

-    

-    /**

-     * Getter for the wrapped sca binding model object

-     * 

-     * @return the sca binding model element

-     */

-    public SCABinding getSCABinding(){

-        return scaBinding;

-    }

-    

-    /**

-     * Setter for the wrapped sca binding model element

-     * 

-     * @param scaBinding the sca binding model element

-     */

-    public void setSCABinding(SCABinding scaBinding){

-        this.scaBinding = scaBinding;

-    }

-

-    

-    // Operation implementations provided to make this class a 

-    // valid Binding

-    

-    /**

-     * Returns the binding URI.

-     * 

-     * @return the binding URI

-     */

-    public String getURI(){

-        return null;

-    }

-

-    /**

-     * Sets the binding URI.

-     * 

-     * @param uri the binding URI

-     */

-    public void setURI(String uri){

-    }

-

-    /**

-     * Returns the binding name.

-     * 

-     * @return the binding name

-     */

-    public String getName(){

-        return null;

-    }

-

-    /**

-     * Sets the binding name.

-     * 

-     * @param name the binding name

-     */

-    public void setName(String name){

-    }

-    

-    /**

-     * Returns true if the model element is unresolved.

-     * 

-     * @return true if the model element is unresolved.

-     */

-    public boolean isUnresolved(){

-        return false;

-    }

-

-    /**

-     * Sets whether the model element is unresolved.

-     * 

-     * @param unresolved whether the model element is unresolved

-     */

-    public void setUnresolved(boolean unresolved){

-    }

-    

-    /**

-     * Clone the binding

-     */

-    @Override

-    public Object clone() throws CloneNotSupportedException {

-        return super.clone();

-    }     

-

-}

diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java b/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java
deleted file mode 100644
index 86629fb378..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RemoteBindingHelper.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package org.apache.tuscany.sca.binding.sca.impl;

-

-/**

- * TODO: TUSCANY-2578, implement a pluggable mechanism so sca binding impls can 

- *               add their own code to the decision on whether or not to use

- *               the remote binding provider.

- */

-public class RemoteBindingHelper {

-    

-    private static boolean alwaysRemote;

-    static {

-        try {

-            Class.forName("org.apache.tuscany.sca.binding.sca.jms.JMSSCABindingProviderFactory");

-            alwaysRemote = true;

-        } catch (ClassNotFoundException e) {

-            alwaysRemote = false;

-        }

-    }

-    

-    public static boolean isTargetRemote() {

-        return alwaysRemote;

-    }

-

-}

diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java b/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.java
deleted file mode 100644
index 5c1cefb808..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProvider.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.sca.impl;
-
-import org.apache.tuscany.sca.assembly.SCABinding;
-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;
-
-/**
- * The local SCA Binding provider implementation. It is not currently used. 
- * 
- * @version $Rev$ $Date$
- */
-public class RuntimeSCABindingProvider implements ReferenceBindingProvider {
-    
-    private RuntimeComponentReference reference;
-    
-    public RuntimeSCABindingProvider(RuntimeComponent component, RuntimeComponentReference reference, SCABinding binding) {
-        this.reference = reference;
-    }
-    
-    public InterfaceContract getBindingInterfaceContract() {
-        return reference.getInterfaceContract();
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        return null;
-    }
-
-    public void start() {
-    }
-
-    public void stop() {
-    }
-    
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java b/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.java
deleted file mode 100644
index 5dda74f72e..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCABindingProviderFactory.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.sca.impl;
-
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-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;
-
-/**
- * The factory for creating SCA Binding providers
- * 
- * @version $Rev$ $Date$
- */
-public class RuntimeSCABindingProviderFactory implements BindingProviderFactory<SCABinding> {
-    
-    private ExtensionPointRegistry extensionPoints;
-    
-    public RuntimeSCABindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;
-     
-    } 
-    
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component,
-                                                                   RuntimeComponentReference reference,
-                                                                   SCABinding binding) {
-              
-        return  new RuntimeSCAReferenceBindingProvider(extensionPoints, component, reference, binding);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component,
-                                                               RuntimeComponentService service,
-                                                               SCABinding binding) {
-        return new RuntimeSCAServiceBindingProvider(extensionPoints, component, service, binding);
-    }
-
-    public Class<SCABinding> getModelType() {
-        return SCABinding.class;
-    }
-}
diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java b/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
deleted file mode 100644
index 850fd77e96..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
+++ /dev/null
@@ -1,236 +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.sca.impl;
-
-import java.net.URI;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.InvocationChain;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.EndpointReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.osoa.sca.ServiceUnavailableException;
-
-/** 
- * The sca reference binding provider mediates between the twin requirements of 
- * local sca bindings and remote sca bindings. In the local case is does 
- * very little. When the sca binding model is set as being remote (because a 
- * reference target can't be resolved in the current model) this binding will 
- * try and create a remote connection to it
- * 
- * @version $Rev$ $Date$
- */
-public class RuntimeSCAReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private static final Logger logger = Logger.getLogger(RuntimeSCAReferenceBindingProvider.class.getName());
-
-    private RuntimeComponent component;
-    private RuntimeComponentReference reference;
-    private SCABinding binding;
-    private boolean started = false;
-
-    private BindingProviderFactory<DistributedSCABinding> distributedProviderFactory = null;
-    private ReferenceBindingProvider distributedProvider = null;
-
-    public RuntimeSCAReferenceBindingProvider(ExtensionPointRegistry extensionPoints,
-                                              RuntimeComponent component,
-                                              RuntimeComponentReference reference,
-                                              SCABinding binding) {
-        this.component = component;
-        this.reference = reference;
-        this.binding = binding;
-
-        // look to see if a distributed SCA binding implementation has
-        // been included on the classpath. This will be needed by the 
-        // provider itself to do it's thing
-        ProviderFactoryExtensionPoint factoryExtensionPoint =
-            extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-        distributedProviderFactory =
-            (BindingProviderFactory<DistributedSCABinding>)factoryExtensionPoint
-                .getProviderFactory(DistributedSCABinding.class);
-
-    }
-
-    public boolean isTargetRemote() {
-        boolean targetIsRemote = false;
-
-        // first look at the target service and see if this has been resolved
-        OptimizableBinding optimizableBinding = (OptimizableBinding)binding;
-
-        // The decision is based on the results of the wiring process in the assembly model
-        // The SCA binding is used to represent unresolved reference targets, i.e. those
-        // reference targets that need resolving at run time. We can tell by lookin if the 
-        // service to which this binding refers is resolved or not. 
-        //
-        // TODO - When a callback is in operation. A callback reference bindings sometimes has to 
-        //        act as though there is a local wire and sometimes as if there is a remote wire
-        //        what are the implications of this here?
-
-        if (RemoteBindingHelper.isTargetRemote()) {
-            if (reference.getInterfaceContract() != null) {
-                targetIsRemote = reference.getInterfaceContract().getInterface().isRemotable();
-            } else {
-                targetIsRemote = true;
-            }
-        } else if (optimizableBinding.getTargetComponentService() != null) {
-            if (optimizableBinding.getTargetComponentService().isUnresolved() == true) {
-                targetIsRemote = true;
-            } else {
-                targetIsRemote = false;
-            }
-        } else {
-            // the case where the wire is specified by URI, e.g. callbacks or user specified bindings, and
-            // look at the provided URI to decide whether it is a local or remote case
-            try {
-                URI uri = new URI(binding.getURI());
-                if (uri.isAbsolute()) {
-                    targetIsRemote = true;
-                } else {
-                    targetIsRemote = false;
-                }
-            } catch (Exception ex) {
-                targetIsRemote = false;
-            }
-        }
-        return targetIsRemote;
-    }
-
-    private ReferenceBindingProvider getDistributedProvider() {
-
-        if (isTargetRemote()) {
-            // initialize the remote provider if it hasn't been done already
-            if (distributedProvider == null) {
-                if (reference.getInterfaceContract() != null && !reference.getInterfaceContract().getInterface().isRemotable()) {
-                    throw new IllegalStateException("Reference interface not remotable for component: " + component
-                        .getName()
-                        + " and reference: "
-                        + reference.getName());
-                }
-
-                if (distributedProviderFactory == null) {
-                    throw new IllegalStateException("No distributed SCA binding available for component: " + component
-                        .getName()
-                        + " and reference: "
-                        + reference.getName());
-                }
-
-                // create the remote provider
-                DistributedSCABinding distributedBinding = new DistributedSCABindingImpl();
-                distributedBinding.setSCABinding(binding);
-
-                distributedProvider =
-                    distributedProviderFactory.createReferenceBindingProvider(component, reference, distributedBinding);
-            }
-        }
-
-        return distributedProvider;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        if (isTargetRemote()) {
-            return getDistributedProvider().getBindingInterfaceContract();
-        } else {
-            if (reference.getReference() != null) {
-                return reference.getReference().getInterfaceContract();
-            } else {
-                return reference.getInterfaceContract();
-            }
-        }
-    }
-
-    public boolean supportsOneWayInvocation() {
-        if (isTargetRemote()) {
-            return getDistributedProvider().supportsOneWayInvocation();
-        } else {
-            return false;
-        }
-    }
-
-    private Invoker getInvoker(RuntimeWire wire, Operation operation) {
-        EndpointReference target = wire.getTarget();
-        if (target != null) {
-            RuntimeComponentService service = (RuntimeComponentService)target.getContract();
-            if (service != null) { // not a callback wire
-                SCABinding scaBinding = service.getBinding(SCABinding.class);
-                InvocationChain chain =
-                    service.getInvocationChain(scaBinding, wire.getSource().getInterfaceContract(), operation);
-                return chain == null ? null : new SCABindingInvoker(chain);
-            }
-        }
-        return null;
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        if (isTargetRemote()) {
-            return getDistributedProvider().createInvoker(operation);
-        } else {
-            RuntimeWire wire = reference.getRuntimeWire(binding);
-            Invoker invoker = getInvoker(wire, operation);
-            if (invoker == null) {
-                throw new ServiceUnavailableException("Unable to create SCA binding invoker for local target " + component.getName()
-                    + " reference "
-                    + reference.getName()
-                    + " (bindingURI="
-                    + binding.getURI()
-                    + " operation="
-                    + operation.getName()
-                    + ")" );
-            }
-            return invoker;
-        }
-    }
-
-    public void start() {
-        if (started) {
-            return;
-        } else {
-            started = true;
-        }
-
-        if (getDistributedProvider() != null) {
-            distributedProvider.start();
-        }
-    }
-
-    public void stop() {
-        if (!started) {
-            return;
-        } else {
-            started = false;
-        }
-
-        if (getDistributedProvider() != null) {
-            distributedProvider.stop();
-        }
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java b/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
deleted file mode 100644
index 8994ba5381..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
+++ /dev/null
@@ -1,154 +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.sca.impl;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.binding.sca.DistributedSCABinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * The sca service binding provider mediates between the twin requirements of 
- * local sca bindings and remote sca bindings. In the local case is does 
- * very little. When the sca binding model is set as being remote this binding will 
- * try and create a remote service endpoint for remote references to connect to 
- * 
- * @version $Rev$ $Date$
- */
-public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider {
-  
-    private RuntimeComponentService service;
-    private BindingProviderFactory<DistributedSCABinding> distributedProviderFactory;
-    private ServiceBindingProvider distributedProvider;
-    private DistributedSCABinding distributedBinding;
-    
-    public RuntimeSCAServiceBindingProvider(ExtensionPointRegistry extensionPoints,
-                                            RuntimeComponent component,
-                                            RuntimeComponentService service,
-                                            SCABinding binding) {
-        this.service = service;
-        // if there is potentially a wire to this service that crosses the node boundary 
-        if (service.getInterfaceContract().getInterface().isRemotable()) {  
-            
-            // look to see if a distributed SCA binding implementation has
-            // been included on the classpath. This will be needed by the 
-            // provider itself to do it's thing
-            ProviderFactoryExtensionPoint factoryExtensionPoint =
-                extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class);
-            distributedProviderFactory =
-                (BindingProviderFactory<DistributedSCABinding>)factoryExtensionPoint
-                    .getProviderFactory(DistributedSCABinding.class);      
-            
-            // Check the things that will generally be required to set up a 
-            // distributed sca domain reference provider. I.e. make sure that we have a
-            // - distributed implementation of the sca binding available
-            // - remotable interface on the service
-            if (distributedProviderFactory != null) {
-                
-                URI serviceURI = null;
-                try {
-                    serviceURI = new URI(binding.getURI());
-                } catch(Exception ex) {
-                    
-                }
-                
-                if (RemoteBindingHelper.isTargetRemote() || ((serviceURI != null) && (serviceURI.isAbsolute()))) {          
-                    
-                    //  create a nested provider to handle the remote case
-                    distributedBinding = new DistributedSCABindingImpl();
-                    distributedBinding.setSCABinding(binding);
-                    
-                    distributedProvider = 
-                        distributedProviderFactory.createServiceBindingProvider(component, service, distributedBinding);
-                    
-                
-                } else {
-                     /* do nothing at the moment as only apps using the node implementation
-                      * will currently have the distributed domain set. 
-                      * 
-                    throw new IllegalStateException("No distributed domain available for component: "+
-                            component.getName() +
-                            " and service: " + 
-                            service.getName());
-                    */
-                }
-            } else {
-                /* do nothing at the moment as all services with remotable interfaces
-                 * are marked as remote
-                throw new IllegalStateException("No distributed SCA binding available for component: "+
-                        component.getName() +
-                        " and service: " + 
-                        service.getName());
-                */
-            }
-        } 
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        if (distributedProvider != null) {
-            return distributedProvider.getBindingInterfaceContract();
-        } else {
-            if (service.getService() != null) {
-                return service.getService().getInterfaceContract();
-            } else {
-                return service.getInterfaceContract();
-            }
-        }
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-    
-    public void start() {
-        if (distributedProvider != null) {
-            distributedProvider.start();
-        }
-    }
-
-    public void stop() {
-        if (distributedProvider != null) {
-            distributedProvider.stop();
-        }
-        
-        if (distributedBinding != null) {
-            // reset the binding URI to null so that if the composite containing the component
-            // with the service/binding is restarted the binding will have the correct URI set
-            SCABinding scaBinding = distributedBinding.getSCABinding();
-            try {
-                URI tempURI = new URI(scaBinding.getURI());
-                if (!tempURI.isAbsolute()){
-                    scaBinding.setURI(null);
-                }
-            } catch (Exception ex){
-                scaBinding.setURI(null);
-            } 
-        }
-        
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java b/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
deleted file mode 100644
index ea758823a9..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingFactoryImpl.java
+++ /dev/null
@@ -1,40 +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.sca.impl;
-
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-
-/**
- * A factory for the SCA binding model.
- * 
- * @version $Rev$ $Date$
- */
-public class SCABindingFactoryImpl implements SCABindingFactory {
-    
-    public SCABindingFactoryImpl (){
-        
-    }
-
-    public SCABinding createSCABinding() {
-        return new SCABindingImpl();
-    }
-    
-}
diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java b/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
deleted file mode 100644
index c93ddd9503..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingImpl.java
+++ /dev/null
@@ -1,223 +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.sca.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.Extensible;
-import org.apache.tuscany.sca.assembly.OptimizableBinding;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.builder.AutomaticBinding;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-
-/**
- * The assembly mode object for an SCA binding.
- * 
- * @version $Rev$ $Date$
- */
-public class SCABindingImpl implements SCABinding, Extensible, PolicySetAttachPoint, OptimizableBinding, AutomaticBinding {
-    private String name;
-    private String uri;
-    private List<Object> extensions = new ArrayList<Object>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private IntentAttachPointType intentAttachPointType;
-    
-    private Component targetComponent;
-    private ComponentService targetComponentService;
-    private Binding targetBinding;
-    private List<PolicySet> applicablePolicySets = new ArrayList<PolicySet>();
-    
-    private boolean isAutomatic = false;
-    
-    public List<PolicySet> getApplicablePolicySets() {
-        return applicablePolicySets;
-    }
-
-    /**
-     * Constructs a new SCA binding.
-     */
-    protected SCABindingImpl() {
-    }
-    
-    // SCA Binding operations
-    
-    /**
-     * Setters for the binding name. Defaults to the
-     * name of the service or reference with which the binding is
-     * associated
-     * 
-     * @return the binding name
-     */
-    public String getName() {
-        return name;
-    }
-    
-    /**
-     * Setter for the binding name
-     * 
-     * @param name the binding name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * Getters for the binding URI. The computed URI for the 
-     * service that the reference is targeting or which the service represents
-     * depending on whether the biding is associated with a reference or
-     * service
-     * 
-     * @return the binding URI
-     */
-    public String getURI() {
-        return uri;
-    }
-
-    /**
-     * Setter for the binding URI
-     * 
-     * @param uri the binding URI
-     */
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-    
-    /**
-     * Returns a list of extension objects contained in this model object.
-     * 
-     * @return a list of extension objects container in this model object
-     */
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-    
-    /**
-     * Returns true if the model element is unresolved.
-     * 
-     * @return true if the model element is unresolved.
-     */
-    public boolean isUnresolved() {
-        if (targetComponentService == null){
-            return true;
-        } else {
-            return targetComponentService.isUnresolved();
-        }
-    }
-    
-    /**
-     * Sets whether the model element is unresolved.
-     * 
-     * @param unresolved whether the model element is unresolved
-     */    
-    public void setUnresolved(boolean unresolved) {
-    }
-
-    /**
-     * @see java.lang.Object#clone()
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-    
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-    
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public IntentAttachPointType getType() {
-        return intentAttachPointType;
-    }
-    
-    public void setType(IntentAttachPointType intentAttachPointType) {
-        this.intentAttachPointType = intentAttachPointType;
-    }
-    
-    // Wireable binding operations
-
-    /**
-     * @return the targetComponent
-     */
-    public Component getTargetComponent() {
-        return targetComponent;
-    }
-
-    /**
-     * @param targetComponent the targetComponent to set
-     */
-    public void setTargetComponent(Component targetComponent) {
-        this.targetComponent = targetComponent;
-    }
-
-    /**
-     * @return the targetComponentService
-     */
-    public ComponentService getTargetComponentService() {
-        return targetComponentService;
-    }
-
-    /**
-     * @param targetComponentService the targetComponentService to set
-     */
-    public void setTargetComponentService(ComponentService targetComponentService) {
-        this.targetComponentService = targetComponentService;
-    }
-
-    /**
-     * @return the targetBinding
-     */
-    public Binding getTargetBinding() {
-        return targetBinding;
-    }
-
-    /**
-     * @param targetBinding the targetBinding to set
-     */
-    public void setTargetBinding(Binding targetBinding) {
-        this.targetBinding = targetBinding;
-    }
-    
-    public void setPolicySets(List<PolicySet> policySets) {
-        this.policySets = policySets; 
-    }
-
-    public void setRequiredIntents(List<Intent> intents) {
-        this.requiredIntents = intents;
-    }
-    
-
-    public void setIsAutomatic(boolean isAutomatic){
-        this.isAutomatic = isAutomatic;
-    }
-    
-    public boolean getIsAutomatic(){
-        return this.isAutomatic;
-    }
-}
diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java b/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
deleted file mode 100644
index 52c0f64fe5..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/SCABindingInvoker.java
+++ /dev/null
@@ -1,71 +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.sca.impl;
-
-import org.apache.tuscany.sca.invocation.Interceptor;
-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.DataExchangeSemantics;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SCABindingInvoker implements Interceptor, DataExchangeSemantics {
-    private InvocationChain chain;
-    
-    /**
-     * Construct a SCABindingInvoker that delegates to the service invocaiton chain
-     * @param chain
-     */
-    public SCABindingInvoker(InvocationChain chain) {
-        super();
-        this.chain = chain;
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Interceptor#getNext()
-     */
-    public Invoker getNext() {
-        return chain.getHeadInvoker();
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Interceptor#setNext(org.apache.tuscany.sca.invocation.Invoker)
-     */
-    public void setNext(Invoker next) {
-        // NOOP
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.Invoker#invoke(org.apache.tuscany.sca.invocation.Message)
-     */
-    public Message invoke(Message msg) {
-        return getNext().invoke(msg);
-    }
-
-    /**
-     * @see org.apache.tuscany.sca.invocation.DataExchangeSemantics#allowsPassByReference()
-     */
-    public boolean allowsPassByReference() {
-        return chain.allowsPassByReference();
-    }
-
-}
diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory b/branches/sca-java-20080910/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
deleted file mode 100644
index 4efa03a933..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.binding.sca.impl.SCABindingFactoryImpl

diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/branches/sca-java-20080910/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 5c6b8e21fc..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/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.sca.impl.RuntimeSCABindingProviderFactory;model=org.apache.tuscany.sca.assembly.SCABinding

diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider b/branches/sca-java-20080910/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
deleted file mode 100644
index 22c9a64b05..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProvider
+++ /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 SCA Definitions Providers
-org.apache.tuscany.sca.binding.sca.SCABindingDefinitionsProvider
\ No newline at end of file
diff --git a/branches/sca-java-20080910/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/branches/sca-java-20080910/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
deleted file mode 100644
index 8bac9e01c9..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.    
--->
-<sca:definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"
- 			targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
- 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
- 			xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
- 			
-	<sca:bindingType type="sca:binding.sca"  mayProvide="" alwaysProvides=""/>	 		
- </sca:definitions>
\ No newline at end of file
diff --git a/branches/sca-java-20080910/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/branches/sca-java-20080910/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
deleted file mode 100644
index ff396566d6..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package org.apace.tuscany.sca.binding.sca;
-
-import java.io.InputStream;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamReader;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.SCABindingFactory;
-import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
-import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
-import org.apache.tuscany.sca.assembly.xml.CompositeModelResolver;
-import org.apache.tuscany.sca.binding.sca.impl.SCABindingFactoryImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * SCABindingTestCase
- *
- * @version $Rev$ $Date$
- */
-public class SCABindingTestCase {
-	
-    private XMLInputFactory inputFactory;
-    private StAXArtifactProcessor<Object> staxProcessor; 
-    private CompositeModelResolver resolver; 
-    private CompositeBuilder compositeBuilder;
-
-    @Before
-    public void init() throws Exception { 
-        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
-        inputFactory = XMLInputFactory.newInstance();
-
-        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
-        
-        resolver = new CompositeModelResolver(null, null);
-        
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        AssemblyFactory assemblyFactory = modelFactories.getFactory(AssemblyFactory.class);
-        SCABindingFactory scaBindingFactory = modelFactories.getFactory(SCABindingFactory.class);
-        IntentAttachPointTypeFactory attachPointTypeFactory = modelFactories.getFactory(IntentAttachPointTypeFactory.class);
-
-        UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class);
-        InterfaceContractMapper mapper = utilities.getUtility(InterfaceContractMapper.class);
-        compositeBuilder = new CompositeBuilderImpl(assemblyFactory, scaBindingFactory, attachPointTypeFactory, mapper, null);
-        
-    }
-    
-    @Test
-    public void testSCABindingFactory() {
-        SCABindingFactory factory = new SCABindingFactoryImpl();
-        Assert.assertNotNull(factory.createSCABinding());
-    }
-    
-    @Test 
-    public void testBuildModel() {
-    	try{
-	        InputStream is = getClass().getResourceAsStream("/Calculator.composite");      
-	        XMLStreamReader reader = inputFactory.createXMLStreamReader(is);
-	        Composite composite = (Composite)staxProcessor.read(reader);
-	        
-	        is.close();
-	        Assert.assertNotNull(composite);
-	        
-	        resolver.addModel(composite);
-	       
-	        staxProcessor.resolve(composite, resolver);
-	        
-	        compositeBuilder.build(composite);
-	        
-	        SCABinding referenceSCABinding = (SCABinding) composite.getComponents().get(0).getReferences().get(0).getBindings().get(0);
-	        SCABinding serviceSCABinding   = (SCABinding) composite.getComponents().get(1).getServices().get(0).getBindings().get(0);
-	        
-	        Assert.assertNotNull(referenceSCABinding);
-	        Assert.assertNotNull(serviceSCABinding);
-    	} catch (Exception ex) {
-    		Assert.fail(ex.getMessage());
-    	}
-    	
-    }
-}
diff --git a/branches/sca-java-20080910/modules/binding-sca/src/test/resources/Calculator.composite b/branches/sca-java-20080910/modules/binding-sca/src/test/resources/Calculator.composite
deleted file mode 100644
index 37b26f3d68..0000000000
--- a/branches/sca-java-20080910/modules/binding-sca/src/test/resources/Calculator.composite
+++ /dev/null
@@ -1,52 +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"

-    xmlns:calc="http://calc"

-    targetNamespace="http://calc"

-    name="Calculator">

-    

-    <component name="CalculatorServiceComponent">

-        <implementation.java class="calculator.CalculatorServiceImpl"/>

-        <reference name="addService" target="AddServiceComponent"/>

-        <reference name="subtractService" target="SubtractServiceComponent"/>

-        <reference name="multiplyService" target="MultiplyServiceComponent"/>

-        <reference name="divideService" target="DivideServiceComponent"/>

-    </component>

-    

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl"/>

-        <service name="AddService">

-            <interface.java interface="calculator.AddService"/>

-        </service>        

-    </component>

-    

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl"/>

-    </component>

-    

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl"/>

-    </component>

-    

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl"/>

-    </component>

-

-</composite>
\ No newline at end of file