Official Tuscany 2.0.1 Release

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

48 files changed, 0 insertions, 2621 deletions

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackInterface.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackInterface.java
deleted file mode 100644
index 4db5531aca..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackInterface.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.tuscany.sca.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * only for callBack

- */

-@Remotable

-public interface CallbackInterface {

-

-    void callbackMethod(String str);

-    

-    void callbackMethod1(String str);

-

-    void modifyParameter(ParameterObject po);

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackMissmatchInterface.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackMissmatchInterface.java
deleted file mode 100644
index 9d9362f4d5..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/CallbackMissmatchInterface.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- *

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

- *

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.

- */

-package org.apache.tuscany.sca.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * only for callBack

- */

-@Remotable

-public interface CallbackMissmatchInterface {

-

-    void callbackMethod(ParameterObject po);

-    

-    void callbackMethod1(ParameterObject po, String str);

-

-    void modifyParameter(ParameterObject po);

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientClientComponentImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientClientComponentImpl.java
deleted file mode 100644
index 66988094e7..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientClientComponentImpl.java
+++ /dev/null
@@ -1,81 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-/*

- * Test that a client can be reference using a target name containing only the component 

- * name when the client has callback services registered. 

- */

-@Service(ClientComponent.class)

-public class ClientClientComponentImpl implements ClientComponent{

-

-    @Reference

-    protected ClientComponent aClient;

-    

-    public String foo(ParameterObject po) {

-        return aClient.foo(po);

-    }    

-

-    public String foo1(ParameterObject po) {

-        return aClient.foo1(po);

-    }

-

-    public String foo2(String str) throws Exception {

-        return str + "AComponent";

-    }

-

-    public String foo3(String str, int i) {

-        return str + "AComponent" + i;

-    }

-

-    public String foo4(int i, String str) throws Exception {

-        return str + "AComponent" + i;

-    }

-

-    public void callback(String str) {

-    }

-

-    public void callbackMethod(String str) {

-    }

-    

-    public void callbackMethod1(String str) {

-    }    

-

-    public void callModifyParameter() {

-    }

-

-    public String getCallbackValue() {

-        return null;

-    }

-

-    public void onewayMethod(String str) {

-    }

-

-    public String getOnewayValue() {

-        return null;

-    }

-

-    public void modifyParameter(ParameterObject po) {

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponent.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponent.java
deleted file mode 100644
index c6a6499126..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponent.java
+++ /dev/null
@@ -1,51 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.OneWay;

-import org.oasisopen.sca.annotation.Remotable;

-

-/*

- * itest for interface: local,method-overloading

- */

-@Remotable

-public interface ClientComponent {

-    

-    String foo(ParameterObject po);

-

-    String foo1(ParameterObject po);

-

-    String foo2(String str) throws Exception;

-

-    String foo3(String str, int i);

-

-    String foo4(int i, String str) throws Exception;

-

-    void callback(String str);

-

-    void callModifyParameter();

-

-    @OneWay

-    void onewayMethod(String str);

-

-    String getCallbackValue();

-

-    String getOnewayValue();

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponentImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponentImpl.java
deleted file mode 100644
index 4a414f870f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponentImpl.java
+++ /dev/null
@@ -1,92 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(ClientComponent.class)

-public class ClientComponentImpl implements ClientComponent, CallbackInterface {

-

-    @Reference

-    protected ServiceComponent aCallBackService;

-    private static String callbackValue;

-    private static String onewayValue;

-    

-    public String foo(ParameterObject po) {

-        po.field1 = "AComponent";

-        return aCallBackService.foo("AComponent");

-    }    

-

-    public String foo1(ParameterObject po) {

-        po.field1 = "AComponent";

-        return aCallBackService.foo1("AComponent");

-    }

-

-    public String foo2(String str) throws Exception {

-        return str + "AComponent";

-    }

-

-    public String foo3(String str, int i) {

-        return str + "AComponent" + i;

-    }

-

-    public String foo4(int i, String str) throws Exception {

-        return str + "AComponent" + i;

-    }

-

-    public void callback(String str) {

-        aCallBackService.callback(str);

-    }

-

-    public void callbackMethod(String str) {

-        callbackValue = str;

-    }

-    

-    public void callbackMethod1(String str) {

-        callbackValue = str;

-    }    

-

-    public void callModifyParameter() {

-        this.aCallBackService.modifyParameter();

-    }

-

-    public String getCallbackValue() {

-        return callbackValue;

-    }

-

-    public void onewayMethod(String str) {

-        onewayValue = str;

-        try {

-            Thread.sleep(200);

-        } catch (Exception e) {

-            //do nothing

-        }

-    }

-

-    public String getOnewayValue() {

-        return onewayValue;

-    }

-

-    public void modifyParameter(ParameterObject po) {

-        po.field1 = "AComponent";

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
deleted file mode 100644
index a41875b2b6..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
+++ /dev/null
@@ -1,32 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * only for callBack

- */

-public interface LocalCallbackInterface {

-

-    void callbackMethod(String str);

-

-    void modifyParameter(ParameterObject po);

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackMissmatchInterface.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackMissmatchInterface.java
deleted file mode 100644
index fbb81ae5c1..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackMissmatchInterface.java
+++ /dev/null
@@ -1,32 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * only for callBack

- */

-public interface LocalCallbackMissmatchInterface {

-

-    void callbackMethod(ParameterObject po);

-

-    void modifyParameter(ParameterObject po);

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
deleted file mode 100644
index 9a8ad9ed8d..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalClientComponentImpl.java
+++ /dev/null
@@ -1,88 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(ClientComponent.class)

-public class LocalClientComponentImpl implements ClientComponent, LocalCallbackInterface {

-

-    @Reference

-    protected LocalServiceComponent aCallBackService;

-    private static String callbackValue;

-    private static String onewayValue;

-

-    public String foo(ParameterObject po) {

-        po.field1 = "AComponent";

-        return aCallBackService.foo("AComponent");

-    }

-    

-    public String foo1(ParameterObject po) {

-        po.field1 = "AComponent";

-        return aCallBackService.foo("AComponent");

-    }

-

-    public String foo2(String str) throws Exception {

-        return str + "AComponent";

-    }

-

-    public String foo3(String str, int i) {

-        return str + "AComponent" + i;

-    }

-

-    public String foo4(int i, String str) throws Exception {

-        return str + "AComponent" + i;

-    }

-

-    public void callback(String str) {

-        aCallBackService.callback(str);

-    }

-

-    public void callbackMethod(String str) {

-        callbackValue = str;

-    }

-

-    public void callModifyParameter() {

-        this.aCallBackService.modifyParameter();

-    }

-

-    public String getCallbackValue() {

-        return callbackValue;

-    }

-

-    public void onewayMethod(String str) {

-        onewayValue = str;

-        try {

-            Thread.sleep(200);

-        } catch (Exception e) {

-            //do nothing

-        }

-    }

-

-    public String getOnewayValue() {

-        return onewayValue;

-    }

-

-    public void modifyParameter(ParameterObject po) {

-        po.field1 = "AComponent";

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceCallbackMissmatchComponent.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceCallbackMissmatchComponent.java
deleted file mode 100644
index 7a66b2d900..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceCallbackMissmatchComponent.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * Local be-directional callBackService

- */

-@Callback(LocalCallbackMissmatchInterface.class)

-public interface LocalServiceCallbackMissmatchComponent {

-

-    String foo(String str);

-

-    void callback(String str);

-

-    void modifyParameter();

-

-    ParameterObject getPO();

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceCallbackMissmatchComponentImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceCallbackMissmatchComponentImpl.java
deleted file mode 100644
index 7ef6c04a9c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceCallbackMissmatchComponentImpl.java
+++ /dev/null
@@ -1,50 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(LocalServiceCallbackMissmatchComponent.class)

-public class LocalServiceCallbackMissmatchComponentImpl implements LocalServiceCallbackMissmatchComponent {

-

-    @Callback

-    protected LocalCallbackMissmatchInterface callback;

-

-    private static ParameterObject po;

-

-    public void callback(String str) {

-        po = new ParameterObject("CallBack");

-        callback.callbackMethod(po);

-    }

-

-    public void modifyParameter() {

-        po = new ParameterObject("CallBack");

-        callback.modifyParameter(po);

-    }

-

-    public String foo(String str) {

-        return po.field1;

-    }

-

-    public ParameterObject getPO() {

-        return po;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
deleted file mode 100644
index 92ed0434e4..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponent.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * Local be-directional callBackService

- */

-@Callback(LocalCallbackInterface.class)

-public interface LocalServiceComponent {

-

-    String foo(String str);

-

-    void callback(String str);

-

-    void modifyParameter();

-

-    ParameterObject getPO();

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
deleted file mode 100644
index 1d8995ccc6..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceComponentImpl.java
+++ /dev/null
@@ -1,49 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(LocalServiceComponent.class)

-public class LocalServiceComponentImpl implements LocalServiceComponent {

-

-    @Callback

-    protected LocalCallbackInterface callback;

-

-    private static ParameterObject po;

-

-    public void callback(String str) {

-        callback.callbackMethod(str);

-    }

-

-    public void modifyParameter() {

-        po = new ParameterObject("CallBack");

-        callback.modifyParameter(po);

-    }

-

-    public String foo(String str) {

-        return str;

-    }

-

-    public ParameterObject getPO() {

-        return po;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceMissmatchComponent.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceMissmatchComponent.java
deleted file mode 100644
index fb722b2699..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceMissmatchComponent.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*

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

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

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

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

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

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

- * 

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

- * 

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

- * software distributed under the License is distributed on an

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

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

- * specific language governing permissions and limitations

- * under the License.    

- */

-package org.apache.tuscany.sca.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * Local be-directional callBackService

- */

-@Callback(LocalCallbackInterface.class)

-public interface LocalServiceMissmatchComponent {

-

-    String foo(ParameterObject po);

-

-    void callback(String str);

-

-    void modifyParameter();

-

-    ParameterObject getPO();

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceMissmatchComponentImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceMissmatchComponentImpl.java
deleted file mode 100644
index 78626a3add..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalServiceMissmatchComponentImpl.java
+++ /dev/null
@@ -1,49 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(LocalServiceMissmatchComponent.class)

-public class LocalServiceMissmatchComponentImpl implements LocalServiceMissmatchComponent {

-

-    @Callback

-    protected LocalCallbackInterface callback;

-

-    private static ParameterObject po;

-

-    public void callback(String str) {

-        callback.callbackMethod(str);

-    }

-

-    public void modifyParameter() {

-        po = new ParameterObject("CallBack");

-        callback.modifyParameter(po);

-    }

-

-    public String foo(ParameterObject po) {

-        return po.field1;

-    }

-

-    public ParameterObject getPO() {

-        return po;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBClientComponentImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBClientComponentImpl.java
deleted file mode 100644
index f3048a9098..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBClientComponentImpl.java
+++ /dev/null
@@ -1,92 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(ClientComponent.class)

-public class NonJAXBClientComponentImpl implements ClientComponent, CallbackInterface {

-

-    @Reference

-    protected NonJAXBServiceComponent aCallBackService;

-    private static String callbackValue;

-    private static String onewayValue;

-    

-    public String foo(ParameterObject po) {

-        po.field1 = "AComponent";

-        return aCallBackService.foo("AComponent");

-    }    

-

-    public String foo1(ParameterObject po) {

-        NonJAXBParameterObject nonJAXBPO = new NonJAXBParameterObject(po.field1);

-        return aCallBackService.foo1(nonJAXBPO);

-    }

-

-    public String foo2(String str) throws Exception {

-        return str + "AComponent";

-    }

-

-    public String foo3(String str, int i) {

-        return str + "AComponent" + i;

-    }

-

-    public String foo4(int i, String str) throws Exception {

-        return str + "AComponent" + i;

-    }

-

-    public void callback(String str) {

-        aCallBackService.callback(str);

-    }

-

-    public void callbackMethod(String str) {

-        callbackValue = str;

-    }

-    

-    public void callbackMethod1(String str) {

-        callbackValue = str;

-    }    

-

-    public void callModifyParameter() {

-        this.aCallBackService.modifyParameter();

-    }

-

-    public String getCallbackValue() {

-        return callbackValue;

-    }

-

-    public void onewayMethod(String str) {

-        onewayValue = str;

-        try {

-            Thread.sleep(200);

-        } catch (Exception e) {

-            //do nothing

-        }

-    }

-

-    public String getOnewayValue() {

-        return onewayValue;

-    }

-

-    public void modifyParameter(ParameterObject po) {

-        po.field1 = "AComponent";

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBParameterObject.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBParameterObject.java
deleted file mode 100644
index 8acef311a9..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBParameterObject.java
+++ /dev/null
@@ -1,51 +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.itest.interfaces;

-

-import java.io.Serializable;

-

-/**

- * 

- * A bean that cannont be converted to/from XML using JAXB as there is no

- * default constructor

- *

- */

-public class NonJAXBParameterObject implements Serializable {

-    private static final long serialVersionUID = 1L;

-    public String field1;

-

-

-    public NonJAXBParameterObject(String field1) {

-        this.field1 = field1;

-    }

-

-    public boolean equals(Object o) {

-        if (o == this) {

-            return true;

-        }

-        if (o instanceof NonJAXBParameterObject) {

-            NonJAXBParameterObject other = (NonJAXBParameterObject)o;

-            if (field1 != null) {

-                return field1.equals(other.field1);

-            }

-        }

-        return false;

-    }

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponent.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponent.java
deleted file mode 100644
index d097394721..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponent.java
+++ /dev/null
@@ -1,41 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * Local be-directional callBackService

- */

-@Remotable

-@Callback(CallbackInterface.class)

-public interface NonJAXBServiceComponent {

-

-    String foo(String str);

-    

-    String foo1(NonJAXBParameterObject po);

-

-    void callback(String str);

-

-    void modifyParameter();

-

-    ParameterObject getPO();

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponentImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponentImpl.java
deleted file mode 100644
index d50feafd0e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/NonJAXBServiceComponentImpl.java
+++ /dev/null
@@ -1,60 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Reference;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(NonJAXBServiceComponent.class)

-public class NonJAXBServiceComponentImpl implements NonJAXBServiceComponent {

-

-    @Callback

-    protected CallbackInterface callback;

- 

-/*    

-    @Reference

-    protected ServiceComponent chainedCallbackReference;

-*/

-    private static ParameterObject po;

-

-    public String foo(String str) {

-        return str;

-    }

-    

-    public String foo1(NonJAXBParameterObject po){

-        return po.field1;

-    }

-    

-    public void callback(String str) {

-        callback.callbackMethod(str);

-    }

-

-    public void modifyParameter() {

-        po = new ParameterObject("CallBack");

-        callback.modifyParameter(po);

-    }

-

-

-

-    public ParameterObject getPO() {

-        return po;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
deleted file mode 100644
index 9c980e01c8..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
+++ /dev/null
@@ -1,48 +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.itest.interfaces;

-

-import java.io.Serializable;

-

-public class ParameterObject implements Serializable {

-    private static final long serialVersionUID = 1L;

-    public String field1;

-

-    public ParameterObject() {

-        this.field1 = null;

-    }

-

-    public ParameterObject(String field1) {

-        this.field1 = field1;

-    }

-

-    public boolean equals(Object o) {

-        if (o == this) {

-            return true;

-        }

-        if (o instanceof ParameterObject) {

-            ParameterObject other = (ParameterObject)o;

-            if (field1 != null) {

-                return field1.equals(other.field1);

-            }

-        }

-        return false;

-    }

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceCallbackMissmatchComponent.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceCallbackMissmatchComponent.java
deleted file mode 100644
index 81d4b3816a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceCallbackMissmatchComponent.java
+++ /dev/null
@@ -1,39 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * Local be-directional callBackService

- */

-@Remotable

-@Callback(CallbackMissmatchInterface.class)

-public interface ServiceCallbackMissmatchComponent {

-

-    String foo(ParameterObject po);

-

-    void callback(String str);

-

-    void modifyParameter();

-

-    ParameterObject getPO();

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceCallbackMissmatchComponentImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceCallbackMissmatchComponentImpl.java
deleted file mode 100644
index 4dbfd55535..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceCallbackMissmatchComponentImpl.java
+++ /dev/null
@@ -1,49 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(ServiceCallbackMissmatchComponent.class)

-public class ServiceCallbackMissmatchComponentImpl implements ServiceCallbackMissmatchComponent {

-

-    @Callback

-    protected CallbackMissmatchInterface callback;

-

-    private static ParameterObject po;

-

-    public void callback(String str) {

-        callback.callbackMethod1(po, str);

-    }

-

-    public void modifyParameter() {

-        po = new ParameterObject("CallBack");

-        callback.modifyParameter(po);

-    }

-

-    public String foo(ParameterObject po) {

-        return po.field1;

-    }

-

-    public ParameterObject getPO() {

-        return po;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponent.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponent.java
deleted file mode 100644
index 355db43089..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponent.java
+++ /dev/null
@@ -1,41 +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.itest.interfaces;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * Local be-directional callBackService

- */

-@Remotable

-@Callback(CallbackInterface.class)

-public interface ServiceComponent {

-

-    String foo(String str);

-    

-    String foo1(String str);

-

-    void callback(String str);

-

-    void modifyParameter();

-

-    ParameterObject getPO();

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponentImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponentImpl.java
deleted file mode 100644
index aee96e4737..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceComponentImpl.java
+++ /dev/null
@@ -1,57 +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.itest.interfaces;

-

-import javax.annotation.security.RolesAllowed;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Service;

-

-@RolesAllowed({"Role1"})

-@Service(ServiceComponent.class)

-public class ServiceComponentImpl implements ServiceComponent {

-

-    @Callback

-    protected CallbackInterface callback;

- 

-    private static ParameterObject po;

-

-    @RolesAllowed({"Role2", "Role3"})

-    public String foo(String str) {

-        return str;

-    }

-    

-    public String foo1(String str){

-        return str;

-    }

-    

-    public void callback(String str) {

-        callback.callbackMethod(str);

-    }

-

-    public void modifyParameter() {

-        po = new ParameterObject("CallBack");

-        callback.modifyParameter(po);

-    }

-    

-    public ParameterObject getPO() {

-        return po;

-    }

-

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponent.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponent.java
deleted file mode 100644
index a1c933716e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponent.java
+++ /dev/null
@@ -1,52 +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.itest.interfaces;

-

-import java.util.List;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Remotable;

-

-/**

- * Local be-directional callBackService

- */

-@Remotable

-@Callback(CallbackInterface.class)

-public interface ServiceMissmatchComponent {

-

-    // infrastructure won't detect difference between String and ParameterObject

-    String foo(ParameterObject po);

-    

-    // Infrastructure will detect difference between parameter numbers

-    String foo1(ParameterObject po, String str);

-

-    void callback(String str);

-

-    void modifyParameter();

-

-    ParameterObject getPO();

-    

-    void inArray(String[] stringArray);

-    

-    String[] outArray();     

-    

-    void inCollection(List<String> stringArray);

-    

-    List<String> outCollection();      

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponentImpl.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponentImpl.java
deleted file mode 100644
index 0e0966da79..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ServiceMissmatchComponentImpl.java
+++ /dev/null
@@ -1,68 +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.itest.interfaces;

-

-import java.util.List;

-

-import org.oasisopen.sca.annotation.Callback;

-import org.oasisopen.sca.annotation.Service;

-

-@Service(ServiceMissmatchComponent.class)

-public class ServiceMissmatchComponentImpl implements ServiceMissmatchComponent {

-

-    @Callback

-    protected CallbackInterface callback;

-

-    private static ParameterObject po;

-

-    public String foo(ParameterObject po) {

-        return po.field1;

-    }

-    

-    public String foo1(ParameterObject po, String str){

-        return str;

-    }  

-    

-    public void callback(String str) {

-        callback.callbackMethod(str);

-    }

-

-    public void modifyParameter() {

-        po = new ParameterObject("CallBack");

-        callback.modifyParameter(po);

-    }

-

-    public ParameterObject getPO() {

-        return po;

-    }

-    

-    public void inArray(String[] stringArray) {

-    }  

-    

-    public String[] outArray() {

-        return null;

-    } 

-    

-    public void inCollection(List<String> stringArray) {

-    }  

-    

-    public List<String> outCollection() {

-        return null;

-    }     

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
deleted file mode 100644
index 39b298a665..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ /dev/null
@@ -1,17 +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/itest/interfaces/definitions.xml
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/definitions.xml b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/definitions.xml
deleted file mode 100644
index f462f81388..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/definitions.xml
+++ /dev/null
@@ -1,36 +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.    

--->

-<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 

-             targetNamespace="http://www.tuscany.apache.org/itests/interface/match"

-    		 xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 

-    		 xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" >

-

-

-    <sca:policySet name="BasicAuthenticationPolicySet"

-                   attachTo="//sca:binding.ws"

-                   provides="clientAuthentication.transport"

-                   appliesTo="//sca:binding.ws">

-        <tuscany:basicAuthentication>

-          <tuscany:userName>myname</tuscany:userName>

-          <tuscany:password>mypassword</tuscany:password>

-        </tuscany:basicAuthentication>

-    </sca:policySet>   

-      

-</definitions>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite
deleted file mode 100644
index 7a373f2f31..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MatchDistributedClient" >

-

-    <component name="LocalClientClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ClientClientComponentImpl" />

-        <reference name="aClient" target="DistributedClientComponent" />

-    </component> 

-    

-    <component name="DistributedClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ClientComponentImpl" />

-        <reference name="aCallBackService" target="DistributedServiceComponent" />

-    </component> 

-    

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClientClient.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClientClient.composite
deleted file mode 100644
index d0f2bc25ba..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClientClient.composite
+++ /dev/null
@@ -1,29 +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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MatchDistributedClientClient" >

-

-    <component name="DistributedClientClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ClientClientComponentImpl" />

-        <reference name="aClient" target="DistributedClientComponent" />

-    </component>  

-    

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedService.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedService.composite
deleted file mode 100644
index f13cc8657b..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedService.composite
+++ /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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MatchDistributedService" >

-    

-    <component name="DistributedServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ServiceComponentImpl" />        

-    </component>  

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedClient.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedClient.composite
deleted file mode 100644
index 4d39fc2ec7..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedClient.composite
+++ /dev/null
@@ -1,29 +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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MatchNonJAXBDistributedClient" >

-

-    <component name="DistributedClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.NonJAXBClientComponentImpl" />

-        <reference name="aCallBackService" target="DistributedServiceComponent" />

-    </component> 

-    

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedService.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedService.composite
deleted file mode 100644
index ffb609daee..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedService.composite
+++ /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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MatchNonJAXBDistributedService" >

-    

-    <component name="DistributedServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.NonJAXBServiceComponentImpl" />       

-    </component>  

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchPolicyDistributedClient.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchPolicyDistributedClient.composite
deleted file mode 100644
index e5591f2e93..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchPolicyDistributedClient.composite
+++ /dev/null
@@ -1,29 +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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MatchPolicyDistributedClient" >

-

-    <component name="DistributedClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ClientComponentImpl" />

-        <reference name="aCallBackService" target="DistributedServiceComponent"/>

-    </component> 

-    

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchPolicyDistributedService.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchPolicyDistributedService.composite
deleted file mode 100644
index 7340a2d6e6..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchPolicyDistributedService.composite
+++ /dev/null
@@ -1,31 +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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MatchPolicyDistributedService" >

-    

-    <component name="DistributedServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ServiceComponentImpl" />       

-        <service name="ServiceComponent" requires="authentication">

-            <binding.ws requires="sca:SOAP.v1_2"/>

-        </service>

-    </component>  

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchWSDistributedClient.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchWSDistributedClient.composite
deleted file mode 100644
index 44074bf719..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchWSDistributedClient.composite
+++ /dev/null
@@ -1,29 +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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MatchWSDistributedClient" >

-

-    <component name="DistributedClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ClientComponentImpl" />

-        <reference name="aCallBackService" target="DistributedServiceComponent" />

-    </component> 

-    

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchWSDistributedService.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchWSDistributedService.composite
deleted file mode 100644
index 981f5d172c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchWSDistributedService.composite
+++ /dev/null
@@ -1,30 +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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MatchWSDistributedService" >

-    

-    <component name="DistributedServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ServiceComponentImpl" /> 

-        <service name="ServiceComponent">

-            <binding.ws/>   

-        </service>    

-    </component>  

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/local/MatchLocal.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/local/MatchLocal.composite
deleted file mode 100644
index 6c728f8bd3..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/local/MatchLocal.composite
+++ /dev/null
@@ -1,32 +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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MatchLocal" >

-

-    <component name="LocalClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.LocalClientComponentImpl" />

-        <reference name="aCallBackService" target="LocalServiceComponent" />

-    </component> 

-    

-    <component name="LocalServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.LocalServiceComponentImpl" />

-    </component>  

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchCallbackDistributedService.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchCallbackDistributedService.composite
deleted file mode 100644
index 808ffa45f0..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchCallbackDistributedService.composite
+++ /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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MissmatchCallbackDistributedService" >

-    

-    <component name="DistributedServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ServiceCallbackMissmatchComponentImpl" />

-    </component>  

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchDistributedClient.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchDistributedClient.composite
deleted file mode 100644
index dcfe3bf3c3..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchDistributedClient.composite
+++ /dev/null
@@ -1,29 +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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MissmatchDistributedClient" >

-

-    <component name="DistributedClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ClientComponentImpl" />

-        <reference name="aCallBackService" target="DistributedServiceComponent" />

-    </component> 

-    

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchDistributedService.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchDistributedService.composite
deleted file mode 100644
index 9424f66d56..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchDistributedService.composite
+++ /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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MissmatchDistributedService" >

-    

-    <component name="DistributedServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ServiceMissmatchComponentImpl" />

-    </component>  

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchPolicyDistributedClient.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchPolicyDistributedClient.composite
deleted file mode 100644
index b8f51c9afc..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchPolicyDistributedClient.composite
+++ /dev/null
@@ -1,30 +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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912"

-           xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MissmatchPolicyDistributedClient" >

-

-    <component name="DistributedClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ClientComponentImpl" />

-        <reference name="aCallBackService" target="DistributedServiceComponent" requires="sca:SOAP.v1_2"/>

-    </component> 

-    

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchPolicyDistributedService.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchPolicyDistributedService.composite
deleted file mode 100644
index a90d9e0a3f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchPolicyDistributedService.composite
+++ /dev/null
@@ -1,31 +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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MissmatchPolicyDistributedService" >

-    

-    <component name="DistributedServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ServiceComponentImpl" />       

-        <service name="ServiceComponent" requires="authentication">

-            <binding.ws/>

-        </service>

-    </component>  

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/local/MissmatchCallbackLocal.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/local/MissmatchCallbackLocal.composite
deleted file mode 100644
index 2c673054a6..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/local/MissmatchCallbackLocal.composite
+++ /dev/null
@@ -1,32 +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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MissmatchCallbackLocal" >

-

-    <component name="LocalClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.LocalClientComponentImpl" />

-        <reference name="aCallBackService" target="LocalServiceComponent" />

-    </component> 

-    

-    <component name="LocalServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.LocalServiceCallbackMissmatchComponentImpl" />

-    </component>  

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/local/MissmatchLocal.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/local/MissmatchLocal.composite
deleted file mode 100644
index 4a128015f8..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/local/MissmatchLocal.composite
+++ /dev/null
@@ -1,32 +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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MissmatchLocal" >

-

-    <component name="LocalClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.LocalClientComponentImpl" />

-        <reference name="aCallBackService" target="LocalServiceComponent" />

-    </component> 

-    

-    <component name="LocalServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.LocalServiceMissmatchComponentImpl" />

-    </component>  

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/local/MissmatchRemoteable.composite b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/local/MissmatchRemoteable.composite
deleted file mode 100644
index 7b3ff13e4f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/missmatch/local/MissmatchRemoteable.composite
+++ /dev/null
@@ -1,32 +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

-    * 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://docs.oasis-open.org/ns/opencsa/sca/200912" 

-           xmlns:foo="http://foo" targetNamespace="http://foo"

-           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-           name="MissmatchRemoteable" >

-

-    <component name="LocalClientComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ClientComponentImpl" />

-        <reference name="aCallBackService" target="LocalServiceComponent" />

-    </component> 

-    

-    <component name="LocalServiceComponent">

-        <implementation.java class="org.apache.tuscany.sca.itest.interfaces.ServiceMissmatchComponentImpl" />

-    </component>  

-</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InerfaceMatchTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InerfaceMatchTestCase.java
deleted file mode 100644
index ade96178d2..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InerfaceMatchTestCase.java
+++ /dev/null
@@ -1,369 +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.itest.interfaces;

-

-import java.net.URI;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.TuscanyRuntime;

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

-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.apache.tuscany.sca.node.impl.NodeImpl;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.oasisopen.sca.ServiceRuntimeException;

-import org.oasisopen.sca.client.SCAClientFactory;

-

-public class InerfaceMatchTestCase {

-    

-    /**

-     * Non-remotable client and service interfaces where the interfaces match.

-     * Components running in the same composite/JVM, i.e. no remote registry

-     * 

-     * @throws Exception

-     */

-    @Test

-    public void testLocal() throws Exception {

-        String [] contributions = {"./target/classes"};

-        Node node1 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/match/local/MatchLocal.composite", 

-                                                                     contributions);

-        node1.start();

-        

-        ClientComponent local = node1.getService(ClientComponent.class, "LocalClientComponent");

-        ParameterObject po = new ParameterObject();

-        

-        try {

-            String response = local.foo1(po);

-            Assert.assertEquals("AComponent", response);

-        } catch (ServiceRuntimeException ex){

-            Assert.fail("Unexpected exception " + ex.toString());

-        }

-        

-        node1.stop(); 

-    }

-  

-    /**

-     * Remotable client and service interfaces where the interfaces match.

-     * Components running in the separate composite/JVM, i.e. there is a remote registry

-     * 

-     * @throws Exception

-     */

-    @Test

-    public void testDistributedRemotable() throws Exception {

-        

-        // Force the remote default binding to be web services

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", 

-                           "{http://docs.oasis-open.org/ns/opencsa/sca/200912}binding.ws");

-        

-        String [] contributions = {"./target/classes"};

-        Node node1 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite", 

-                                                                     contributions);

-        node1.start();

-

-        Node node2 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedService.composite", 

-                                                                     contributions);

-        

-        // force default binding on node2 to use a different port from node 1(which will default to 8080

-        ((NodeImpl)node2).getConfiguration().addBinding(WebServiceBinding.TYPE, "http://localhost:8081/");

-        ((NodeImpl)node2).getConfiguration().addBinding(SCABinding.TYPE, "http://localhost:8081/");

-        node2.start();

-        

-        ClientComponent local = node1.getService(ClientComponent.class, "DistributedClientComponent");

-        ParameterObject po = new ParameterObject();

-        

-        try {

-            String response = local.foo1(po);

-            Assert.assertEquals("AComponent", response);

-        } catch (ServiceRuntimeException ex){

-            Assert.fail("Unexpected exception with foo " + ex.toString());

-        }

-        

-        try {

-            local.callback("Callback");

-            String response = local.getCallbackValue();

-            Assert.assertEquals("Callback", response);

-        } catch (ServiceRuntimeException ex){

-            Assert.fail("Unexpected exception with callback" + ex.toString());

-        }        

-        

-        node1.stop();

-        node2.stop();

-    }

-    

-    /**

-     * Remotable client and service interfaces where the interfaces match but

-     * where there is a parameter that can't be converted to/from XML using JAXB

-     * Components running in the separate composite/JVM, i.e. there is a remote registry

-     * 

-     * @throws Exception

-     */

-    @Test

-    public void testDistributedRemotableNonJAXB() throws Exception {

-        

-        // Force the remote default binding to be rmi as I want something that doesn't depend on

-        // WSDL so that I can test what happens when the registry tries to generate WSDL

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", 

-                           "{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi");

-        

-        String [] contributions = {"./target/classes"};

-        Node node1 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedClient.composite", 

-                                                                     contributions);

-        node1.start();

-

-        Node node2 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchNonJAXBDistributedService.composite", 

-                                                                     contributions);

-        

-        // force default binding on node2 to use a different port from node 1(which will default to 8080

-        // Don't need to do this as not testing callbacks here

-        //((NodeImpl)node2).getConfiguration().addBinding(WebServiceBinding.TYPE, "http://localhost:8081/");

-        //((NodeImpl)node2).getConfiguration().addBinding(SCABinding.TYPE, "http://localhost:8081/");

-        node2.start();

-        

-        ClientComponent local = node1.getService(ClientComponent.class, "DistributedClientComponent");

-        ParameterObject po = new ParameterObject();

-        po.field1 = "Test String";

-        

-        try {

-            String response = local.foo1(po);

-            Assert.assertEquals("Test String", response);

-        } catch (ServiceRuntimeException ex){

-            Assert.fail("Unexpected exception with foo " + ex.toString());

-        }       

-        

-        node1.stop();

-        node2.stop();

-    }    

-    

-    /**

-     * Remotable client and service interfaces where the interfaces match and the service has policy.

-     * Components running in the separate composite/JVM, i.e. there is a remote registry

-     * 

-     * @throws Exception

-     */

-    @Test

-    public void testPolicyDistributedRemotable() throws Exception {

-        

-        

-        String [] contributions = {"./target/classes"};

-        Node node1 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchPolicyDistributedClient.composite", 

-                                                                     contributions);

-        node1.start();

-

-        Node node2 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchPolicyDistributedService.composite", 

-                                                                     contributions);

-        // force binding.ws on node2 to use a different port from node 1(which will default to 8080

-        ((NodeImpl)node2).getConfiguration().addBinding(WebServiceBinding.TYPE, "http://localhost:8081/");

-        node2.start();

-        

-        ClientComponent local = node1.getService(ClientComponent.class, "DistributedClientComponent");

-        ParameterObject po = new ParameterObject();

-        

-        try {

-            String response = local.foo1(po);

-            Assert.assertEquals("AComponent", response);

-        } catch (ServiceRuntimeException ex){

-            Assert.fail("Unexpected exception with foo " + ex.toString());

-        }

-        

-        try {

-            local.callback("Callback");

-            String response = local.getCallbackValue();

-            Assert.assertEquals("Callback", response);

-        } catch (ServiceRuntimeException ex){

-            Assert.fail("Unexpected exception with callback" + ex.toString());

-        }        

-        

-        node1.stop();

-        node2.stop();

-    }

-    

-    /**

-     * Remotable client and service interfaces where the interfaces match.

-     * Components running in the separate composite/JVM, i.e. there is a remote registry

-     * and with binding.ws explicitly configured at the service

-     * 

-     * @throws Exception

-     */

-    @Test

-    public void testWSDistributedRemotable() throws Exception {

-        

-        

-        String [] contributions = {"./target/classes"};

-        Node node1 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchWSDistributedClient.composite", 

-                                                                     contributions);

-        node1.start();

-

-        Node node2 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchWSDistributedService.composite", 

-                                                                     contributions);

-        

-        // force default binding on node2 to use a different port from node 1(which will default to 8080)

-        ((NodeImpl)node2).getConfiguration().addBinding(WebServiceBinding.TYPE, "http://localhost:8081/");

-        ((NodeImpl)node2).getConfiguration().addBinding(SCABinding.TYPE, "http://localhost:8081/");

-        node2.start();

-        

-        ClientComponent local = node1.getService(ClientComponent.class, "DistributedClientComponent");

-        ParameterObject po = new ParameterObject();

-        

-        try {

-            String response = local.foo1(po);

-            Assert.assertEquals("AComponent", response);

-        } catch (ServiceRuntimeException ex){

-            Assert.fail("Unexpected exception with foo " + ex.toString());

-        }

-        

-        try {

-            local.callback("Callback");

-            String response = local.getCallbackValue();

-            Assert.assertEquals("Callback", response);

-        } catch (ServiceRuntimeException ex){

-            Assert.fail("Unexpected exception with callback" + ex.toString());

-        }        

-        

-        node1.stop();

-        node2.stop();

-    }  

-    

-    /**

-     * Remotable client and service interfaces where the interfaces match.

-     * Components running in the separate composite/JVM, i.e. there is a remote registry

-     * Access from an SCALient call to make sure that it is able to connect to the remote

-     * registry.

-     * 

-     * 

-     * @throws Exception

-     */

-    @Test

-    public void testDistributedRemotableSCAClient() throws Exception {

-        

-        // Force the remote default binding to be web services

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", 

-                           "{http://docs.oasis-open.org/ns/opencsa/sca/200912}binding.ws");

-        

-        TuscanyRuntime runtime = TuscanyRuntime.newInstance();

-        

-/*        

-        org.apache.tuscany.sca.Node nodeA = runtime.createNode("default");    

-        nodeA.installContribution("nodeAContrib", "./target/classes", null, null);

-        nodeA.startComposite("node1Contrib", "org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite");

-        

-        org.apache.tuscany.sca.Node nodeB = runtime.createNode("default");    

-        nodeB.installContribution("nodeAContrib", "./target/classes", null, null);

-        nodeB.startComposite("node1Contrib", "org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedService.composite");

-*/

-        

-        String [] contributions = {"./target/classes"};

-        Node node1 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite", 

-                                                                     contributions);

-        node1.start();

-

-        Node node2 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedService.composite", 

-                                                                     contributions);

-        

-        // force default binding on node2 to use a different port from node 1(which will default to 8080

-        ((NodeImpl)node2).getConfiguration().addBinding(WebServiceBinding.TYPE, "http://localhost:8081/");

-        ((NodeImpl)node2).getConfiguration().addBinding(SCABinding.TYPE, "http://localhost:8081/");

-        node2.start();

-        

-        SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("default"));

-        ClientComponent local  = clientFactory.getService(ClientComponent.class, "LocalClientClientComponent");

-

-        ParameterObject po = new ParameterObject();

-        

-        try {

-            String response = local.foo1(po);

-            Assert.assertEquals("AComponent", response);

-        } catch (ServiceRuntimeException ex){

-            Assert.fail("Unexpected exception with foo " + ex.toString());

-        }         

-

-/* Used to keep the composites alive when running the next (ignored) test manually

-        System.out.println("Press a key to end");

-        try {

-            System.in.read();

-        } catch (Exception ex) {

-        }

-        System.out.println("Continuing");

-*/   

-        node1.stop();

-        node2.stop();

-    }  

-    

-    /**

-     * Allows you to manually call the previous test from a separate VM to 

-     * ensure that endpoint serialization to the client work OK. It's not 

-     * intended to run as part of the test suite. 

-     * 

-     * 

-     * @throws Exception

-     */

-    @Test

-    @Ignore

-    public void testDistributedRemotableSCAClientSeparateVM() throws Exception {

-        // Force the remote default binding to be web services

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", 

-                           "{http://docs.oasis-open.org/ns/opencsa/sca/200912}binding.ws");

-        

-        // Make a reference target point across VMs to a component that has callback services

-        String [] contributions = {"./target/classes"};

-        

-        Node node3 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                "org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClientClient.composite", 

-                contributions);

-        node3.start();

-        

-        SCAClientFactory clientFactory = SCAClientFactory.newInstance(URI.create("default"));

-        ClientComponent clientClient  = clientFactory.getService(ClientComponent.class, "DistributedClientClientComponent");

-

-        ParameterObject po = new ParameterObject();

-        

-        try {

-            String response = clientClient.foo1(po);

-            Assert.assertEquals("AComponent", response);

-        } catch (ServiceRuntimeException ex){

-            Assert.fail("Unexpected exception with foo " + ex.toString());

-        } 

-        

-        // Make an SCAClient point across VMs to a component that has callback services

-        ClientComponent client  = clientFactory.getService(ClientComponent.class, "DistributedClientComponent");

-        

-        try {

-            String response = client.foo1(po);

-            Assert.assertEquals("AComponent", response);

-        } catch (ServiceRuntimeException ex){

-            Assert.fail("Unexpected exception with foo " + ex.toString());

-        }  

-        

-        node3.stop();

-    }

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InerfaceMissmatchTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InerfaceMissmatchTestCase.java
deleted file mode 100644
index 636f6cb789..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InerfaceMissmatchTestCase.java
+++ /dev/null
@@ -1,246 +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.itest.interfaces;

-

-import java.net.URI;

-

-import junit.framework.Assert;

-

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

-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;

-import org.apache.tuscany.sca.node.Node;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.apache.tuscany.sca.node.impl.NodeImpl;

-import org.junit.Ignore;

-import org.junit.Test;

-import org.oasisopen.sca.ServiceRuntimeException;

-

-public class InerfaceMissmatchTestCase {

-    

-    /**

-     * Non-remoteable client and service interfaces where the parameter types of one of the operations don't match.

-     * Components running in the same composite/JVM, i.e. no remote registry

-     * 

-     * @throws Exception

-     */

-    @Test

-    public void testLocal() throws Exception {

-        String [] contributions = {"./target/classes"};

-        Node node1 = NodeFactory.newInstance().createNode(URI.create("tuscany:InerfaceMissmatchTestCase"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/missmatch/local/MissmatchLocal.composite", 

-                                                                     contributions);

-        node1.start();

-        

-        ClientComponent local = node1.getService(ClientComponent.class, "LocalClientComponent");

-        ParameterObject po = new ParameterObject();

-        

-        try {

-            local.foo1(po);

-            Assert.fail("Expection exteption indicating that interfaces don't match");

-        } catch (ServiceRuntimeException ex){

-            Assert.assertTrue(ex.getMessage().startsWith("Unable to bind []"));

-        }

-        

-        node1.stop(); 

-    }

-    

-    /**

-     * Non-remoteable client and service interfaces where the parameter types of one of the callback operations don't match.

-     * Components running in the same composite/JVM, i.e. no remote registry

-     * 

-     * @throws Exception

-     */

-    @Test

-    public void testCallbackLocal() throws Exception {

-        String [] contributions = {"./target/classes"};

-        Node node1 = NodeFactory.newInstance().createNode(URI.create("tuscany:InerfaceMissmatchTestCase"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/missmatch/local/MissmatchCallbackLocal.composite", 

-                                                                     contributions);

-        node1.start();

-        

-        ClientComponent local = node1.getService(ClientComponent.class, "LocalClientComponent");

-        ParameterObject po = new ParameterObject();

-        

-        try {

-            local.foo1(po);

-            Assert.fail("Expection exteption indicating that interfaces don't match");

-        } catch (ServiceRuntimeException ex){

-            Assert.assertTrue(ex.getMessage().startsWith("Unable to bind []"));

-        }

-        

-        node1.stop(); 

-    }    

-   

-    /**

-     * Remoteable client and service interfaces where the parameter types of one of the operations don't match.

-     * Components running in the same composite/JVM, i.e. no remote registry

-     * Tuscany is not able to detect miss-match here?

-     * 

-     * @throws Exception

-     */

-    @Test

-    public void testNonDistributedRemotable() throws Exception {

-     

-        String [] contributions = {"./target/classes"};

-        Node node1 = NodeFactory.newInstance().createNode(URI.create("tuscany:InerfaceMissmatchTestCase"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/missmatch/local/MissmatchRemoteable.composite", 

-                                                                     contributions);

-        node1.start();

-        

-        ClientComponent local = node1.getService(ClientComponent.class, "LocalClientComponent");

-        ParameterObject po = new ParameterObject();

-        

-        try {

-            local.foo1(po);

-        } catch (ServiceRuntimeException ex){

-            Assert.assertTrue(ex.getMessage().startsWith("Unable to bind []"));

-        }

-        

-        node1.stop();

-    }

-  

-    /**

-     * Remoteable client and service interfaces where the parameter types of one of the operations don't match.

-     * Components running in the seaprate composite/JVM, i.e. there is a remote registry

-     * Both of the interfaces are converted to WSDL and Tuscany is able to detect miss-match.

-     * 

-     * @throws Exception

-     */

-    @Test

-    public void testDistributedRemotable() throws Exception {

-        

-        // Force the remote default binding to be web services

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", 

-                           "{http://docs.oasis-open.org/ns/opencsa/sca/200912}binding.ws");

-        

-        String [] contributions = {"./target/classes"};

-        Node node1 = NodeFactory.newInstance().createNode(URI.create("tuscany:InerfaceMissmatchTestCase"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchDistributedClient.composite", 

-                                                                     contributions);

-        node1.start();

-

-        Node node2 = NodeFactory.newInstance().createNode(URI.create("tuscany:InerfaceMissmatchTestCase"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchDistributedService.composite", 

-                                                                     contributions);

-        // for default binding on node2 to use a different port from node 1(which will default to 8080

-        ((NodeImpl)node2).getConfiguration().addBinding(WebServiceBinding.TYPE, "http://localhost:8081/");

-        ((NodeImpl)node2).getConfiguration().addBinding(SCABinding.TYPE, "http://localhost:8081/");        

-        node2.start();

-        

-        ClientComponent local = node1.getService(ClientComponent.class, "DistributedClientComponent");

-        ParameterObject po = new ParameterObject();

-        

-        try {

-            local.foo1(po);

-            node1.stop();

-            node2.stop();

-            Assert.fail("Expected exception indicating that interfaces don't match");

-        } catch (ServiceRuntimeException ex){

-            node1.stop();

-            node2.stop();

-            Assert.assertTrue(ex.getMessage().startsWith("Unable to bind []"));

-        }

-        

-

-    }

-    

-    /**

-     * Remoteable client and service interfaces where the parameter types of one of the operations don't match.

-     * Components running in the seaprate composite/JVM, i.e. there is a remote registry

-     * Both of the interfaces are converted to WSDL and Tuscany is able to detect miss-match.

-     * 

-     * @throws Exception

-     */

-    @Test  

-    public void testCallbackDistributedRemotable() throws Exception {

-        

-        // Force the remote default binding to be web services

-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", 

-                           "{http://docs.oasis-open.org/ns/opencsa/sca/200912}binding.ws");

-        

-        String [] contributions = {"./target/classes"};

-        Node node1 = NodeFactory.newInstance().createNode(URI.create("tuscany:InerfaceMissmatchTestCase"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchDistributedClient.composite", 

-                                                                     contributions);

-        node1.start();

-

-        Node node2 = NodeFactory.newInstance().createNode(URI.create("tuscany:InerfaceMissmatchTestCase"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchCallbackDistributedService.composite", 

-                                                                     contributions);

-        // for default binding on node2 to use a different port from node 1(which will default to 8080

-        ((NodeImpl)node2).getConfiguration().addBinding(WebServiceBinding.TYPE, "http://localhost:8081/");

-        ((NodeImpl)node2).getConfiguration().addBinding(SCABinding.TYPE, "http://localhost:8081/");        

-        node2.start();

-        

-        ClientComponent local = node1.getService(ClientComponent.class, "DistributedClientComponent");

-        ParameterObject po = new ParameterObject();

-        

-        try {

-            local.foo1(po);

-            node1.stop();

-            node2.stop();

-            Assert.fail("Expected exception indicating that interfaces don't match");

-        } catch (ServiceRuntimeException ex){

-            node1.stop();

-            node2.stop();

-            Assert.assertTrue(ex.getMessage().startsWith("Unable to bind []"));

-        }

-    }

-    

-    /**

-     * Remotable client and service interfaces where the interfaces match and the service and reference

-     * have missmatching policy.

-     * Components running in the separate composite/JVM, i.e. there is a remote registry

-     * 

-     * @throws Exception

-     */

-    @Test

-    public void testPolicyDistributedRemotable() throws Exception {

-        

-        

-        String [] contributions = {"./target/classes"};

-        Node node1 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchPolicyDistributedClient.composite", 

-                                                                     contributions);

-        node1.start();

-

-        Node node2 = NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                     "org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchPolicyDistributedService.composite", 

-                                                                     contributions);

-        // force binding.ws on node2 to use a different port from node 1(which will default to 8080

-        ((NodeImpl)node2).getConfiguration().addBinding(WebServiceBinding.TYPE, "http://localhost:8081/");

-        node2.start();

-        

-        ClientComponent local = node1.getService(ClientComponent.class, "DistributedClientComponent");

-        ParameterObject po = new ParameterObject();

-        

-        try {

-            String response = local.foo1(po);

-            node1.stop();

-            node2.stop();            

-            Assert.fail("Expected exception indicating that interfaces don't match");

-        } catch (ServiceRuntimeException ex){

-            node1.stop();

-            node2.stop();

-            Assert.assertTrue(ex.getMessage().startsWith("Unable to bind []"));

-        }

-        

-    }     

-}

diff --git a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfaceWriteTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfaceWriteTestCase.java
deleted file mode 100644
index 9f6c1edbb0..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/testing/itest/interface-matching/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfaceWriteTestCase.java
+++ /dev/null
@@ -1,110 +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.itest.interfaces;

-

-import java.io.ByteArrayInputStream;

-import java.io.ByteArrayOutputStream;

-import java.net.URI;

-

-import javax.xml.stream.XMLInputFactory;

-import javax.xml.stream.XMLOutputFactory;

-import javax.xml.stream.XMLStreamReader;

-import javax.xml.stream.XMLStreamWriter;

-

-import junit.framework.Assert;

-

-

-

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

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

-import org.apache.tuscany.sca.assembly.xml.InterfaceContractProcessor;

-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;

-import org.apache.tuscany.sca.core.FactoryExtensionPoint;

-

-import org.apache.tuscany.sca.interfacedef.InterfaceContract;

-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;

-import org.apache.tuscany.sca.interfacedef.impl.InterfaceContractMapperImpl;

-import org.apache.tuscany.sca.interfacedef.util.Audit;

-import org.apache.tuscany.sca.node.NodeFactory;

-import org.apache.tuscany.sca.node.impl.NodeImpl;

-import org.junit.Test;

-

-public class InterfaceWriteTestCase {

-    

-    /**

-     * Looks at writing and reading the Tuscany interface model

-     * 

-     * @throws Exception

-     */

-    @Test

-    public void testInterfaceWriteRead() throws Exception {

-        String [] contributions = {"./target/classes"};

-        NodeImpl node1 = (NodeImpl)NodeFactory.newInstance().createNode(URI.create("uri:default"), 

-                                                                        "org/apache/tuscany/sca/itest/interfaces/missmatch/distributed/MissmatchDistributedService.composite", 

-                                                                        contributions);

-        node1.start();

-        

-        Component serviceComponent = node1.getDomainComposite().getComponents().get(0);

-        Service service = serviceComponent.getServices().get(0);

-        

-        InterfaceContractProcessor processor = new InterfaceContractProcessor(node1.getExtensionPointRegistry());

-        ProcessorContext context = new ProcessorContext();

-        

-        FactoryExtensionPoint modelFactories = node1.getExtensionPointRegistry().getExtensionPoint(FactoryExtensionPoint.class);

-

-        ByteArrayOutputStream bos = new ByteArrayOutputStream();

-        XMLOutputFactory outputFactory = modelFactories.getFactory(XMLOutputFactory.class);

-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(bos);

-        processor.write(service.getInterfaceContract(), writer, context);

-        writer.close();

-        

-        String xml = bos.toString();

-        System.out.println("Written ouput is:\n" + xml);

-        

-        ByteArrayInputStream bis = new ByteArrayInputStream(xml.getBytes());

-        XMLInputFactory inputFactory = modelFactories.getFactory(XMLInputFactory.class);

-        XMLStreamReader reader = inputFactory.createXMLStreamReader(bis);

-        InterfaceContract interfaceContract = processor.read(reader, context);

-        

-        bos = new ByteArrayOutputStream();

-        writer = outputFactory.createXMLStreamWriter(bos);

-        processor.write(interfaceContract, writer, context);

-        writer.close();

-        

-        System.out.println("Read ouput is:\n" + bos);

-        

-        InterfaceContractMapper interfaceContractMapper = new InterfaceContractMapperImpl(node1.getExtensionPointRegistry());

-        

-        Audit matchAudit = new Audit();

-        boolean match = false;

-        match = interfaceContractMapper.isCompatibleSubset(service.getInterfaceContract(), 

-                                                           interfaceContract, 

-                                                           matchAudit);

-        

-        if (!match){

-            System.out.println(matchAudit.toString());

-        }

-        

-        Assert.assertTrue(match);

-       

-        node1.stop(); 

-    }  

-    

-}