TUSCANY-4032 - serialize the "isForCallback" flag for an endpoint service so that the SCAClient can ignore callback endpoints in the remote case.

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

4 files changed, 117 insertions, 0 deletions

diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientClientComponentImpl.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientClientComponentImpl.java
new file mode 100644
index 0000000000..66988094e7
--- /dev/null
+++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientClientComponentImpl.java
@@ -0,0 +1,81 @@
+/*

+ * 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/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponent.java b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponent.java
index ac5c2c5817..c6a6499126 100644
--- a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponent.java
+++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/java/org/apache/tuscany/sca/itest/interfaces/ClientComponent.java
@@ -20,10 +20,12 @@
 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);

diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite
index 5a423f8561..7a373f2f31 100644
--- a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite
+++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClient.composite
@@ -21,6 +21,11 @@
            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" />

diff --git a/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClientClient.composite b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClientClient.composite
new file mode 100644
index 0000000000..d0f2bc25ba
--- /dev/null
+++ b/sca-java-2.x/trunk/testing/itest/interface-matching/src/main/resources/org/apache/tuscany/sca/itest/interfaces/match/distributed/MatchDistributedClientClient.composite
@@ -0,0 +1,29 @@
+<?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