From 1810e4d00e9d721f7607cbf11c878b40e4f670ec Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Wed, 20 Aug 2008 00:43:40 +0000 Subject: Minor code cleanup. Moved different SCDL variations to different composite files. Added one more variation that shows how to use the SCA ComponentContext interface. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@687211 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/helloworld/HelloWorldClient2.java | 10 ++--- .../main/java/helloworld/HelloWorldClient3.java | 2 +- .../main/java/helloworld/HelloWorldClient4.java | 52 ++++++++++++++++++++++ .../main/resources/helloworldwsclient.composite | 16 ------- .../main/resources/helloworldwsclient2.composite | 33 ++++++++++++++ .../main/resources/helloworldwsclient3.composite | 33 ++++++++++++++ .../main/resources/helloworldwsclient4.composite | 34 ++++++++++++++ 7 files changed, 158 insertions(+), 22 deletions(-) create mode 100644 java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java create mode 100644 java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite create mode 100644 java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite create mode 100644 java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java index 276083437d..13a31b6391 100644 --- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java +++ b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient2.java @@ -29,24 +29,24 @@ import org.osoa.sca.annotations.Scope; @Scope("COMPOSITE") @EagerInit public class HelloWorldClient2 { - private static HelloWorldClient2 main; + private static HelloWorldClient2 client; @Reference public HelloWorldService helloWorldService; public HelloWorldClient2() { - main = this; + client = this; } public final static void main(String[] args) throws Exception { - SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient.composite"); + SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient2.composite"); - main.doit(args); + client.doit(args); scaDomain.close(); } - private void doit(String[] args) { + void doit(String[] args) { String value = helloWorldService.getGreetings("World"); System.out.println(value); } diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java index cd8bf27c5f..6d1722095b 100644 --- a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java +++ b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient3.java @@ -33,7 +33,7 @@ public class HelloWorldClient3 { public HelloWorldService helloWorldService; public final static void main(String[] args) throws Exception { - SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient.composite"); + SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient3.composite"); scaDomain.getService(HelloWorldClient3.class, "HelloWorldClient3").doit(args); diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java new file mode 100644 index 0000000000..3def5194a5 --- /dev/null +++ b/java/sca/samples/helloworld-ws-reference-lean/src/main/java/helloworld/HelloWorldClient4.java @@ -0,0 +1,52 @@ +/* + * 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 helloworld; + +import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.osoa.sca.ComponentContext; +import org.osoa.sca.annotations.Context; +import org.osoa.sca.annotations.EagerInit; +import org.osoa.sca.annotations.Scope; + +/** + * The HelloWorld client implementation + */ +@Scope("COMPOSITE") @EagerInit +public class HelloWorldClient4 { + + static ComponentContext clientContext; + + @Context + public void setContext(ComponentContext context) { + clientContext = context; + } + + public final static void main(String[] args) throws Exception { + SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient4.composite"); + + HelloWorldService helloWorldService = clientContext.getService(HelloWorldService.class, "helloWorldService"); + String value = helloWorldService.getGreetings("World"); + System.out.println(value); + + scaDomain.close(); + } + + public void doit(String[] args) { + } +} \ No newline at end of file diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite b/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite index b3cd07a94e..991e4b4881 100644 --- a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite +++ b/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient.composite @@ -30,20 +30,4 @@ - - - - - - - - - - - - - - - - diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite b/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite new file mode 100644 index 0000000000..6ea14602b3 --- /dev/null +++ b/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient2.composite @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite b/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite new file mode 100644 index 0000000000..3d6364f55f --- /dev/null +++ b/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient3.composite @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite b/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite new file mode 100644 index 0000000000..106e9db988 --- /dev/null +++ b/java/sca/samples/helloworld-ws-reference-lean/src/main/resources/helloworldwsclient4.composite @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + -- cgit v1.2.3