diff options
Diffstat (limited to '')
4 files changed, 35 insertions, 39 deletions
diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java index ba68dfe908..cec1c2bdbc 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoComponentImpl.java @@ -6,27 +6,29 @@ * 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. + * under the License. */ package echo; import org.osoa.sca.annotations.Constructor; import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; /** * A simple client component that uses a reference with an Echo binding. - * + * * @version $Rev$ $Date$ */ +@Service(Echo.class) public class EchoComponentImpl implements Echo { private Echo echoReference; diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java index 7383077f18..8922c7702a 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoReferenceTestCase.java @@ -6,15 +6,15 @@ * 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. + * under the License. */ package echo; @@ -35,7 +35,7 @@ public class EchoReferenceTestCase extends TestCase { scaDomain = SCADomain.newInstance("EchoBinding.composite"); service = scaDomain.getService(Echo.class, "EchoComponent"); } - + @Override protected void tearDown() throws Exception { scaDomain.close(); @@ -43,7 +43,7 @@ public class EchoReferenceTestCase extends TestCase { public void testEchoBinding() { String result = service.echo("foo"); - assertEquals(result, "oof"); + assertEquals("oof", result); } diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java index dbc047ee77..8056e43280 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/java/echo/EchoServiceTestCase.java @@ -6,15 +6,15 @@ * 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. + * under the License. */ package echo; @@ -35,15 +35,15 @@ public class EchoServiceTestCase extends TestCase { protected void setUp() throws Exception { scaDomain = SCADomain.newInstance("EchoBinding.composite"); } - + @Override protected void tearDown() throws Exception { scaDomain.close(); } public void testEchoBinding() throws Exception { - String result = EchoServer.getServer().sendReceive("http://example.com/temp", "foo"); - assertEquals(result, "oof"); + Object result = EchoServer.getServer().call("http://example.com/server", new Object[] {"foo"}); + assertEquals("oof", result); } diff --git a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/resources/EchoBinding.composite b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/resources/EchoBinding.composite index 456dfbd94d..3b81be5bf4 100644 --- a/branches/sca-java-1.x/samples/binding-echo-extension/src/test/resources/EchoBinding.composite +++ b/branches/sca-java-1.x/samples/binding-echo-extension/src/test/resources/EchoBinding.composite @@ -7,37 +7,31 @@ * 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. + * under the License. --> -<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" - xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://sample/echo" - xmlns:se="http://sample/echo" - xmlns:e="http://echo" - xmlns:p="http://sample/policy" - xmlns:t="http://test" - name="EchoBinding"> - - <service name="EchoService" promote="EchoComponent"> - <interface.java interface="echo.Echo"/> - <e:binding.echo uri="http://example.com/temp" /> - </service> - +<composite + xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://sample/echo" + xmlns:e="http://echo" + xmlns:t="http://test" + name="EchoBinding"> <component name="EchoComponent"> - <implementation.java class="echo.EchoComponentImpl"/> + <implementation.java + class="echo.EchoComponentImpl" /> + <service name="Echo"> + <e:binding.echo uri="http://example.com/server" /> + </service> + <reference name="echoReference"> + <e:binding.echo uri="http://example.com/client" + policySets="t:EncryptionPolicy" /> + </reference> </component> - - <reference name="EchoReference" promote="EchoComponent/echoReference"> - <interface.java interface="echo.Echo"/> - <e:binding.echo uri="http://example.com/temp" policySets="t:EncryptionPolicy" /> - </reference> - </composite> |