diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-27 13:24:40 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-05-27 13:24:40 +0000 |
commit | 130d3cf8ce5fe6c2948ad4e9d04a4c37fe019b5a (patch) | |
tree | 68392a0c77c2d48de8b04238d400819219bd7137 /branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src | |
parent | 62197b3256833d9aaeabebda5426f927881cae4a (diff) |
TUSCANY-2978 - Add more JEE tests to help show that the nested composites are resolved/built correctly.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@779162 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java | 28 | ||||
-rw-r--r-- | branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java (renamed from branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java) | 2 | ||||
-rw-r--r-- | branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java | 39 | ||||
-rw-r--r-- | branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java (renamed from branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java) | 11 | ||||
-rw-r--r-- | branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite | 10 |
5 files changed, 79 insertions, 11 deletions
diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java b/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java new file mode 100644 index 0000000000..1fad282a75 --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/java/HelloworldServiceJava.java @@ -0,0 +1,28 @@ +/* + * 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 sample.java; + +import org.osoa.sca.annotations.Remotable; + + +@Remotable +public interface HelloworldServiceJava { + String getGreetings(String name); +} diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java b/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java index 6f37c9b272..8adb6a5995 100644 --- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient.java +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2.java @@ -18,7 +18,7 @@ */ package sample.pojo; -public interface HelloworldClient { +public interface HelloworldClient2 { String getGreetings(String name); diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java b/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java new file mode 100644 index 0000000000..ae16263505 --- /dev/null +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClient2Impl.java @@ -0,0 +1,39 @@ +/* + * 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 sample.pojo; + +import org.osoa.sca.annotations.Reference; + +import sample.ejb3.HelloworldService; +import sample.java.HelloworldServiceJava; + +public class HelloworldClient2Impl implements HelloworldClient2 { + + @Reference + protected HelloworldService hwService; + + @Reference + protected HelloworldServiceJava hwJavaService; + + public String getGreetings(String name){ + //return hwService.getGreetings(name) + hwJavaService.getGreetings(name); + return hwJavaService.getGreetings(name); + } + +} diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java b/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java index a38c4a773f..05885cead7 100644 --- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldClientImpl.java +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/java/sample/pojo/HelloworldTargetImpl.java @@ -18,17 +18,12 @@ */ package sample.pojo; -import org.osoa.sca.annotations.Reference; +import sample.java.HelloworldServiceJava; -import sample.ejb3.HelloworldService; - -public class HelloworldClientImpl implements HelloworldClient { - - @Reference - protected HelloworldService hwService; +public class HelloworldTargetImpl implements HelloworldServiceJava { public String getGreetings(String name){ - return hwService.getGreetings(name); + return "Hello " + name; } } diff --git a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite b/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite index f0b6f16b28..ebd8377725 100644 --- a/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite +++ b/branches/sca-java-1.x/itest/contribution-jee-samples/scajar-ear-appcomp/src/main/resources/helloworld.composite @@ -22,13 +22,19 @@ xmlns:sample="http://sample" name="Calculator"> - <component name="HelloworlClientComponent"> - <implementation.java class="sample.pojo.HelloworldClientImpl"/> + <component name="HelloworldClientComponent"> + <implementation.java class="sample.pojo.HelloworldClient2Impl"/> <reference name="hwService" target="HelloworldServiceComponent/TheService" /> + <reference name="hwJavaService" target="HelloworldServiceComponent/JavaService" /> </component> <component name="HelloworldServiceComponent"> <implementation.jee archive="itest-contribution-jee-samples-29-ear-appcomp-contrib-implicit.ear"/> + <reference name="JavaReference" target="HelloworldTargetComponent"/> </component> + + <component name="HelloworldTargetComponent"> + <implementation.java class="sample.pojo.HelloworldTargetImpl"/> + </component> </composite> |