Moving 1.x branches

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

11 files changed, 0 insertions, 878 deletions

diff --git a/branches/sca-java-integration/testing/sca/itest/operation-overloading/LICENSE.txt b/branches/sca-java-integration/testing/sca/itest/operation-overloading/LICENSE.txt
deleted file mode 100644
index 0084319535..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/operation-overloading/LICENSE.txt
+++ /dev/null
@@ -1,202 +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, serviceDefinition 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-integration/testing/sca/itest/operation-overloading/NOTICE.txt b/branches/sca-java-integration/testing/sca/itest/operation-overloading/NOTICE.txt
deleted file mode 100644
index d83ebbe236..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/operation-overloading/NOTICE.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2006 The Apache Software Foundation
-
-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.
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-integration/testing/sca/itest/operation-overloading/pom.xml b/branches/sca-java-integration/testing/sca/itest/operation-overloading/pom.xml
deleted file mode 100644
index 4b92e62197..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/operation-overloading/pom.xml
+++ /dev/null
@@ -1,43 +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>
-	<parent>
-		<groupId>org.apache.tuscany.testing</groupId>
-		<artifactId>sca-itest</artifactId>
-		<version>0.1-integration-incubating-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>iTest-operation-overloading</artifactId>
-	<packaging>jar</packaging>
-	<name>Test Suite Operator over loading.</name>
-	<!-- JAX-WS temporary only until java.net maven2 repo is ready-->
-	<dependencies>
-		<!-- Required extensions -->
-		<!-- End of Required extensions -->
-		 <dependency>
-            <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>0.1-integration-incubating-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-		
-	</dependencies>
-</project>
diff --git a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java b/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.java
deleted file mode 100644
index fd6d9038eb..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/OverloadASourceTarget.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.test.opoverload;
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-
-/**
- * 
- */
-//@AllowsPassByReference
-public interface OverloadASourceTarget {
-    final String opName = "operationA:";
-    
-    String operationA();
-    
-    String operationA(int parm1);
-    
-    String operationA(int parm1, String parm2);
-    
-    String operationA(String parm1, int parm2);
-
-    String operationA(String string);
-
-    String[] operationAall();
-
-}
\ No newline at end of file
diff --git a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java b/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
deleted file mode 100644
index 30687f9c78..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadASource.java
+++ /dev/null
@@ -1,105 +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.test.opoverload.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * 
- */
-@Service(OverloadASourceTarget.class)
-public class OverloadASource implements OverloadASourceTarget{
-    public OverloadASourceTarget overloadASourceTarget;
-    /**
-     * 
-     */
-    public OverloadASource()  {
-      
-    }
-    /**
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA()
-     */
-    public String[] operationAall() {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        ArrayList<String> ret = new ArrayList<String>();
-        ret.add(overloadASourceTarget.operationA());
-        ret.add(overloadASourceTarget.operationA(11));
-        ret.add(overloadASourceTarget.operationA("eleven"));
-        ret.add(overloadASourceTarget.operationA(3,"three"));
-        ret.add(overloadASourceTarget.operationA("four",4));
-        return (String[]) ret.toArray(new String[ret.size()]);
-    }
- 
-       
-    /**
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA()
-     */
-    public String operationA() {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-         return overloadASourceTarget.operationA();
-    }
-    /**
-     * @param parm1
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int)
-     */
-    public String operationA(int parm1) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA(parm1);
-    }
-    /**
-     * @param parm1
-     * @param parm2
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int, java.lang.String)
-     */
-    public String operationA(int parm1, String parm2) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA(parm1, parm2);
-    }
-    public String operationA(String string) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA(string);
-    }
-    /**
-     * @param parm1
-     * @param parm2
-     * @return
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(java.lang.String, int)
-     */
-    public String operationA(String parm1, int parm2) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is null";
-        return overloadASourceTarget.operationA(parm1, parm2);
-    }
-
-    @Reference
-    public void setOverloadASourceTarget(OverloadASourceTarget overloadASourceTarget) {
-        assert overloadASourceTarget != null : "reference overloadASourceTarget is set tonull";
-        this.overloadASourceTarget = overloadASourceTarget;
-    }
-
-}
diff --git a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java b/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
deleted file mode 100644
index e83952e573..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATarget.java
+++ /dev/null
@@ -1,96 +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.test.opoverload.impl;
-
-import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
-import org.osoa.sca.annotations.Service;
-
-/**
- * 
- */
-@Service(OverloadASourceTarget.class)
-public class OverloadATarget implements OverloadASourceTarget {
-
-    /**
-     * 
-     */
-    public OverloadATarget() {
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int)
-     */
-    public String operationA(int parm1) {
-        final String ret = opName + parm1;
-        out(ret);
-        return ret;
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA(int,
-     *      java.lang.String)
-     */
-    public String operationA(int parm1, String parm2) {
-        final String ret = opName + parm1 + parm2;
-        out(ret);
-        return ret;
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget#operationA()
-     */
-    public String operationA() {
-        out(opName);
-        return opName;
-
-    }
-
-    public String operationA(String parm1, int parm2) {
-        final String ret = opName + parm1 + parm2;
-        out(ret);
-        return ret;
-    }
-
-    public String operationA(String parm1) {
-        final String ret = opName + parm1;
-        out(ret);
-        return ret;
-    }
-
-    private void out(String msg) {
-
-        java.lang.System.out.println(msg);
-    }
-
-    public String[] operationAall() {
-        throw new IllegalArgumentException("not supported");
-       
-    }
-
-}
diff --git a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/interceptor/MessageInterceptor.java b/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/interceptor/MessageInterceptor.java
deleted file mode 100644
index 8d2447a66b..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/interceptor/MessageInterceptor.java
+++ /dev/null
@@ -1,114 +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.test.opoverload.interceptor;
-
-import java.io.FileWriter;
-import java.io.IOException;
-
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.wire.Interceptor;
-import org.apache.tuscany.spi.wire.Message;
-import org.apache.tuscany.spi.wire.Wire;
-
-/**
- * An interceptor to transform data accross databindings on the wire
- * 
- * @version $Rev$ $Date$
- */
-public class MessageInterceptor implements Interceptor {
-    private Interceptor next;
-
-    private CompositeComponent compositeComponent;
-
-    private Operation<?> sourceOperation;
-
-    private Operation<?> targetOperation;
-
-    protected FileWriter fw= null;
-  
-
-    public MessageInterceptor(Wire sourceWire, Operation<?> sourceOperation, Operation<?> targetOperation) {
-        super();
-        // this.sourceWire = sourceWire;
-        this.sourceOperation = sourceOperation;
-        // this.targetWire = targetWire;
-        this.targetOperation = targetOperation;
-        this.compositeComponent = sourceWire.getContainer().getParent();
-        
-        
-        try {
-             fw = new FileWriter("MessageInterceptor.log", true);
-        } catch (IOException e) {
-            fw= null;
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * @see org.apache.tuscany.spi.wire.Interceptor#getNext()
-     */
-    public Interceptor getNext() {
-        return next;
-    }
-
-    /**
-     * @see org.apache.tuscany.spi.wire.Interceptor#invoke(org.apache.tuscany.spi.wire.Message)
-     */
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.tuscany.spi.wire.Interceptor#invoke(org.apache.tuscany.spi.wire.Message)
-     */
-    public Message invoke(Message msg) {
-        out(msg.toString());
-        return msg;
-      }
-
- 
-
-    private void out(String string) {
-        if( null != fw){
-            try {
-                fw.write(string);
-                fw.flush();
-            } catch (IOException e) {
-                
-            }
-        }
-        
-    }
-
-    /**
-     * @see org.apache.tuscany.spi.wire.Interceptor#isOptimizable()
-     */
-    public boolean isOptimizable() {
-        return false;
-    }
-
-    /**
-     * @see org.apache.tuscany.spi.wire.Interceptor#setNext(org.apache.tuscany.spi.wire.Interceptor)
-     */
-    public void setNext(Interceptor next) {
-        this.next = next;
-    }
-
-
-}
diff --git a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/interceptor/MessageInterceptorWirePostProcessor.java b/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/interceptor/MessageInterceptorWirePostProcessor.java
deleted file mode 100644
index 5c258e2307..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/interceptor/MessageInterceptorWirePostProcessor.java
+++ /dev/null
@@ -1,122 +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.test.opoverload.interceptor;
-
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.spi.component.ReferenceBinding;
-import org.apache.tuscany.spi.component.SCAObject;
-import org.apache.tuscany.spi.model.Operation;
-import org.apache.tuscany.spi.wire.InboundInvocationChain;
-import org.apache.tuscany.spi.wire.InboundWire;
-import org.apache.tuscany.spi.wire.Interceptor;
-import org.apache.tuscany.spi.wire.OutboundInvocationChain;
-import org.apache.tuscany.spi.wire.OutboundWire;
-import org.apache.tuscany.spi.wire.WirePostProcessorExtension;
-
-/**
- * This processor is responsible to add an interceptor to invocation chain if
- * the source and target operations have different databinding requirements
- * 
- * @version $Rev$ $Date$
- */
-public class MessageInterceptorWirePostProcessor extends WirePostProcessorExtension {
-   
-
-    public MessageInterceptorWirePostProcessor() {
-        super();
-
-    }
-
-    public void process(OutboundWire source, InboundWire target) {
-        Map<Operation<?>, OutboundInvocationChain> chains = source.getInvocationChains();
-        for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : chains.entrySet()) {
-            Operation<?> sourceOperation = entry.getKey();
-            Operation<?> targetOperation =
-                getTargetOperation(target.getInvocationChains().keySet(), sourceOperation.getName());
-
-            MessageInterceptor interceptor = new MessageInterceptor(source, sourceOperation, targetOperation);
-
-            entry.getValue().addInterceptor(0, interceptor);
-
-        }
-
-        // Check if there's a callback
-        Map callbackOperations = source.getServiceContract().getCallbackOperations();
-        if (callbackOperations == null || callbackOperations.isEmpty()) {
-            return;
-        }
-        Object targetAddress = source.getContainer().getName();
-        Map<Operation<?>, OutboundInvocationChain> callbackChains =
-            target.getSourceCallbackInvocationChains(targetAddress);
-        if (callbackChains == null) {
-            // callback chains could be null
-            return;
-        }
-        for (Map.Entry<Operation<?>, OutboundInvocationChain> entry : callbackChains.entrySet()) {
-            Operation<?> sourceOperation = entry.getKey();
-            Operation<?> targetOperation =
-                getTargetOperation(source.getTargetCallbackInvocationChains().keySet(), sourceOperation.getName());
-            MessageInterceptor interceptor = new MessageInterceptor(source, sourceOperation, targetOperation);
-            entry.getValue().addInterceptor(0, interceptor);
-
-        }
-    }
-
-    public void process(InboundWire source, OutboundWire target) {
-        SCAObject container = source.getContainer();
-        // Either Service or Reference
-        boolean isReference = container instanceof ReferenceBinding;
-
-        Map<Operation<?>, InboundInvocationChain> chains = source.getInvocationChains();
-        for (Map.Entry<Operation<?>, InboundInvocationChain> entry : chains.entrySet()) {
-            Operation<?> sourceOperation = entry.getKey();
-            Operation<?> targetOperation =
-                getTargetOperation(target.getInvocationChains().keySet(), sourceOperation.getName());
-
-            // Add the interceptor to the source side
-            MessageInterceptor interceptor = new MessageInterceptor(source, sourceOperation, targetOperation);
-
-            if (isReference) {
-
-                target.getInvocationChains().get(targetOperation).addInterceptor(0, interceptor);
-                Interceptor tail = entry.getValue().getTailInterceptor();
-                if (tail != null) {
-                    // HACK to relink the bridging interceptor
-                    tail.setNext(interceptor);
-                }
-            } else {
-                entry.getValue().addInterceptor(0, interceptor);
-            }
-
-        }
-    }
-
-    private Operation getTargetOperation(Set<Operation<?>> operations, String operationName) {
-        for (Operation<?> op : operations) {
-            if (op.getName().equals(operationName)) {
-                return op;
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/resources/META-INF/sca/application.composite b/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/resources/META-INF/sca/application.composite
deleted file mode 100644
index d92e8372fd..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/resources/META-INF/sca/application.composite
+++ /dev/null
@@ -1,34 +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:foo="http://foo" 

-           name="OperationOverloadTest">

-   

-    <component name="OverloadASourceComponent">

-        <implementation.java class="org.apache.tuscany.sca.test.opoverload.impl.OverloadASource" />

-        <reference name="overloadASourceTarget">OverloadATargetComponent</reference>

-    </component>

-

-    <component name="OverloadATargetComponent">

-        <implementation.java class="org.apache.tuscany.sca.test.opoverload.impl.OverloadATarget" />

-    </component>

-

-     

-</composite>

diff --git a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/resources/org/apache/tuscany/sca/test/opoverload/interceptor/MessageInterceptor.scdl b/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/resources/org/apache/tuscany/sca/test/opoverload/interceptor/MessageInterceptor.scdl
deleted file mode 100644
index 87387d8e49..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/main/resources/org/apache/tuscany/sca/test/opoverload/interceptor/MessageInterceptor.scdl
+++ /dev/null
@@ -1,27 +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:system="http://tuscany.apache.org/xmlns/system/1.0-SNAPSHOT"
-    name="org.apache.tuscany.sca.test.opoverload.interceptor"> 
-
-    <component name="MessageInterceptorWirePostProcessor">
-        <system:implementation.system class="org.apache.tuscany.sca.test.opoverload.interceptor.MessageInterceptorWirePostProcessor" />
-    </component>
-
-</composite>
\ No newline at end of file
diff --git a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java b/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
deleted file mode 100644
index 74c1b3cf12..0000000000
--- a/branches/sca-java-integration/testing/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
+++ /dev/null
@@ -1,78 +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.test.opoverload.impl;
-
-import java.io.File;
-import java.net.URL;
-
-import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
-import org.apache.tuscany.test.SCATestCase;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
-public class OverloadATestCase extends SCATestCase {
-    private OverloadASourceTarget overloadA;
-
-    private CompositeContext context;
-
-    
-    public void testOperationAall() {
-      String[] result= overloadA.operationAall();
-       assertEquals(5, result.length);
-       assertEquals(OverloadASourceTarget.opName , result[0]);
-       assertEquals(OverloadASourceTarget.opName + 11, result[1]);
-       assertEquals(OverloadASourceTarget.opName + "eleven", result[2]);
-       assertEquals(OverloadASourceTarget.opName + 3 + "three", result[3]);
-       assertEquals(OverloadASourceTarget.opName +  "four" + 4, result[4]);
- }
-
-//    public void testOperationAInt() {
-//        String result= overloadA.operationA(29);
-//         assertEquals(OverloadASourceTarget.opName + 29, result);
-//    }
-//
-//    public void testOperationAString() {
-//        String result= overloadA.operationA("rick:-)");
-//         assertEquals(OverloadASourceTarget.opName + "rick:-)", result);
-//    }
-//    
-//    public void testOperationAIntString() {
-//        String result= overloadA.operationA(123, "Tuscany");
-//         assertEquals(OverloadASourceTarget.opName +123+ "Tuscany", result);
-//    }
-//
-//    public void testOperationStringInt() {
-//        String result= overloadA.operationA("StringInt", 77);
-//         assertEquals(OverloadASourceTarget.opName + "StringInt" + 77, result);
-//    }
-//  
-    
-    @Override
-    protected void setUp() throws Exception {
-        File cdf = new File (".");
-        String currentdir= cdf.getCanonicalPath();
-        addExtension("org.apache.tuscany.sca.test.opoverload.interceptor", new URL("file:///" + currentdir + "/src/main/resources/org/apache/tuscany/sca/test/opoverload/interceptor/MessageInterceptor.scdl"));
-        super.setUp();
-        context = CurrentCompositeContext.getContext();
-        assertNotNull(context);
-        overloadA = context.locateService(OverloadASourceTarget.class, "OverloadASourceComponent");
-
-        assertNotNull(context);
-    }
-}